From 7eb07611a61246ecd8972ae8257a1bcddae31101 Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Fri, 27 Mar 2026 20:50:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A1=98=E5=8F=A3=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8Cbug=E4=BF=AE=E5=A4=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/intc/fishery/controller/PondController.java | 7 ++++++- .../src/main/java/com/intc/fishery/domain/vo/DeviceVo.java | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PondController.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PondController.java index ca29d78..a5e8041 100644 --- a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PondController.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PondController.java @@ -288,11 +288,16 @@ public class PondController extends BaseController { DeviceVo deviceVo = MapstructUtils.convert(device, DeviceVo.class); // 设置告警码信息 + PondMode1WarnCodeInfo detectorWarnCodeInfo = new PondMode1WarnCodeInfo(); if (device.getWarnCode() != null && device.getWarnCode() < DefineDeviceWarnCode.UserMaxCode) { - // 告警码信息已在DeviceVo中,无需额外处理 + detectorWarnCodeInfo.setWarnCode(device.getWarnCode()); + detectorWarnCodeInfo.setWarnDescription(DefineDeviceWarnCode.toWarnDescription(device.getWarnCode())); } else { + detectorWarnCodeInfo.setWarnCode(DefineDeviceWarnCode.None); + detectorWarnCodeInfo.setWarnDescription(""); deviceVo.setWarnCode(DefineDeviceWarnCode.None); } + deviceVo.setWarnCodeInfo(detectorWarnCodeInfo); // 判断是否有联动控制 deviceVo.setIsLinkCtrl(false); diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceVo.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceVo.java index 79d0f45..14acfd2 100644 --- a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceVo.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceVo.java @@ -346,4 +346,9 @@ public class DeviceVo implements Serializable { */ private Boolean isLinkCtrl; + /** + * 告警码信息（告警码 + 告警描述） + */ + private PondMode1WarnCodeInfo warnCodeInfo; + }