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 aa95aa25..bf80aad7 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 @@ -441,6 +441,8 @@ public class MonitorService { attResTaskSzViewDto.setStationCode(dwsRelStWaga.getStcd()); sp.setStcd(dwsRelStWaga.getStcd()); + sp.setStartTime(BsSgcSkStatisticsService.getStartOfDay()); + sp.setEndTime(BsSgcSkStatisticsService.getStartOfNextDay()); List msHdmWasList = queryDataList(MonitorSourceEnum.MS_HDM_WAS, sp); if (!CollectionUtils.isEmpty(msHdmWasList)) { MsHdmWas msHdmRsvr = msHdmWasList.stream() diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/service/BsSgcSkStatisticsService.java b/shuili-system/src/main/java/com/kms/yxgh/common/service/BsSgcSkStatisticsService.java index bacd65ba..3bc87a4b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/service/BsSgcSkStatisticsService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/service/BsSgcSkStatisticsService.java @@ -1,7 +1,6 @@ package com.kms.yxgh.common.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.kms.yg.cz.dto.MonitorQueDto; import com.kms.yg.sk.domain.AttResRspp; import com.kms.yg.sk.dto.AttResTaskSzViewDto; import com.kms.yg.sk.dto.AttResTaskViewDto; @@ -231,13 +230,9 @@ public class BsSgcSkStatisticsService { } public static void main(String[] args) { - MonitorQueDto sp = new MonitorQueDto(); - sp.setStartTime(BsSgcSkStatisticsService.getStartOfDay()); - sp.setEndTime(BsSgcSkStatisticsService.getStartOfNextDay()); - System.out.println(sp.toString()); - sp.setStartTime(BsSgcSkStatisticsService.getLastYearTodayStartOfDay()); - sp.setEndTime(BsSgcSkStatisticsService.getLastYearTomorrowStartOfDay()); - System.out.println(sp.toString()); + System.out.println(getStartOfDay()); + System.out.println(getStartOfNextDay()); + } /**