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 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 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";