Microservice/iot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

便携式设备

Browse Source 
1.软件信息兼容；
2.监测点信息兼容
This commit is contained in:
xy
2024-09-23 20:33:50 +08:00
parent cfc2b2b7ba
commit 5a94b6d8b4
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
View File

@@ -393,27 +393,29 @@ public class MqttMessageHandler {
List<CsDevCapacityPO> list = new ArrayList<>(); List<CsDevCapacityPO> list = new ArrayList<>();
devInfo.forEach(item->{ devInfo.forEach(item->{
//1.更新治理监测点信息 //1.更新治理监测点信息
CsLineParam csLineParam = new CsLineParam();
if (Objects.equals(item.getClDid(),0)){ if (Objects.equals(item.getClDid(),0)){
CsLineParam csLineParam = new CsLineParam();
csLineParam.setLineId(nDid.concat("0")); csLineParam.setLineId(nDid.concat("0"));
csLineParam.setVolGrade(item.getVolGrade()); //2.录入各个模块设备容量
csLineParam.setPtRatio(item.getPtRatio()); CsDevCapacityPO csDevCapacity = new CsDevCapacityPO();
csLineParam.setCtRatio(item.getCtRatio()); csDevCapacity.setLineId(nDid.concat("0"));
csLineParam.setConType(item.getConType()); csDevCapacity.setCldid(item.getClDid());
csLineFeignClient.updateLine(csLineParam); csDevCapacity.setCapacity(Objects.isNull(item.getCapacityA())?0.0:item.getCapacityA());
list.add(csDevCapacity);
} else {
csLineParam.setLineId(nDid.concat(item.getClDid().toString()));
} }
//2.录入各个模块设备容量 csLineParam.setVolGrade(item.getVolGrade());
CsDevCapacityPO csDevCapacity = new CsDevCapacityPO(); csLineParam.setPtRatio(item.getPtRatio());
csDevCapacity.setLineId(nDid.concat("0")); csLineParam.setCtRatio(item.getCtRatio());
csDevCapacity.setCldid(item.getClDid()); csLineParam.setConType(item.getConType());
csDevCapacity.setCapacity(Objects.isNull(item.getCapacityA())?0.0:item.getCapacityA()); csLineFeignClient.updateLine(csLineParam);
list.add(csDevCapacity);
}); });
devCapacityFeignClient.addList(list); if (CollectionUtil.isNotEmpty(list)) {
//3.更新设备模块个数 devCapacityFeignClient.addList(list);
equipmentFeignClient.updateModuleNumber(nDid,(devInfo.size()-1)); //3.更新设备模块个数
//4.询问监测点pt/ct信息 equipmentFeignClient.updateModuleNumber(nDid,(devInfo.size()-1));
//askDevData(nDid,version,3,(res.getMid()+1)); }
} else if (Objects.equals(res.getDid(),2)) { } else if (Objects.equals(res.getDid(),2)) {
logDto.setOperate(nDid + "更新电网侧、负载侧监测点信息"); logDto.setOperate(nDid + "更新电网侧、负载侧监测点信息");
//1.更新电网侧、负载侧监测点相关信息 //1.更新电网侧、负载侧监测点相关信息
@@ -680,7 +682,7 @@ public class MqttMessageHandler {
askDataDto.setEndTime(-1); askDataDto.setEndTime(-1);
switch (type) { switch (type) {
case 1: case 1:
reqAndResParam.setDid(2); reqAndResParam.setDid(0);
askDataDto.setCldid(0); askDataDto.setCldid(0);
askDataDto.setDataType(1); askDataDto.setDataType(1);
break; break;