qdintc/fishery-back
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 塘口设备列表，bug修复。

Browse Source
This commit is contained in:
tianyongbao
2026-03-27 20:50:19 +08:00
parent 035e9f78c0
commit 7eb07611a6
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PondController.java
View File

@@ -288,11 +288,16 @@ public class PondController extends BaseController {
DeviceVo deviceVo = MapstructUtils.convert(device, DeviceVo.class); DeviceVo deviceVo = MapstructUtils.convert(device, DeviceVo.class);
// 设置告警码信息 // 设置告警码信息
PondMode1WarnCodeInfo detectorWarnCodeInfo = new PondMode1WarnCodeInfo();
if (device.getWarnCode() != null && device.getWarnCode() < DefineDeviceWarnCode.UserMaxCode) { if (device.getWarnCode() != null && device.getWarnCode() < DefineDeviceWarnCode.UserMaxCode) {
// 告警码信息已在DeviceVo中,无需额外处理 detectorWarnCodeInfo.setWarnCode(device.getWarnCode());
detectorWarnCodeInfo.setWarnDescription(DefineDeviceWarnCode.toWarnDescription(device.getWarnCode()));
} else { } else {
detectorWarnCodeInfo.setWarnCode(DefineDeviceWarnCode.None);
detectorWarnCodeInfo.setWarnDescription("");
deviceVo.setWarnCode(DefineDeviceWarnCode.None); deviceVo.setWarnCode(DefineDeviceWarnCode.None);
} }
deviceVo.setWarnCodeInfo(detectorWarnCodeInfo);
// 判断是否有联动控制 // 判断是否有联动控制
deviceVo.setIsLinkCtrl(false); deviceVo.setIsLinkCtrl(false);

5
intc-modules/intc-fishery/src/main/java/com/intc/fishery/domain/vo/DeviceVo.java
View File

@@ -346,4 +346,9 @@ public class DeviceVo implements Serializable {
*/ */
private Boolean isLinkCtrl; private Boolean isLinkCtrl;
/**
* 告警码信息（告警码 + 告警描述）
*/
private PondMode1WarnCodeInfo warnCodeInfo;
} }