fix:水闸总览

shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java

@@ -87,7 +87,7 @@ public enum MonitorSourceEnum {
     MS_HPM_GATE("闸门开度监测表", MsHpmGate.class),
     ATT_RES_RFKWLV("水库汛期运用主要特征值表", AttResRfkwlv.class),
     ATT_WAGA_SLHYPR("水文特征", BsSgcSzSwtz.class),
-    DWS_REL_ST_WAGA("水文水工程监测站所属水闸对象关系表", DwsRelStWaga.class),
+    DWS_REL_ST_WAGA("水文水工程监测站所属水闸对象关系表", MonitorTypeEnum.DATA, DwsRelStWaga.class),
     MS_WQM_WQAMD("水质自动监测数据表",  MsWqmWqamd.class),
     ;
 

shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java

@@ -393,9 +393,9 @@ public class MonitorService {
         sp.setEndTime(BsSgcSkStatisticsService.getLastYearTomorrowStartOfDay());
         List<MsHdmRsvr> msHdmRsvrLastFutureList = queryDataList(MonitorSourceEnum.MS_HDM_RSVR, sp);
         if (!CollectionUtils.isEmpty(msHdmRsvrLastFutureList)) {
-            MsHdmRsvr msHdmRsvrLast = msHdmRsvrFutureList.stream()
-                    .filter(e -> !Objects.isNull(e.getTm()))
-                    .max(Comparator.comparing(MsHdmRsvr::getTm)).orElse(null);
+            MsHdmRsvr msHdmRsvrLast = msHdmRsvrLastFutureList.stream()
+                    .filter(e -> !StringUtils.isEmpty(e.getRz()))
+                    .max(Comparator.comparing(MsHdmRsvr::getRz)).orElse(null);
             if (!Objects.isNull(msHdmRsvrLast)) {
                 // 去年今日
                 attResTaskViewDto.setLastYearToday(msHdmRsvrLast.getRz());
@@ -429,6 +429,18 @@ public class MonitorService {
             }
         }
 
+        List<DwsRelStWaga> dwsRelStWagasList = queryDataList(MonitorSourceEnum.DWS_REL_ST_WAGA, sp);
+        if (CollectionUtils.isEmpty(dwsRelStWagasList)) {
+            return attResTaskSzViewDto;
+        }
+        DwsRelStWaga dwsRelStWaga = dwsRelStWagasList.get(0);
+
+        // 代表站name
+        attResTaskSzViewDto.setStationName(dwsRelStWaga.getWagaName());
+        // 代表站code
+        attResTaskSzViewDto.setStationCode(dwsRelStWaga.getStcd());
+        sp.setStcd(dwsRelStWaga.getStcd());
+
         List<MsHdmWas> msHdmWasList = queryDataList(MonitorSourceEnum.MS_HDM_WAS, sp);
         if (!CollectionUtils.isEmpty(msHdmWasList)) {
             MsHdmWas msHdmRsvr = msHdmWasList.stream()
@@ -452,15 +464,6 @@ public class MonitorService {
             }
         }
 
-        List<DwsRelStWaga> dwsRelStWagasList = queryDataList(MonitorSourceEnum.DWS_REL_ST_WAGA, sp);
-        if (CollectionUtils.isEmpty(dwsRelStWagasList)) {
-            return attResTaskSzViewDto;
-        }
-        DwsRelStWaga dwsRelStWaga = dwsRelStWagasList.get(0);
-        // 代表站name
-        attResTaskSzViewDto.setStationName(dwsRelStWaga.getWagaName());
-        // 代表站code
-        attResTaskSzViewDto.setStationCode(dwsRelStWaga.getStcd());
         AttResTaskViewDto attResTaskViewDto = new AttResTaskViewDto();
         // 设置stcd
         attResTaskViewDto.setStcd(dwsRelStWaga.getStcd());
@@ -485,7 +488,7 @@ public class MonitorService {
         sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime());
         List<MsHdmObp> msHdmObpOneList = queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp);
         if (!CollectionUtils.isEmpty(msHdmObpOneList)) {
-            log.info("getYqInfo-One:{}", JSON.toJSONString(msHdmObpOneList));
+            log.info("getYqInfo-One-stcd:{}", attResTaskViewDto.getStcd() + JSON.toJSONString(msHdmObpOneList));
             // 近一个小时
             attResTaskViewDto.setNearlyAnHour(BsSgcSkStatisticsService.getSum(msHdmObpOneList));
         }
@@ -495,7 +498,7 @@ public class MonitorService {
         sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime());
         List<MsHdmObp> msHdmObpSixList = queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp);
         if (!CollectionUtils.isEmpty(msHdmObpSixList)) {
-            log.info("getYqInfo-Six:{}", JSON.toJSONString(msHdmObpSixList));
+            log.info("getYqInfo-Six-stcd:{}", attResTaskViewDto.getStcd() + JSON.toJSONString(msHdmObpSixList));
             // 近6个小时
             attResTaskViewDto.setNearlySixHours(BsSgcSkStatisticsService.getSum(msHdmObpSixList));
         }