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

代码优化

Browse Source
This commit is contained in:
xuyang
2023-10-13 12:50:41 +08:00
parent 0fe12a64f5
commit c42f4c56fd
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
iot-access/access-api/src/main/java/com/njcn/access/pojo/RspDataDto.java
View File

@@ -81,7 +81,7 @@ public class RspDataDto {
private Double ctRatio; private Double ctRatio;
@SerializedName("Capacity_A") @SerializedName("Capacity_A")
private Double capacity; private Double capacityA;
} }
} }

2
iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsSoftInfoPO.java
View File

@@ -18,7 +18,7 @@ import java.util.Date;
*/ */
@Data @Data
@TableName("cs_soft_info") @TableName("cs_soft_info")
public class CsSoftInfoPO extends BaseEntity { public class CsSoftInfoPO {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

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

@@ -56,6 +56,7 @@ import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -357,6 +358,7 @@ public class MqttMessageHandler {
RspDataDto rspDataDto = JSON.parseObject(JSON.toJSONString(res.getMsg()), RspDataDto.class); RspDataDto rspDataDto = JSON.parseObject(JSON.toJSONString(res.getMsg()), RspDataDto.class);
switch (rspDataDto.getDataType()){ switch (rspDataDto.getDataType()){
case 1: case 1:
log.info("{} 更新设备软件信息",nDid);
logDto.setOperate(nDid + "更新设备软件信息"); logDto.setOperate(nDid + "更新设备软件信息");
RspDataDto.SoftInfo softInfo = JSON.parseObject(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.SoftInfo.class); RspDataDto.SoftInfo softInfo = JSON.parseObject(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.SoftInfo.class);
//记录设备软件信息 //记录设备软件信息
@@ -384,6 +386,7 @@ public class MqttMessageHandler {
List<RspDataDto.LdevInfo> devInfo = JSON.parseArray(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.LdevInfo.class); List<RspDataDto.LdevInfo> devInfo = JSON.parseArray(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.LdevInfo.class);
if (CollectionUtil.isNotEmpty(devInfo)){ if (CollectionUtil.isNotEmpty(devInfo)){
if (Objects.equals(res.getDid(),1)){ if (Objects.equals(res.getDid(),1)){
log.info("{} 更新治理监测点信息和设备容量",nDid);
logDto.setOperate(nDid + "更新治理监测点信息和设备容量"); logDto.setOperate(nDid + "更新治理监测点信息和设备容量");
List<CsDevCapacityPO> list = new ArrayList<>(); List<CsDevCapacityPO> list = new ArrayList<>();
devInfo.forEach(item->{ devInfo.forEach(item->{
@@ -401,7 +404,7 @@ public class MqttMessageHandler {
CsDevCapacityPO csDevCapacity = new CsDevCapacityPO(); CsDevCapacityPO csDevCapacity = new CsDevCapacityPO();
csDevCapacity.setLineId(nDid.concat("0")); csDevCapacity.setLineId(nDid.concat("0"));
csDevCapacity.setCldid(item.getClDid()); csDevCapacity.setCldid(item.getClDid());
csDevCapacity.setCapacity(item.getCapacity()); csDevCapacity.setCapacity(item.getCapacityA());
list.add(csDevCapacity); list.add(csDevCapacity);
}); });
devCapacityFeignClient.addList(list); devCapacityFeignClient.addList(list);
@@ -410,6 +413,7 @@ public class MqttMessageHandler {
//4.询问监测点pt/ct信息 //4.询问监测点pt/ct信息
askDevData(nDid,version,3,(res.getMid()+1)); askDevData(nDid,version,3,(res.getMid()+1));
} else if (Objects.equals(res.getDid(),2)) { } else if (Objects.equals(res.getDid(),2)) {
log.info("{} 更新电网侧、负载侧监测点信息",nDid);
logDto.setOperate(nDid + "更新电网侧、负载侧监测点信息"); logDto.setOperate(nDid + "更新电网侧、负载侧监测点信息");
//1.更新电网侧、负载侧监测点相关信息 //1.更新电网侧、负载侧监测点相关信息
devInfo.forEach(item->{ devInfo.forEach(item->{
@@ -606,6 +610,7 @@ public class MqttMessageHandler {
break; break;
} }
reqAndResParam.setMsg(askDataDto); reqAndResParam.setMsg(askDataDto);
log.info("askDevData的请求报文:" + new Gson().toJson(reqAndResParam));
publisher.send("/Pfm/DevCmd/"+version+"/"+nDid, new Gson().toJson(reqAndResParam),1,false); publisher.send("/Pfm/DevCmd/"+version+"/"+nDid, new Gson().toJson(reqAndResParam),1,false);
} }