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 e801344..bcfba2a 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 @@ -343,12 +343,6 @@ public class MqttMessageHandler { } //询问设备软件信息 askDevData(nDid,version,1,mid); - mid++; - //询问设备容量信息 - askDevData(nDid,version,2,mid); - mid++; - //询问监测点pt/ct信息 - askDevData(nDid,version,3,mid); } else { log.info(AccessResponseEnum.ACCESS_RESPONSE_ERROR.getMessage()); logDto.setResult(0); @@ -377,6 +371,8 @@ public class MqttMessageHandler { csSoftInfoService.removeById(soft); } equipmentFeignClient.updateSoftInfo(nDid,csSoftInfoPo.getId()); + //询问设备容量信息 + askDevData(nDid,version,2,(res.getMid()+1)); } catch (ParseException e) { e.printStackTrace(); } @@ -408,6 +404,8 @@ public class MqttMessageHandler { devCapacityFeignClient.addList(list); //3.更新设备模块个数 equipmentFeignClient.updateModuleNumber(nDid,(devInfo.size()-1)); + //4.询问监测点pt/ct信息 + askDevData(nDid,version,3,(res.getMid()+1)); } else if (Objects.equals(res.getDid(),2)) { logDto.setOperate(nDid + "更新电网侧、负载侧监测点信息"); //1.更新电网侧、负载侧监测点相关信息