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 3507ba7e..28c99f90 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 @@ -13,7 +13,10 @@ import com.kms.yg.cz.enmu.MonitorComposeEnum; import com.kms.yg.cz.enmu.MonitorSourceEnum; import com.kms.yg.cz.enmu.MonitorTypeEnum; import com.kms.yg.cz.mapper.MonitorConfigMapper; -import com.kms.yxgh.base.domain.monitor.*; +import com.kms.yxgh.base.domain.monitor.MsHdmObp; +import com.kms.yxgh.base.domain.monitor.MsHdmRsvr; +import com.kms.yxgh.base.domain.monitor.MsHdmRsvrav; +import com.kms.yxgh.base.domain.monitor.MsHdmRsvrevs; import com.kms.yxgh.common.dto.OperatorDto; import com.kms.yxgh.util.BeanCopyUtils; import com.kms.yxgh.util.DataCenterRestTemplateUtils; @@ -92,9 +95,8 @@ public class MonitorService { CompletableFuture currentWatterFuture = CompletableFuture.supplyAsync(() -> queryDataOne(MonitorSourceEnum.MS_HDM_RSVR, sp)); CompletableFuture avWatterFuture = CompletableFuture.supplyAsync(() -> queryDataOne(MonitorSourceEnum.MS_HDM_RSVRAV, sp)); CompletableFuture mxWatterFuture = CompletableFuture.supplyAsync(() -> queryDataOne(MonitorSourceEnum.MS_HDM_RSVREVS, sp)); - CompletableFuture> currentFlowFuture = CompletableFuture.supplyAsync(() -> queryDataOne(MonitorSourceEnum.MS_HDM_OBP, sp)); - CompletableFuture> avFlowFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_PSTAT, sp)); - CompletableFuture.allOf(currentWatterFuture, avWatterFuture, mxWatterFuture, currentFlowFuture, avFlowFuture).join(); + CompletableFuture> currentFlowFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp)); + CompletableFuture.allOf(currentWatterFuture, avWatterFuture, mxWatterFuture, currentFlowFuture).join(); MsHdmRsvr currentWatter = currentWatterFuture.join(); MsHdmRsvrav avWatter = avWatterFuture.join();