diff --git a/mh-framework/src/main/java/com/mh/framework/dealdata/impl/DataProcessServiceImpl.java b/mh-framework/src/main/java/com/mh/framework/dealdata/impl/DataProcessServiceImpl.java index 79b5b4e..3f6988c 100644 --- a/mh-framework/src/main/java/com/mh/framework/dealdata/impl/DataProcessServiceImpl.java +++ b/mh-framework/src/main/java/com/mh/framework/dealdata/impl/DataProcessServiceImpl.java @@ -59,7 +59,7 @@ public class DataProcessServiceImpl implements DataProcessService { } private void insertTempDataToDb(OneTwoThreeTempData data, String registerKey, String cacheKey) { - log.info("{}数据解析入库:{}", registerKey.equals("SENSOR_REGISTER") ? "温湿度传感器" : "其他设备", data); + // log.info("{}数据解析入库:{}", registerKey.equals("SENSOR_REGISTER") ? "温湿度传感器" : "其他设备", data); if (registerKey.equals("SENSOR_REGISTER")) { databaseMapper.createChillerTable(); } else { @@ -132,7 +132,7 @@ public class DataProcessServiceImpl implements DataProcessService { } private void insertData(AdvantechReceiver data, String registerKey, String cacheKey) { - log.info("{}数据解析入库:{}", registerKey.equals("CHILLERS_REGISTER") ? "冷水机组" : "计量设备", data); + // log.info("{}数据解析入库:{}", registerKey.equals("CHILLERS_REGISTER") ? "冷水机组" : "计量设备", data); if (registerKey.equals("CHILLERS_REGISTER")) { databaseMapper.createChillerTable(); } else { @@ -186,7 +186,7 @@ public class DataProcessServiceImpl implements DataProcessService { for (AdvantechDatas advantechDatas : list) { String tag = advantechDatas.getTag(); String value = String.valueOf(advantechDatas.getValue()); - log.info("时间: {},tag标签: {},value值: {}", formattedTime, tag, value); + // log.info("时间: {},tag标签: {},value值: {}", formattedTime, tag, value); try { if (StringUtils.isBlank(tag)) { continue; @@ -261,7 +261,7 @@ public class DataProcessServiceImpl implements DataProcessService { @Override public void insertDatabase(List dataMinList) { - log.info("插入data_min数据,数据大小==>{}", dataMinList.size()); + // log.info("插入data_min数据,数据大小==>{}", dataMinList.size()); Calendar calendar = Calendar.getInstance(); //时间格式化0和5结尾的时间 int batchSize = 10; diff --git a/mh-framework/src/main/java/com/mh/framework/mqtt/handler/InboundMessageRouter.java b/mh-framework/src/main/java/com/mh/framework/mqtt/handler/InboundMessageRouter.java index 015746f..07d63fa 100644 --- a/mh-framework/src/main/java/com/mh/framework/mqtt/handler/InboundMessageRouter.java +++ b/mh-framework/src/main/java/com/mh/framework/mqtt/handler/InboundMessageRouter.java @@ -47,7 +47,7 @@ public class InboundMessageRouter extends AbstractMessageRouter { // log.info("从当前主题 topic: {}, 接收到的消息:{}", topic, new String(payload)); // 判断当前主题是否是当前项目的,温湿度目前写死的 if (!topic.startsWith(mHConfig.getName()) && !topic.contains("/temp")) { - log.info("当前主题 topic: {} 不是当前项目的,直接丢弃", topic); + // log.info("当前主题 topic: {} 不是当前项目的,直接丢弃", topic); return Collections.singleton(SpringUtils.getBean(ChannelName.DEFAULT_BOUND)); } // 找到对应的主题消息通道 diff --git a/mh-framework/src/main/java/com/mh/framework/mqtt/service/impl/EventsServiceImpl.java b/mh-framework/src/main/java/com/mh/framework/mqtt/service/impl/EventsServiceImpl.java index 22538d7..2c6b12a 100644 --- a/mh-framework/src/main/java/com/mh/framework/mqtt/service/impl/EventsServiceImpl.java +++ b/mh-framework/src/main/java/com/mh/framework/mqtt/service/impl/EventsServiceImpl.java @@ -72,7 +72,7 @@ public class EventsServiceImpl implements IEventsService { AdvantechReceiver commonTopicReceiver = new AdvantechReceiver(); if (!topic.contains(Constants.TEMP)) { commonTopicReceiver = mapper.readValue(receiver, AdvantechReceiver.class); - log.info("主题:{},类型:{}: ,数据:{}", topic, logMessage, commonTopicReceiver.toString()); + // log.info("主题:{},类型:{}: ,数据:{}", topic, logMessage, commonTopicReceiver.toString()); } // 接入消息队列,利用消息对接进行数据处理 // 判断当前主题属于哪种主动上报数据 @@ -88,7 +88,7 @@ public class EventsServiceImpl implements IEventsService { } else if (topic.contains(Constants.TEMP)) { // 温湿度数据 OneTwoThreeTempData oneTwoThreeTempData = mapper.readValue(receiver, OneTwoThreeTempData.class); - log.info("主题:{},类型:{}: ,数据:{}", topic, logMessage, oneTwoThreeTempData.toString()); + // log.info("主题:{},类型:{}: ,数据:{}", topic, logMessage, oneTwoThreeTempData.toString()); sendMsgByTopic.sendToTempMQ(JSONObject.toJSONString(oneTwoThreeTempData)); } else { // 非本地主题处理 diff --git a/mh-framework/src/main/java/com/mh/framework/rabbitmq/consumer/ReceiveHandler.java b/mh-framework/src/main/java/com/mh/framework/rabbitmq/consumer/ReceiveHandler.java index cfde10c..c52aca4 100644 --- a/mh-framework/src/main/java/com/mh/framework/rabbitmq/consumer/ReceiveHandler.java +++ b/mh-framework/src/main/java/com/mh/framework/rabbitmq/consumer/ReceiveHandler.java @@ -56,7 +56,7 @@ public class ReceiveHandler { try { //TODO 开启多线程处理主机数据,如果不通过线程池开启线程来处理, // 设置SimpleRabbitListenerContainerFactory中的setConcurrentConsumers(10)数量也可以实现多线程处理 - log.info("MQ消费者:主机数据采集:{}", msg); + // log.info("MQ消费者:主机数据采集:{}", msg); //TODO 数据解析入库操作 msg转成实体类,入库 AdvantechReceiver chillerData = JSONObject.parseObject(msg, AdvantechReceiver.class); dataProcessService.insertChillerData(chillerData); @@ -89,7 +89,7 @@ public class ReceiveHandler { public void receiveDeviceData(@Payload String msg, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long tag) throws InterruptedException, IOException { try { //TODO 处理电表等数据 - log.info("MQ消费者:计量设备数据采集:{}", msg); + // log.info("MQ消费者:计量设备数据采集:{}", msg); //TODO 数据解析入库操作 msg转成实体类,入库 AdvantechReceiver deviceData = JSONObject.parseObject(msg, AdvantechReceiver.class); dataProcessService.insertDeviceData(deviceData); @@ -121,7 +121,7 @@ public class ReceiveHandler { )) public void receiveOtherData(@Payload String msg, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long tag) throws InterruptedException, IOException { try { - log.info("MQ消费者:其他设备采集:{}", msg); + // log.info("MQ消费者:其他设备采集:{}", msg); //TODO 数据解析入库操作 msg转成实体类,入库 AdvantechReceiver OtherData = JSONObject.parseObject(msg, AdvantechReceiver.class); dataProcessService.insertOtherData(OtherData); @@ -152,7 +152,7 @@ public class ReceiveHandler { )) public void receiveTempData(@Payload String msg, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long tag) throws InterruptedException, IOException { try { - log.info("MQ消费者:温湿度设备采集:{}", msg); + // log.info("MQ消费者:温湿度设备采集:{}", msg); //TODO 数据解析入库操作 msg转成实体类,入库 OneTwoThreeTempData oneTwoThreeTempData = JSONObject.parseObject(msg, OneTwoThreeTempData.class); dataProcessService.insertTempData(oneTwoThreeTempData); diff --git a/mh-quartz/src/main/java/com/mh/quartz/task/DealDataTask.java b/mh-quartz/src/main/java/com/mh/quartz/task/DealDataTask.java index 9a9c631..5c6f570 100644 --- a/mh-quartz/src/main/java/com/mh/quartz/task/DealDataTask.java +++ b/mh-quartz/src/main/java/com/mh/quartz/task/DealDataTask.java @@ -272,7 +272,7 @@ public class DealDataTask { .sorted(Comparator.comparing(temMap -> temMap.keySet().iterator().next())) .collect(Collectors.toList()); //计算上次值,当前值 - log.info("计算小时表数据:{}", sortedList); + // log.info("计算小时表数据:{}", sortedList); hourList = calcListData(hourList, key, "hour", sortedList); } //批量插入小时报表 diff --git a/mh-system/src/main/java/com/mh/system/service/device/impl/CollectionParamsManageServiceImpl.java b/mh-system/src/main/java/com/mh/system/service/device/impl/CollectionParamsManageServiceImpl.java index d648768..16fc311 100644 --- a/mh-system/src/main/java/com/mh/system/service/device/impl/CollectionParamsManageServiceImpl.java +++ b/mh-system/src/main/java/com/mh/system/service/device/impl/CollectionParamsManageServiceImpl.java @@ -157,7 +157,7 @@ public class CollectionParamsManageServiceImpl implements ICollectionParamsManag public void updateCollectionParamsManages(ArrayList chillersEntities) { // 批量更新 chillersEntities.forEach(chillerEntity -> { - log.info("chillerEntity: {}", chillerEntity.toString()); + // log.info("chillerEntity: {}", chillerEntity.toString()); if (chillerEntity.getId() != null && !StringUtils.isEmpty(chillerEntity.getId())) { collectionParamsManageMapper.updateCurValueById(chillerEntity.getId(), chillerEntity.getCurValue(), chillerEntity.getCurTime()); } diff --git a/mh-system/src/main/java/com/mh/system/service/impl/WechatServiceImpl.java b/mh-system/src/main/java/com/mh/system/service/impl/WechatServiceImpl.java index f4e5834..8f483d9 100644 --- a/mh-system/src/main/java/com/mh/system/service/impl/WechatServiceImpl.java +++ b/mh-system/src/main/java/com/mh/system/service/impl/WechatServiceImpl.java @@ -136,8 +136,8 @@ public class WechatServiceImpl implements IWechatService { HttpEntity entity = new HttpEntity<>(requestBody, headers); String requestUrl = wechatMpConfig.getPushMsgUrl(accessToken); - log.info("请求URL: {}", requestUrl); - log.info("请求体: {}", requestBody); + // log.info("请求URL: {}", requestUrl); + // log.info("请求体: {}", requestBody); try { // 使用配置了StringHttpMessageConverter的RestTemplate