From c6ea9ed4ee70e6357d26d415deb3510437fa48eb Mon Sep 17 00:00:00 2001 From: ljw Date: Wed, 10 Dec 2025 10:29:38 +0800 Subject: [PATCH] 1 --- .../mapper/SupervisionStatisticsMapper.java | 6 ++ .../service/SupervisionStatisticsService.java | 14 ++++ .../mapper/bs/SupervisionStatisticsMapper.xml | 81 +++++++++++++++++++ 3 files changed, 101 insertions(+) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/bs/mapper/SupervisionStatisticsMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/bs/mapper/SupervisionStatisticsMapper.java index 827526f..86ac962 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/bs/mapper/SupervisionStatisticsMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/bs/mapper/SupervisionStatisticsMapper.java @@ -65,6 +65,12 @@ public interface SupervisionStatisticsMapper { @SuppressWarnings("MybatisXMapperMethodInspection") List> dataTable(); + @SuppressWarnings("MybatisXMapperMethodInspection") + Map todayAuditPassStatistics(); + + @SuppressWarnings("MybatisXMapperMethodInspection") + List> stationStatistics(); + Integer getTotalCarCount(); @SuppressWarnings("MybatisXMapperMethodInspection") diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/bs/service/SupervisionStatisticsService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/bs/service/SupervisionStatisticsService.java index 084eb0a..6552e71 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/bs/service/SupervisionStatisticsService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/bs/service/SupervisionStatisticsService.java @@ -254,6 +254,16 @@ public class SupervisionStatisticsService { log.error("数据获取失败", ex); return Collections.emptyList(); }); + CompletableFuture> todayAuditPassStatisticsFuture = CompletableFuture.supplyAsync(supervisionStatisticsMapper::todayAuditPassStatistics, threadPoolExecutor) + .exceptionally(ex -> { + log.error("数据获取失败", ex); + return Collections.emptyMap(); + }); + CompletableFuture>> stationStatisticsFuture = CompletableFuture.supplyAsync(supervisionStatisticsMapper::stationStatistics, threadPoolExecutor) + .exceptionally(ex -> { + log.error("数据获取失败", ex); + return Collections.emptyList(); + }); try { Map dataStatistics = dataStatisticsFuture.get(); @@ -268,6 +278,8 @@ public class SupervisionStatisticsService { Map transStatistics = transStatisticsFuture.get(); Map weightStatistics = weightStatisticsFuture.get(); List> dataTable = dataTableFuture.get(); + Map todayAuditPassStatistics = todayAuditPassStatisticsFuture.get(); + List> stationStatistics = stationStatisticsFuture.get(); return MapUtil.builder() .put("dataStatistics", dataStatistics) .put("warnTruck", warnTruck) @@ -281,6 +293,8 @@ public class SupervisionStatisticsService { .put("userStatistics", userStatistics) .put("weightStatistics", weightStatistics) .put("dataTable", dataTable) + .put("todayAuditPassStatistics", todayAuditPassStatistics) + .put("stationStatistics", stationStatistics) .build(); } catch (Exception e) { throw Exceptions.exception(e, "数据获取失败"); diff --git a/njzscloud-svr/src/main/resources/mapper/bs/SupervisionStatisticsMapper.xml b/njzscloud-svr/src/main/resources/mapper/bs/SupervisionStatisticsMapper.xml index df046ea..b91255c 100644 --- a/njzscloud-svr/src/main/resources/mapper/bs/SupervisionStatisticsMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/bs/SupervisionStatisticsMapper.xml @@ -469,4 +469,85 @@ WHERE a.biz_obj IN ('WuYe', 'ShiGongDanWei', 'ChaiQian', 'SheQu') AND a.deleted = 0 + +