From 30e915973d71763d7c74b8a17a2432bd176f949e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Mon, 3 Nov 2025 09:13:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BD=A6=E7=89=8C=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DcTrafficStatisticsController.java        |  4 +-
 .../mapper/DcGantryStatisticsDataMapper.java  |  2 +-
 .../IDcGantryStatisticsDataService.java       |  2 +-
 .../impl/DcGantryStatisticsDataImpl.java      | 16 ++++----
 .../business/DcGantryStatisticsDataMapper.xml | 41 +++++++++++--------
 5 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/controller/DcTrafficStatisticsController.java b/zc-business/src/main/java/com/zc/business/controller/DcTrafficStatisticsController.java
index 5c68fba6..2aad94fd 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcTrafficStatisticsController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcTrafficStatisticsController.java
@@ -259,9 +259,9 @@ public class DcTrafficStatisticsController extends BaseController {
      */
     @ApiOperation("交通流统计")
     @GetMapping("/history/trafficFlowStatistics")
-    public TableDataInfo trafficFlowStatistics(String startDate, String endDate, String direction, String periodType) {
+    public TableDataInfo trafficFlowStatistics(String startDate, String endDate, String direction, String periodType, String facilityName) {
         startPage();
-        List<Map<String, String>> mapList = dcGantryStatisticsDataService.trafficFlowStatistics(startDate, endDate, direction, periodType);
+        List<Map<String, String>> mapList = dcGantryStatisticsDataService.trafficFlowStatistics(startDate, endDate, direction, periodType,facilityName);
         // 将查询结果封装为成功响应并返回
         return getDataTable(mapList);
     }
diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcGantryStatisticsDataMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcGantryStatisticsDataMapper.java
index 9395dee0..a30899dc 100644
--- a/zc-business/src/main/java/com/zc/business/mapper/DcGantryStatisticsDataMapper.java
+++ b/zc-business/src/main/java/com/zc/business/mapper/DcGantryStatisticsDataMapper.java
@@ -57,7 +57,7 @@ public interface DcGantryStatisticsDataMapper extends BaseMapper<DcGantryStatist
      * @param periodType
      * @return
      */
-    List<Map<String, String>> trafficFlowStatistics(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("direction")String direction, @Param("periodType")String periodType);
+    List<Map<String, String>> trafficFlowStatistics(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("direction")String direction, @Param("periodType")String periodType, @Param("facilityName")String facilityName);
    //桩号升序排列
     List<TrafficFlowStatisticsMap> trafficFlowStatisticsAsc(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("direction")String direction, @Param("periodType")String periodType);
 
diff --git a/zc-business/src/main/java/com/zc/business/service/IDcGantryStatisticsDataService.java b/zc-business/src/main/java/com/zc/business/service/IDcGantryStatisticsDataService.java
index 35db947e..a1cec95f 100644
--- a/zc-business/src/main/java/com/zc/business/service/IDcGantryStatisticsDataService.java
+++ b/zc-business/src/main/java/com/zc/business/service/IDcGantryStatisticsDataService.java
@@ -54,7 +54,7 @@ public interface IDcGantryStatisticsDataService extends IService<DcGantryStatist
     List<Map<String, String>> trafficPeriodAnalysis(String startDate, String direction, String periodType);
 
 
-    List<Map<String, String>> trafficFlowStatistics(String startDate, String endDate, String direction, String periodType);
+    List<Map<String, String>> trafficFlowStatistics(String startDate, String endDate, String direction, String periodType,String facilityName);
     //桩号升序排列
     List<TrafficFlowStatisticsMap> trafficFlowStatisticsAsc(String startDate, String endDate, String direction, String periodType);
 
diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcGantryStatisticsDataImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcGantryStatisticsDataImpl.java
index 2c9fe878..56e3e400 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcGantryStatisticsDataImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcGantryStatisticsDataImpl.java
@@ -214,12 +214,12 @@ public class DcGantryStatisticsDataImpl extends ServiceImpl<DcGantryStatisticsDa
     @Override
     public List<Map<String, String>> realTimeTrafficFlow(String startDate, String direction, String periodType ) {
         List<Map<String, String>> mapList = dcGantryStatisticsDataMapper.realTimeTrafficFlow(startDate, direction, periodType);
-
+/*
         // 过滤孝里虚-平阴北虚 和 平阴北虚-孝里虚的数据
         List<Map<String, String>> filteredList = mapList.stream()
                 .filter(map -> !"孝里虚-平阴北虚".equals(map.get("name")) && !"平阴北虚-孝里虚".equals(map.get("name")))
-                .collect(Collectors.toList());
-        return filteredList;
+                .collect(Collectors.toList());*/
+        return mapList;
     }
     /**
      * 车流量时段分析
@@ -233,9 +233,9 @@ public class DcGantryStatisticsDataImpl extends ServiceImpl<DcGantryStatisticsDa
     }
 
     @Override
-    public List<Map<String, String>> trafficFlowStatistics(String startDate, String endDate, String direction, String periodType) {
+    public List<Map<String, String>> trafficFlowStatistics(String startDate, String endDate, String direction, String periodType,String facilityName) {
 
-        return dcGantryStatisticsDataMapper.trafficFlowStatistics(startDate,endDate,direction,periodType);
+        return dcGantryStatisticsDataMapper.trafficFlowStatistics(startDate,endDate,direction,periodType,facilityName);
     }
     //桩号升序排列
     @Override
@@ -247,12 +247,12 @@ public class DcGantryStatisticsDataImpl extends ServiceImpl<DcGantryStatisticsDa
     @Override
     public List<Map<String, String>> sectionTrafficRanking(String startDate, String direction, String periodType) {
         List<Map<String, String>> mapList = dcGantryStatisticsDataMapper.sectionTrafficRanking(startDate, direction, periodType);
-
+/*
         // 孝里虚-平阴北虚 或 平阴北虚-孝里虚的数据
         List<Map<String, String>> filteredList = mapList.stream()
                 .filter(map ->! "孝里虚-平阴北虚".equals(map.get("facilityName")) && !"平阴北虚-孝里虚".equals(map.get("facilityName")))
-                .collect(Collectors.toList());
-        return filteredList;
+                .collect(Collectors.toList());*/
+        return mapList;
     }
 
     public List<Map<String, String>> aggregateTrafficVolume(List<Map<String, Object>> dataList) {
diff --git a/zc-business/src/main/resources/mapper/business/DcGantryStatisticsDataMapper.xml b/zc-business/src/main/resources/mapper/business/DcGantryStatisticsDataMapper.xml
index ecba750a..33ed518a 100644
--- a/zc-business/src/main/resources/mapper/business/DcGantryStatisticsDataMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcGantryStatisticsDataMapper.xml
@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="statisticalDate" column="statistical_date"/>
         <result property="facilityName" column="facility_name"/>
         <result property="trafficVolume" column="traffic_volume"/>
+        <result property="traffiVolumePlate" column="traffic_volume_plate"/>
         <result property="periodType" column="period_type"/>
     </resultMap>
     <resultMap type="com.zc.business.domain.TrafficFlowStatisticsMap" id="trafficFlowStatistics">
@@ -280,15 +281,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </select>
 
     <select id="trafficFlowStatistics" resultMap="trafficFlowStatisticsMap" resultType="map" >
-
         SELECT
         i.interval_name,
-        i.stake_make ,
+        i.stake_make,
         i.end_make,
-        ps.facility_code ,
-        ps.facility_name ,
-        ps.direction ,
-        dgsd.traffic_volume ,
+        ps.facility_code,
+        ps.facility_name,
+        ps.direction,
+        dgsd.traffic_volume AS traffic_volume,
+        dvps.traffic_volume AS traffic_volume_plate,
         dgsd.statistical_date,
         dgsd.period_type
         FROM
@@ -310,21 +311,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT 'K182+987', 'K190+495', '信楼枢纽-嘉祥西立交' UNION ALL
         SELECT 'K190+495', 'K202+979', '嘉祥西立交-王官屯枢纽'
         ) AS i
-        JOIN dc_facility AS ps
+        JOIN dc_facility ps
         ON ps.stake_mark BETWEEN CONCAT(i.stake_make, '+0') AND CONCAT(i.end_make, '+0')
         <if test="direction != null">
             AND ps.direction = #{direction}
         </if>
-        JOIN dc_gantry_statistics_data AS dgsd
-        ON ps.facility_code = dgsd.gantry_code
-        <if test="startDate !=null">
-            AND DATE(dgsd.statistical_date) BETWEEN #{startDate} AND #{endDate}
-        </if>
-        <if test="periodType != null">
-            AND dgsd.period_type = #{periodType}
+         <if test="facilityName != null">
+            AND ps.facility_name = #{facilityName}
         </if>
-        ORDER BY
-        dgsd.statistical_date DESC
+        JOIN dc_gantry_statistics_data dgsd
+        ON ps.facility_code = dgsd.gantry_code
+        LEFT JOIN dc_gantry_vehicle_plate_statistics dvps
+        ON dvps.gantryid = dgsd.gantry_code
+        AND dvps.statistical_date = dgsd.statistical_date
+        AND dvps.period_type = dgsd.period_type
+        <where>
+            <if test="startDate != null">
+                AND DATE(dgsd.statistical_date) BETWEEN #{startDate} AND #{endDate}
+            </if>
+            <if test="periodType != null">
+                AND dgsd.period_type = #{periodType}
+            </if>
+        </where>
+        ORDER BY dgsd.statistical_date DESC, i.stake_make
     </select>
 <!--    桩号升序排列-->
     <select id="trafficFlowStatisticsAsc" resultMap="trafficFlowStatistics" resultType="com.zc.business.domain.TrafficFlowStatisticsMap" >