From 0233c3e04f46be3ba515b02e0c3d7fec69edcc4f Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Thu, 8 Aug 2024 15:47:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/access/handler/MqttMessageHandler.java | 13 +++++++++----
 .../access/service/impl/CsDeviceServiceImpl.java    |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
index d54aa28..50e6c12 100644
--- a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
@@ -504,8 +504,7 @@ public class MqttMessageHandler {
                 switch (dataDto.getMsg().getDataAttr()) {
                     //暂态事件、录波处理
                     case 0:
-                        log.info("处理事件");
-                        log.info("事件报文为:" + new String(message.getPayload(), StandardCharsets.UTF_8));
+                        log.info(nDid + "事件报文为:" + new String(message.getPayload(), StandardCharsets.UTF_8));
                         EventDto eventDto = gson.fromJson(new String(message.getPayload(), StandardCharsets.UTF_8), EventDto.class);
                         JSONObject jsonObject0 = JSONObject.parseObject(JSON.toJSONString(eventDto));
                         AppEventMessage appEventMessage = JSONObject.toJavaObject(jsonObject0, AppEventMessage.class);
@@ -514,11 +513,11 @@ public class MqttMessageHandler {
                         break;
                     //实时数据
                     case 1:
-                        log.info("处理实时数据");
+                        log.info(nDid + "处理实时数据");
                         break;
                     //处理主动上送的统计数据
                     case 2:
-                        log.info("处理统计数据");
+                        log.info(nDid + "处理统计数据");
                         JSONObject jsonObject2 = JSONObject.parseObject(JSON.toJSONString(dataDto));
                         AppAutoDataMessage appAutoDataMessage = JSONObject.toJavaObject(jsonObject2, AppAutoDataMessage.class);
                         appAutoDataMessage.setId(nDid);
@@ -606,6 +605,12 @@ public class MqttMessageHandler {
                 askDataDto.setCldid(-1);
                 askDataDto.setDataType(2);
                 break;
+            //询问工程信息
+            case 48:
+                reqAndResParam.setDid(1);
+                askDataDto.setCldid(1);
+                askDataDto.setDataType(48);
+                break;
             default:
                 break;
         }
diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java
index 247c52b..bbe3b58 100644
--- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java
@@ -324,7 +324,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
         param.setNDid(nDid);
         param.setStatus(1);
         param.setRunStatus(1);
-        param.setProcess(2);
+        param.setProcess(1);
         csEquipmentDeliveryService.devResetFactory(param);
         //清除关系表
         QueryWrapper<CsLedger> csLedgerQueryWrapper = new QueryWrapper<>();