diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java index d48363cd..104ced11 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java @@ -375,7 +375,7 @@ public class MonitorService { // 近一个小时 sp.setStartTime(BsSgcSkStatisticsService.getTimeBeforeHours(1)); sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime()); - CompletableFuture> msHdmObpOneListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MS_HDM_OBP, sp)); + CompletableFuture> msHdmObpOneListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp)); List msHdmObpOneList = msHdmObpOneListFuture.join(); if (!CollectionUtils.isEmpty(msHdmObpOneList)) { // 近一个小时 @@ -385,7 +385,7 @@ public class MonitorService { // 近6个小时 sp.setStartTime(BsSgcSkStatisticsService.getTimeBeforeHours(6)); sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime()); - CompletableFuture> msHdmObpSixListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MS_HDM_OBP, sp)); + CompletableFuture> msHdmObpSixListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp)); List msHdmObpSixList = msHdmObpSixListFuture.join(); if (!CollectionUtils.isEmpty(msHdmObpSixList)) { // 近6个小时 @@ -395,7 +395,7 @@ public class MonitorService { // 近9个小时 sp.setStartTime(BsSgcSkStatisticsService.getTimeBeforeHours(9)); sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime()); - CompletableFuture> msHdmObpNineListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MS_HDM_OBP, sp)); + CompletableFuture> msHdmObpNineListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp)); List msHdmObpNineList = msHdmObpNineListFuture.join(); if (!CollectionUtils.isEmpty(msHdmObpNineList)) { // 近9个小时 @@ -405,7 +405,7 @@ public class MonitorService { // 近12个小时 sp.setStartTime(BsSgcSkStatisticsService.getTimeBeforeHours(12)); sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime()); - CompletableFuture> msHdmObpTwelveListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MS_HDM_OBP, sp)); + CompletableFuture> msHdmObpTwelveListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp)); List msHdmObpTwelveList = msHdmObpTwelveListFuture.join(); if (!CollectionUtils.isEmpty(msHdmObpTwelveList)) { // 近12个小时