From 2d5a88a20217e7dc0497613ec7072887ba3f1484 Mon Sep 17 00:00:00 2001
From: lzq <2495532633@qq.com>
Date: Fri, 14 Nov 2025 17:12:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E7=82=AC=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/SupervisionStatisticsMapper.java      |  2 ++
 .../service/SupervisionStatisticsService.java    | 16 ++++++++++++++++
 .../mapper/SupervisionStatisticsMapper.xml       |  7 +++++++
 3 files changed, 25 insertions(+)

diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/mapper/SupervisionStatisticsMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/mapper/SupervisionStatisticsMapper.java
index 51a8beb..d4809bb 100644
--- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/mapper/SupervisionStatisticsMapper.java
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/mapper/SupervisionStatisticsMapper.java
@@ -31,4 +31,6 @@ public interface SupervisionStatisticsMapper {
     Integer getTotalCarCount();
 
     List<Map<String, Object>> getKehuList();
+
+    List<Map<String, Object>> totalOrder();
 }
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/SupervisionStatisticsService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/SupervisionStatisticsService.java
index b6c320b..8de3f30 100644
--- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/SupervisionStatisticsService.java
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/SupervisionStatisticsService.java
@@ -24,6 +24,18 @@ public class SupervisionStatisticsService {
         YuYueSummary yuYueSummary = supervisionStatisticsMapper.getYuYueSummary();
 
         Integer disposeTotalWeight = supervisionStatisticsMapper.getDisposeTotalWeight();
+        List<Map<String, Object>> totalOrder = supervisionStatisticsMapper.totalOrder();
+        int orderCount_total = totalOrder.size();
+        int orderCount_sj = 0;
+        long gpsCount = totalOrder.stream()
+                .filter(it -> MapUtil.getInt(it, "lo") == 1)
+                .map(it -> MapUtil.getStr(it, "carNumber")).distinct().count();
+        for (Map<String, Object> map : totalOrder) {
+            Integer lo = MapUtil.getInt(map, "lo");
+            if (lo == 1) {
+                orderCount_sj++;
+            }
+        }
 
         CarSummary carSummary = supervisionStatisticsMapper.getCarSummary();
         Integer todayCarCount = supervisionStatisticsMapper.getTodayCarCount();
@@ -48,6 +60,10 @@ public class SupervisionStatisticsService {
                 .put("projects", projects == null ? new ArrayList<>() : projects)
                 .put("totalCarCount", totalCarCount == null ? 0 : totalCarCount)
                 .put("kehu", kehu == null ? new ArrayList<>() : kehu)
+                .put("totalOrderCount", orderCount_total)
+                .put("sjOrderCount", orderCount_sj)
+                .put("sjOrderCount", orderCount_sj)
+                .put("gpsCount", gpsCount)
                 .build();
     }
 
diff --git a/njzscloud-svr/src/main/resources/mapper/SupervisionStatisticsMapper.xml b/njzscloud-svr/src/main/resources/mapper/SupervisionStatisticsMapper.xml
index 81449a8..7409a01 100644
--- a/njzscloud-svr/src/main/resources/mapper/SupervisionStatisticsMapper.xml
+++ b/njzscloud-svr/src/main/resources/mapper/SupervisionStatisticsMapper.xml
@@ -178,5 +178,12 @@
           AND a.nickname NOT LIKE '%测试%'
         ORDER BY a.createtime DESC
     </select>
+    <select id="totalOrder" resultType="java.util.Map">
+        SELECT a.car_number carNumber, IF(c.license_plate IS NULL, 0, 1) lo
+        FROM ba_order a
+                 INNER JOIN ba_order_dispatch b ON b.order_no = a.order_no
+                 LEFT JOIN localizer_device c ON c.license_plate = a.car_number
+        WHERE a.status NOT IN (4, 5)
+    </select>
 
 </mapper>