From c42f4c56fd9f185de568453077533e110433e8d0 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Fri, 13 Oct 2023 12:50:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/njcn/access/pojo/RspDataDto.java | 2 +- .../main/java/com/njcn/access/pojo/po/CsSoftInfoPO.java | 2 +- .../java/com/njcn/access/handler/MqttMessageHandler.java | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/iot-access/access-api/src/main/java/com/njcn/access/pojo/RspDataDto.java b/iot-access/access-api/src/main/java/com/njcn/access/pojo/RspDataDto.java index 73a192e..05e4246 100644 --- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/RspDataDto.java +++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/RspDataDto.java @@ -81,7 +81,7 @@ public class RspDataDto { private Double ctRatio; @SerializedName("Capacity_A") - private Double capacity; + private Double capacityA; } } diff --git a/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsSoftInfoPO.java b/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsSoftInfoPO.java index 9f5eed7..a6c8204 100644 --- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsSoftInfoPO.java +++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsSoftInfoPO.java @@ -18,7 +18,7 @@ import java.util.Date; */ @Data @TableName("cs_soft_info") -public class CsSoftInfoPO extends BaseEntity { +public class CsSoftInfoPO { private static final long serialVersionUID = 1L; 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 a5cd2aa..c5cdaa9 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 @@ -56,6 +56,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.Instant; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -357,6 +358,7 @@ public class MqttMessageHandler { RspDataDto rspDataDto = JSON.parseObject(JSON.toJSONString(res.getMsg()), RspDataDto.class); switch (rspDataDto.getDataType()){ case 1: + log.info("{} 更新设备软件信息",nDid); logDto.setOperate(nDid + "更新设备软件信息"); RspDataDto.SoftInfo softInfo = JSON.parseObject(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.SoftInfo.class); //记录设备软件信息 @@ -384,6 +386,7 @@ public class MqttMessageHandler { List devInfo = JSON.parseArray(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.LdevInfo.class); if (CollectionUtil.isNotEmpty(devInfo)){ if (Objects.equals(res.getDid(),1)){ + log.info("{} 更新治理监测点信息和设备容量",nDid); logDto.setOperate(nDid + "更新治理监测点信息和设备容量"); List list = new ArrayList<>(); devInfo.forEach(item->{ @@ -401,7 +404,7 @@ public class MqttMessageHandler { CsDevCapacityPO csDevCapacity = new CsDevCapacityPO(); csDevCapacity.setLineId(nDid.concat("0")); csDevCapacity.setCldid(item.getClDid()); - csDevCapacity.setCapacity(item.getCapacity()); + csDevCapacity.setCapacity(item.getCapacityA()); list.add(csDevCapacity); }); devCapacityFeignClient.addList(list); @@ -410,6 +413,7 @@ public class MqttMessageHandler { //4.询问监测点pt/ct信息 askDevData(nDid,version,3,(res.getMid()+1)); } else if (Objects.equals(res.getDid(),2)) { + log.info("{} 更新电网侧、负载侧监测点信息",nDid); logDto.setOperate(nDid + "更新电网侧、负载侧监测点信息"); //1.更新电网侧、负载侧监测点相关信息 devInfo.forEach(item->{ @@ -606,6 +610,7 @@ public class MqttMessageHandler { break; } reqAndResParam.setMsg(askDataDto); + log.info("askDevData的请求报文:" + new Gson().toJson(reqAndResParam)); publisher.send("/Pfm/DevCmd/"+version+"/"+nDid, new Gson().toJson(reqAndResParam),1,false); }