From 262dd68cd477922033ccad494be431fd16fe6be0 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Wed, 22 May 2024 20:00:32 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java | 4 ++-- .../com/njcn/device/pq/service/impl/GeneralDeviceService.java | 4 ++-- .../service/majornetwork/impl/RStatLimitServiceImpl.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java index 845342f57..bc8a64228 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java @@ -93,8 +93,8 @@ public class DeviceInfoParam implements Serializable { */ @ApiModelProperty("通讯状态") @Range(min = 0, max = 2, message = "通讯状态" + ValidMessage.PARAM_FORMAT_ERROR) - private Integer comFlag; - + private Integer comFlagStatus; + /** * 默认全部监测点 * @param deptIndex 部门索引 diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java index 062b73ccd..9a97e455d 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java @@ -320,8 +320,8 @@ public class GeneralDeviceService { } else { deviceType.setRunFlag(runFlag); } - if(ObjectUtil.isNotNull(deviceInfoParam.getComFlag())){ - deviceType.setComFlag(Arrays.asList(deviceInfoParam.getComFlag())); + if(ObjectUtil.isNotNull(deviceInfoParam.getComFlagStatus())){ + deviceType.setComFlag(Arrays.asList(deviceInfoParam.getComFlagStatus())); } filterDataType(deviceType, deviceInfoParam.getServerName()); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java index f564425f8..5c35f3a0a 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java @@ -152,7 +152,7 @@ public class RStatLimitServiceImpl implements RStatLimitService { //监测点总数 List data = generalDeviceInfoClient.getPracticalRunDeviceInfo(param).getData(); //在线 - param.setComFlag(1); + param.setComFlagStatus(1); List onData = generalDeviceInfoClient.getPracticalRunDeviceInfo(param).getData(); List line = data.stream().flatMap(x -> x.getLineIndexes().stream()).distinct().collect(Collectors.toList());