From 8873248220c566ae54034b233a9f2886970ef08e Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Tue, 12 Dec 2023 11:14:21 +0800
Subject: [PATCH] =?UTF-8?q?#=E6=B0=B4=E4=BD=8D=E6=9F=B1=E7=8A=B6=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheduled/service/operation/monitor/impl/MonitorServiceImpl.java    | 2 +-
 .../hzims/operational/station/service/impl/RealMonitorServiceImpl.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/monitor/impl/MonitorServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/monitor/impl/MonitorServiceImpl.java
index 21cff8b..700feef 100644
--- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/monitor/impl/MonitorServiceImpl.java
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/monitor/impl/MonitorServiceImpl.java
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.hnac.hzims.alarm.entity.AlarmEntity;
 import com.hnac.hzims.equipment.entity.WorkshopInfoEntity;
 import com.hnac.hzims.equipment.vo.EminfoAndEmParamVo;
 import com.hnac.hzims.fdp.vo.FdpFaultStatusVo;
@@ -455,6 +454,7 @@ public class MonitorServiceImpl implements MonitorService {
         item.setWaterLevelMax(station.getLimitWaterLevel());
         item.setServerType(station.getServeType());
         item.setStationDeptId(station.getRefDept());
+        item.setSort(9999);
         // 排序
         List<Dept> list = deptAll.stream().filter(o-> station.getRefDept().equals(o.getId())).collect(Collectors.toList());
         if(CollectionUtil.isEmpty(list)){
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/RealMonitorServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/RealMonitorServiceImpl.java
index a5a4e97..cd7b49f 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/RealMonitorServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/RealMonitorServiceImpl.java
@@ -965,7 +965,7 @@ public class RealMonitorServiceImpl implements IRealMonitorService {
 			return;
 		}
 		station.setWaterLevel(levelList.get(0));
-		if(station.getWaterLevelMax() <= 0 || station.getWaterLevel() <= 0){
+		if(ObjectUtil.isEmpty(station.getWaterLevelMax()) || ObjectUtil.isEmpty(station.getWaterLevel()) || station.getWaterLevelMax() <= 0 || station.getWaterLevel() <= 0){
 			return;
 		}
 		if(station.getWaterLevelMax() < station.getWaterLevel()){