From b45fe4c040c8a78e2337d82d10c5476b5c17678b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Tue, 27 Feb 2024 13:57:12 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B2=B3=E5=8C=97=E4=B8=B4=E6=97=B6=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DataQualityStatServiceImpl.java | 6 ------ .../majornetwork/impl/MonitorServiceImpl.java | 15 ++++++++++++--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityStatServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityStatServiceImpl.java index 3a1d48907..5c5e2d53c 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityStatServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityStatServiceImpl.java @@ -109,12 +109,6 @@ public class DataQualityStatServiceImpl implements DataQualityStatService { @Override public List getMonitoringIndexDataQualityStat(StatisticsBizBaseParam param) { - -// // 获取当前用户的部门的子部门信息 -// List data = getPmsGeneralDeviceDTOList(param); -// // 取出单位id -// List deptIdList = data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList()); - //单位code集合 /*获取下级子部门信息*/ List deptDTOList = deptFeignClient.getDepSonDetailByDeptId (param.getId ()).getData ( ); if (CollUtil.isEmpty(deptDTOList)) { diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java index 25dc89d59..57e0e6dde 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java @@ -316,9 +316,18 @@ public class MonitorServiceImpl extends ServiceImpl impl BeanUtils.copyProperties(monitorParam, monitor); checkOther(monitorParam, monitor, true); - monitor.setIsUploadHead(3); - monitor.setMonitorUploadStatus(3); - monitor.setMonitorOverlimitStatus(3); + + Monitor tem = this.getById(monitorParam.getId()); + if(tem.getIsUploadHead() == 1){ + monitor.setIsUploadHead(3); + } + if(tem.getMonitorUploadStatus() == 1){ + monitor.setMonitorUploadStatus(3); + } + if(tem.getMonitorOverlimitStatus() == 1){ + monitor.setMonitorOverlimitStatus(3); + } + this.updateById(monitor); //修改监测点同时修改pms_special_monitor