便携式设备
1.软件信息兼容; 2.监测点信息兼容
This commit is contained in:
@@ -393,27 +393,29 @@ public class MqttMessageHandler {
|
||||
List<CsDevCapacityPO> list = new ArrayList<>();
|
||||
devInfo.forEach(item->{
|
||||
//1.更新治理监测点信息
|
||||
if (Objects.equals(item.getClDid(),0)){
|
||||
CsLineParam csLineParam = new CsLineParam();
|
||||
if (Objects.equals(item.getClDid(),0)){
|
||||
csLineParam.setLineId(nDid.concat("0"));
|
||||
csLineParam.setVolGrade(item.getVolGrade());
|
||||
csLineParam.setPtRatio(item.getPtRatio());
|
||||
csLineParam.setCtRatio(item.getCtRatio());
|
||||
csLineParam.setConType(item.getConType());
|
||||
csLineFeignClient.updateLine(csLineParam);
|
||||
}
|
||||
//2.录入各个模块设备容量
|
||||
CsDevCapacityPO csDevCapacity = new CsDevCapacityPO();
|
||||
csDevCapacity.setLineId(nDid.concat("0"));
|
||||
csDevCapacity.setCldid(item.getClDid());
|
||||
csDevCapacity.setCapacity(Objects.isNull(item.getCapacityA())?0.0:item.getCapacityA());
|
||||
list.add(csDevCapacity);
|
||||
} else {
|
||||
csLineParam.setLineId(nDid.concat(item.getClDid().toString()));
|
||||
}
|
||||
csLineParam.setVolGrade(item.getVolGrade());
|
||||
csLineParam.setPtRatio(item.getPtRatio());
|
||||
csLineParam.setCtRatio(item.getCtRatio());
|
||||
csLineParam.setConType(item.getConType());
|
||||
csLineFeignClient.updateLine(csLineParam);
|
||||
});
|
||||
if (CollectionUtil.isNotEmpty(list)) {
|
||||
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.更新电网侧、负载侧监测点相关信息
|
||||
@@ -680,7 +682,7 @@ public class MqttMessageHandler {
|
||||
askDataDto.setEndTime(-1);
|
||||
switch (type) {
|
||||
case 1:
|
||||
reqAndResParam.setDid(2);
|
||||
reqAndResParam.setDid(0);
|
||||
askDataDto.setCldid(0);
|
||||
askDataDto.setDataType(1);
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user