|
@ -375,7 +375,7 @@ public class MonitorService { |
|
|
// 近一个小时
|
|
|
// 近一个小时
|
|
|
sp.setStartTime(BsSgcSkStatisticsService.getTimeBeforeHours(1)); |
|
|
sp.setStartTime(BsSgcSkStatisticsService.getTimeBeforeHours(1)); |
|
|
sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime()); |
|
|
sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime()); |
|
|
CompletableFuture<List<MsHdmObp>> msHdmObpOneListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MS_HDM_OBP, sp)); |
|
|
CompletableFuture<List<MsHdmObp>> msHdmObpOneListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp)); |
|
|
List<MsHdmObp> msHdmObpOneList = msHdmObpOneListFuture.join(); |
|
|
List<MsHdmObp> msHdmObpOneList = msHdmObpOneListFuture.join(); |
|
|
if (!CollectionUtils.isEmpty(msHdmObpOneList)) { |
|
|
if (!CollectionUtils.isEmpty(msHdmObpOneList)) { |
|
|
// 近一个小时
|
|
|
// 近一个小时
|
|
@ -385,7 +385,7 @@ public class MonitorService { |
|
|
// 近6个小时
|
|
|
// 近6个小时
|
|
|
sp.setStartTime(BsSgcSkStatisticsService.getTimeBeforeHours(6)); |
|
|
sp.setStartTime(BsSgcSkStatisticsService.getTimeBeforeHours(6)); |
|
|
sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime()); |
|
|
sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime()); |
|
|
CompletableFuture<List<MsHdmObp>> msHdmObpSixListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MS_HDM_OBP, sp)); |
|
|
CompletableFuture<List<MsHdmObp>> msHdmObpSixListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp)); |
|
|
List<MsHdmObp> msHdmObpSixList = msHdmObpSixListFuture.join(); |
|
|
List<MsHdmObp> msHdmObpSixList = msHdmObpSixListFuture.join(); |
|
|
if (!CollectionUtils.isEmpty(msHdmObpSixList)) { |
|
|
if (!CollectionUtils.isEmpty(msHdmObpSixList)) { |
|
|
// 近6个小时
|
|
|
// 近6个小时
|
|
@ -395,7 +395,7 @@ public class MonitorService { |
|
|
// 近9个小时
|
|
|
// 近9个小时
|
|
|
sp.setStartTime(BsSgcSkStatisticsService.getTimeBeforeHours(9)); |
|
|
sp.setStartTime(BsSgcSkStatisticsService.getTimeBeforeHours(9)); |
|
|
sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime()); |
|
|
sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime()); |
|
|
CompletableFuture<List<MsHdmObp>> msHdmObpNineListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MS_HDM_OBP, sp)); |
|
|
CompletableFuture<List<MsHdmObp>> msHdmObpNineListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp)); |
|
|
List<MsHdmObp> msHdmObpNineList = msHdmObpNineListFuture.join(); |
|
|
List<MsHdmObp> msHdmObpNineList = msHdmObpNineListFuture.join(); |
|
|
if (!CollectionUtils.isEmpty(msHdmObpNineList)) { |
|
|
if (!CollectionUtils.isEmpty(msHdmObpNineList)) { |
|
|
// 近9个小时
|
|
|
// 近9个小时
|
|
@ -405,7 +405,7 @@ public class MonitorService { |
|
|
// 近12个小时
|
|
|
// 近12个小时
|
|
|
sp.setStartTime(BsSgcSkStatisticsService.getTimeBeforeHours(12)); |
|
|
sp.setStartTime(BsSgcSkStatisticsService.getTimeBeforeHours(12)); |
|
|
sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime()); |
|
|
sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime()); |
|
|
CompletableFuture<List<MsHdmObp>> msHdmObpTwelveListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MS_HDM_OBP, sp)); |
|
|
CompletableFuture<List<MsHdmObp>> msHdmObpTwelveListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp)); |
|
|
List<MsHdmObp> msHdmObpTwelveList = msHdmObpTwelveListFuture.join(); |
|
|
List<MsHdmObp> msHdmObpTwelveList = msHdmObpTwelveListFuture.join(); |
|
|
if (!CollectionUtils.isEmpty(msHdmObpTwelveList)) { |
|
|
if (!CollectionUtils.isEmpty(msHdmObpTwelveList)) { |
|
|
// 近12个小时
|
|
|
// 近12个小时
|
|
|