From bc5fe2c2b5cbbfee08f898fb063ec10472a9d551 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期三, 27 八月 2025 08:32:30 +0800
Subject: [PATCH] 去除log
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java | 10 +++++-----
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java | 14 ++++++++------
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java | 11 +++++++++++
3 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java
index eb38ac3..d6e5935 100755
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java
@@ -12,11 +12,15 @@
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.bean.BeanUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.config.TenantContext;
import org.jeecg.common.constant.CommonCacheConstant;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.RedisUtil;
+import org.jeecg.common.util.TokenUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
import org.jeecg.modules.dry.common.CacheConstants;
@@ -118,9 +122,16 @@
queryWrapper.orderByAsc("code");
List<DryEquipment> eqps = dryEquipmentService.list(queryWrapper);
List<DryEquipmentVo> equipmentVos = new ArrayList<>();
+ if(eqps == null){
+ return equipmentVos;
+ }
+
eqps.stream().forEach(item -> {
DryEquipmentVo dryEquipmentVo = BeanUtil.toBean(item, DryEquipmentVo.class);
DryEqpType dryEqpType = dryEqpTypeService.getById(item.getType());
+ if(dryEqpType == null){
+ return;
+ }
dryEquipmentVo.setType(dryEqpType.getName());
dryEquipmentVo.setDryEfficiency(dryEqpType.getDryEfficiency());
dryEquipmentVo.setSteamConsumption(dryEqpType.getSteamConsumption());
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java
index 6fcfa4b..1da8ad4 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java
@@ -173,7 +173,7 @@
@Override
public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) {
- System.err.println("娑堟伅浼犻�掓垚鍔�");
+// System.err.println("娑堟伅浼犻�掓垚鍔�");
}
// 瑙ｆ瀽admin瑙掕壊鎸囦护
@@ -269,9 +269,11 @@
RealTimeDataParentVo vo = JSON.parseObject(message, RealTimeDataParentVo.class);
// 鍚戝悇绉熸埛绉诲姩绔彂閫佹暟鎹�
String recTopic = String.format(MqttConstant.SERVICE_BROADCAST_TENANT_REAL_DATA, vo.getTenantid());
+ if(vo.getRealTime() != null){
+ vo.getRealTime().setWorkorder(vo.getWorkorder());
+ }
MqMessage<RealTimeDataVo> mqMessage = new MqMessage<>(vo.getRealTime(), vo.getTenantid() + "", recTopic);
sendMqttMessage(MqttConstant.SERVICE_BROADCAST_TENANT_REAL_DATA, mqMessage, 1);
-
realTimeDataService.realTimeDataHandle(vo);
@@ -331,7 +333,7 @@
List<DryFaultRecordVo> faultList = new ArrayList<DryFaultRecordVo>((dryFaultMap.values()));
MqMessage<List<DryFaultRecordVo>> mqMessage = new MqMessage<>(faultList, tenantId, resTopic);
//鍙戦�佽姹傝澶�
- System.err.println("鍙戦�佺粰锛�" + resTopic);
+// System.err.println("鍙戦�佺粰锛�" + resTopic);
sendMqttMessage(resTopic, mqMessage, 2);
}
@@ -343,7 +345,7 @@
MqMessage<List<DryFaultRecord>> faultMessage = JSON.parseObject(message, new TypeReference<MqMessage<List<DryFaultRecord>>>() {
});
// List<DryFaultRecord> faultRecords = JSON.parseArray(jsonObject.get("data").toString(), DryFaultRecord.class);
- System.err.println(faultMessage.toString());
+// System.err.println(faultMessage.toString());
faultRecordService.saveBatch(faultMessage.getData());
} catch (Exception e) {
@@ -405,8 +407,8 @@
switch (topic) {
case MqttConstant.MOBILE_REQ_EQU_CMD:
- System.err.println("user鏀跺埌" + topic);
- System.err.println(message);
+// System.err.println("user鏀跺埌" + topic);
+// System.err.println(message);
ThreadUtil.execute(() -> {
//TODO 鍚慞LC鍙戦�佸紑鍏虫満鎿嶄綔锛屽苟杩斿洖淇℃伅
JSONObject res = new JSONObject();
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
index 17a0360..d5eeea1 100755
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
@@ -108,7 +108,7 @@
@Transactional
public Result<?> realTimeDataHandle(RealTimeDataVo realTimeDataVo) {
TenantContext.setTenant(realTimeDataVo.getTenantid() + "");
- log.info("瀹炴椂鏁版嵁锛�" + realTimeDataVo.toString());
+// log.info("瀹炴椂鏁版嵁锛�" + realTimeDataVo.toString());
// 1 鏌ヨ鎴栧垱寤哄伐鍗�
@@ -173,7 +173,7 @@
@Transactional
public Result<?> realTimeDataHandle(RealTimeDataParentVo realTimeDataParentVo) {
TenantContext.setTenant(realTimeDataParentVo.getTenantid() + "");
- log.info("瀹炴椂鏁版嵁锛�" + realTimeDataParentVo.toString());
+// log.info("瀹炴椂鏁版嵁锛�" + realTimeDataParentVo.toString());
if (realTimeDataParentVo.getRealTime() != null) {
RealTimeDataVo realTimeDataVo = realTimeDataParentVo.getRealTime();
@@ -774,7 +774,7 @@
List<DryFaultRecordVo> faultList = new ArrayList<DryFaultRecordVo>((dryFaultMap.values()));
MqMessage<List<DryFaultRecordVo>> mqMessage = new MqMessage<>(faultList, tenantId, recTopic);
//鍙戦�佸箍鎾�
- log.error("骞挎挱缁欙細{}", recTopic);
+// log.error("骞挎挱缁欙細{}", recTopic);
mqttUtil.sendMqttMessage(MqttConstant.SERVICE_BROADCAST_TENANT_REAL_FAULT, mqMessage, 1);
@@ -796,7 +796,7 @@
List<DryFaultRecord> result = new ArrayList<>();
if (StringUtils.isEmpty(fault)) return result;
//鏁版嵁鏍锋湰锛�"eqp_fault": "婊氱瓛闄嶈秴鏃�-鎶ヨ,椋庢満杩囨祦鎶ヨ,婊氱瓛鍗囪秴鏃�-鎶ヨ,椋庣鍗囨姤璀�",
- System.err.println((faultType == 1 ? "绫诲瀷锛氭晠闅�" : "绫诲瀷锛氭姤璀�") + DateUtils.formatDateTime() + "--" + fault);
+// System.err.println((faultType == 1 ? "绫诲瀷锛氭晠闅�" : "绫诲瀷锛氭姤璀�") + DateUtils.formatDateTime() + "--" + fault);
//redis涓殑鏁呴殰
Map<Object, Object> rFauMap = redisUtil.hmget(String.format(MqttConstant.MQTT_REAL_FAULT, tenantId));
Map<String, Object> redFauMap = rFauMap.entrySet().stream()
@@ -885,7 +885,7 @@
faultRecordService.save(vo);
redisUtil.hdel(String.format(MqttConstant.MQTT_REAL_FAULT, tenantId), key);
result.add(vo);
- System.err.println((faultType == 1 ? "绫诲瀷锛氭晠闅�" : "绫诲瀷锛氭姤璀�") + DateUtils.formatDateTime() + "瀛樺叆鏁版嵁搴�");
+// System.err.println((faultType == 1 ? "绫诲瀷锛氭晠闅�" : "绫诲瀷锛氭姤璀�") + DateUtils.formatDateTime() + "瀛樺叆鏁版嵁搴�");
}
});
--
Gitblit v1.9.3