From 73536f1c28e6f296e4c612bf366a5ab2d32b921c Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Wed, 22 Jul 2026 13:12:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(mqtt):=20=E8=A7=A3=E5=86=B3=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=9C=A8=E7=BA=BF=E7=8A=B6=E6=80=81=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E5=92=8C=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 注释掉MQTT客户端在线状态检查逻辑以避免设备访问阻塞
- 修复日志消息中APF模块信息显示错误的问题
- 添加PQ-COM设备特殊处理逻辑以正确查询设备注册信息
- 优化实时数据服务中的设备注册查询条件判断
---
 .../com/njcn/access/handler/MqttMessageHandler.java    |  2 +-
 .../njcn/access/service/impl/CsDeviceServiceImpl.java  | 10 +++++-----
 .../java/com/njcn/rt/service/impl/RtServiceImpl.java   |  8 +++++++-
 3 files changed, 13 insertions(+), 7 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 e597554..f13af98 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,7 +504,7 @@ public class MqttMessageHandler {
                                 logMessageTemplate.sendMember(logDto);
                                 break;
                             case 15:
-                                logDto.setOperate("系统端收到装置端"+nDid+"更新设备软件信息报文，code = " + res.getCode());
+                                logDto.setOperate("系统端收到装置端"+nDid+"APF模块报文，code = " + res.getCode());
                                 logDto.setResult(1);
                                 JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(res));
                                 AppAutoDataMessage appAutoDataMessage = JSONObject.toJavaObject(jsonObject, AppAutoDataMessage.class);
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 ee2851d..95fb180 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
@@ -1092,11 +1092,11 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
     public boolean autoAccess(String nDid,String version,Integer mid) {
         boolean result = false;
         try {
-            String clientName = "NJCN-" + nDid.substring(nDid.length() - 6);
-            boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
-            if (!mqttClient) {
-                return result;
-            }
+//            String clientName = "NJCN-" + nDid.substring(nDid.length() - 6);
+//            boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
+//            if (!mqttClient) {
+//                return result;
+//            }
             Map<Integer,String> modelMap = new HashMap<>();
             //删除缓存数据
             redisUtil.delete(AppRedisKey.MODEL + nDid);
diff --git a/iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/impl/RtServiceImpl.java b/iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/impl/RtServiceImpl.java
index a52ff2e..1465bcb 100644
--- a/iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/impl/RtServiceImpl.java
+++ b/iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/impl/RtServiceImpl.java
@@ -148,7 +148,13 @@ public class RtServiceImpl implements IRtService {
         List<CsDataArray> dataArrayList;
         //监测点id
         String lineId;
-        CsDeviceRegistry csDeviceRegistry = csDeviceRegistryFeignClient.queryByCurrentNdidAndClDid(appAutoDataMessage.getId(),appAutoDataMessage.getMsg().getClDid()).getData();
+        CsDeviceRegistry csDeviceRegistry;
+        //PQ-COM
+        if (appAutoDataMessage.getDid() == 1) {
+            csDeviceRegistry = csDeviceRegistryFeignClient.queryByCurrentNdidAndClDid(appAutoDataMessage.getId(),0).getData();
+        } else {
+            csDeviceRegistry = csDeviceRegistryFeignClient.queryByCurrentNdidAndClDid(appAutoDataMessage.getId(),appAutoDataMessage.getMsg().getClDid()).getData();
+        }
         if (Objects.isNull(csDeviceRegistry)) {
             if (appAutoDataMessage.getDid() == 1){
                 lineId = appAutoDataMessage.getId() + "0";