From 8db510f629079b67ff6423b65150b5472486e633 Mon Sep 17 00:00:00 2001 From: "Mr.Wang" Date: Tue, 25 Jun 2024 16:20:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E5=88=99=E7=AD=9B=E9=80=89-=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zc/business/service/impl/DcDeviceServiceImpl.java | 4 ++++ .../business/service/impl/DcEmergencyPlansServiceImpl.java | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java index ebf7399c..2f7cba6c 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java @@ -427,7 +427,11 @@ public class DcDeviceServiceImpl extends ServiceImpl i String childType = String.valueOf(parameter.get("childType")); String deviceState = String.valueOf(parameter.get("deviceState")); String direction = String.valueOf(parameter.get("direction")); + Integer useState = Integer.parseInt(parameter.get("useState").toString()); DcDevice device = new DcDevice(); + if (!Objects.equals(useState, "null")) { + device.setUseState(useState); + } if (!Objects.equals(childType, "null")) { device.setChildType(childType); } diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java index d73d9177..a913e615 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java @@ -494,6 +494,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { end.add(markArray[1]); parameter.put("startStakeMark", start); parameter.put("endStakeMark", end); + parameter.put("useState",1); dcDevices = dcDeviceService.devicePileNumberQueryDevice(parameter); Collections.sort(dcDevices, new Comparator() { @Override @@ -517,6 +518,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { end.add("154"); parameter.put("startStakeMark", start); parameter.put("endStakeMark", end); + parameter.put("useState",1); dcDevices = dcDeviceService.devicePileNumberQueryDevice(parameter); Collections.sort(dcDevices, new Comparator() { @Override @@ -543,6 +545,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { end.add("154"); parameter.put("startStakeMark", start); parameter.put("endStakeMark", end); + parameter.put("useState",1); dcDevices = dcDeviceService.devicePileNumberQueryDevice(parameter); Collections.sort(dcDevices, new Comparator() { @Override @@ -566,6 +569,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { end.add(markArray[1]); parameter.put("startStakeMark", start); parameter.put("endStakeMark", end); + parameter.put("useState",1); dcDevices = dcDeviceService.devicePileNumberQueryDevice(parameter); Collections.sort(dcDevices, new Comparator() { @Override @@ -594,6 +598,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { parameter.put("startStakeMark", start); parameter.put("endStakeMark", end); parameter.put("deviceType", dcExecuteAction.getDeviceType()); + parameter.put("useState",1); // 根据桩号范围，查询附近设备 dcDevices = dcDeviceService.devicePileNumberQueryDevice(parameter); }