From a12030c83c9efceadf27891c5da18e9b8d8888bf Mon Sep 17 00:00:00 2001 From: "3067418132@qq.com" Date: Tue, 21 Apr 2026 17:26:09 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81PLC=E7=9B=B8=E5=85=B3=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/vo/HotWaterControlVO.java | 14 +++++++++++++- .../mh/framework/netty/EchoServerHandler.java | 3 +++ .../impl/CollectionParamsManageServiceImpl.java | 17 ++++++++++++++--- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/mh-common/src/main/java/com/mh/common/core/domain/vo/HotWaterControlVO.java b/mh-common/src/main/java/com/mh/common/core/domain/vo/HotWaterControlVO.java index 36a6a53..d5267fb 100644 --- a/mh-common/src/main/java/com/mh/common/core/domain/vo/HotWaterControlVO.java +++ b/mh-common/src/main/java/com/mh/common/core/domain/vo/HotWaterControlVO.java @@ -116,8 +116,16 @@ public class HotWaterControlVO { private String emergencyStopStatusId; // 最低设置值 44 - private int minSet; + private BigDecimal minSet; private String minSetId; + + // 设定值上限 + private BigDecimal maxValueSet; + private String maxValueSetId; + + // 设定值下限 + private BigDecimal minValueSet; + private String minValueSetId; // 校准值 @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0") @@ -157,6 +165,10 @@ public class HotWaterControlVO { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date curTime; + // 异常复位：45 + private int exceptionReset; + private String exceptionResetId; + private int orderNum; public void setCounterSet(BigDecimal counterSet) { diff --git a/mh-framework/src/main/java/com/mh/framework/netty/EchoServerHandler.java b/mh-framework/src/main/java/com/mh/framework/netty/EchoServerHandler.java index e9f6134..c0669ef 100644 --- a/mh-framework/src/main/java/com/mh/framework/netty/EchoServerHandler.java +++ b/mh-framework/src/main/java/com/mh/framework/netty/EchoServerHandler.java @@ -126,6 +126,9 @@ public class EchoServerHandler extends ChannelInboundHandlerAdapter { // log.info("channelReadComplete接收到的数据{}, 长度: ===> {}", receiveStr, receiveStr.length()); //心跳包处理 if ((receiveStr.length() == 8) && receiveStr.startsWith("24")) { + if ("24006002".equals(receiveStr)) { + log.error("接收到心跳包 {}", receiveStr); + } // if ((receiveStr.length() == 8) && receiveStr.startsWith("C0A801FE")) { // log.info("接收到心跳包 ===> {}", receiveStr); // 开始进行会话保存 diff --git a/mh-system/src/main/java/com/mh/system/service/device/impl/CollectionParamsManageServiceImpl.java b/mh-system/src/main/java/com/mh/system/service/device/impl/CollectionParamsManageServiceImpl.java index 38d9ef2..55fd22c 100644 --- a/mh-system/src/main/java/com/mh/system/service/device/impl/CollectionParamsManageServiceImpl.java +++ b/mh-system/src/main/java/com/mh/system/service/device/impl/CollectionParamsManageServiceImpl.java @@ -921,11 +921,11 @@ public class CollectionParamsManageServiceImpl implements ICollectionParamsManag vo.setCloseSwitchId(item.getCpmId()); break; case "10": - vo.setWaterLevelSet(BigDecimal.valueOf(item.getCurValue().intValue())); + vo.setWaterLevelSet(BigDecimal.valueOf(item.getCurValue().doubleValue())); vo.setWaterLevelSetId(item.getCpmId()); break; case "11": - vo.setWaterLevel(BigDecimal.valueOf(item.getCurValue().intValue())); + vo.setWaterLevel(BigDecimal.valueOf(item.getCurValue().doubleValue())); vo.setCurTime(item.getCurTime()); vo.setWaterLevelId(item.getCpmId()); break; @@ -976,9 +976,14 @@ public class CollectionParamsManageServiceImpl implements ICollectionParamsManag break; case "44": // 最低设置值 - vo.setMinSet(item.getCurValue().intValue()); + vo.setMinSet(BigDecimal.valueOf(item.getCurValue().doubleValue())); vo.setMinSetId(item.getCpmId()); break; + case "45": + // 异常复位 + vo.setExceptionReset(item.getCurValue().intValue()); + vo.setExceptionResetId(item.getCpmId()); + break; default: // 处理未识别的paramType或忽略 break; @@ -1020,6 +1025,12 @@ public class CollectionParamsManageServiceImpl implements ICollectionParamsManag } else if (otherName.contains("中间值")) { deviceCalibrationVo.setMiddleValue(value); deviceCalibrationVo.setMiddleValueId(cpmId); + } else if (otherName.contains("设定上限")) { + deviceCalibrationVo.setMaxValueSet(value); + deviceCalibrationVo.setMaxValueSetId(cpmId); + } else if (otherName.contains("设定下限")) { + deviceCalibrationVo.setMinValueSet(value); + deviceCalibrationVo.setMinValueSetId(cpmId); } }