From 1f04768f05d4a68f0f16456b7934f729dea9fb83 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期一, 01 九月 2025 08:36:27 +0800
Subject: [PATCH] 去除MQTT log,优化设备列表接口
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
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..2c68ac0 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瑙掕壊鎸囦护
@@ -198,7 +198,7 @@
switch (topic) {
// 鏌ヨ璁惧鍦ㄧ嚎
case MqttConstant.MOBILE_QUERY_EQU_STATU:
- log.info("admin鏀跺埌MQTT璇锋眰锛宼opic: {}", topic); // 鏀圭敤鏇磋鑼冪殑鏃ュ織璁板綍
+ //log.info("admin鏀跺埌MQTT璇锋眰锛宼opic: {}", topic); // 鏀圭敤鏇磋鑼冪殑鏃ュ織璁板綍
try {
@@ -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,8 +333,8 @@
List<DryFaultRecordVo> faultList = new ArrayList<DryFaultRecordVo>((dryFaultMap.values()));
MqMessage<List<DryFaultRecordVo>> mqMessage = new MqMessage<>(faultList, tenantId, resTopic);
//鍙戦�佽姹傝澶�
- System.err.println("鍙戦�佺粰锛�" + resTopic);
- sendMqttMessage(resTopic, mqMessage, 2);
+// System.err.println("鍙戦�佺粰锛�" + resTopic);
+ sendMqttMessage(resTopic, mqMessage, 2);
}
break;
@@ -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();
--
Gitblit v1.9.3