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); }