From cff990ec5044ed15ca3902835ce3eaaae98d6745 Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Sat, 20 Jan 2024 10:51:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E6=95=85=E8=BD=A6=E5=9E=8B=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DcTrafficIncidentsController.java |  7 ++++---
 .../mapper/DcTrafficIncidentsMapper.java         |  2 +-
 .../service/IDcTrafficIncidentsService.java      |  2 +-
 .../impl/DcTrafficIncidentsServiceImpl.java      |  4 ++--
 .../mapper/business/DcTrafficIncidentsMapper.xml | 16 ++++++++++++++--
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/controller/DcTrafficIncidentsController.java b/zc-business/src/main/java/com/zc/business/controller/DcTrafficIncidentsController.java
index 6c5ed6b5..a2385c06 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcTrafficIncidentsController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcTrafficIncidentsController.java
@@ -131,9 +131,10 @@ public class DcTrafficIncidentsController {
      * @return com.ruoyi.common.core.domain.AjaxResult
      */
     @ApiOperation("事故车型分析")
-    @GetMapping("/getAccidentVehicleAnalysis")
-    public AjaxResult getAccidentVehicleAnalysis(){
-        return trafficIncidentsService.getAccidentVehicleAnalysis();
+//    @GetMapping("/getAccidentVehicleAnalysis")
+    @PostMapping("/selectAccidentVehicleAnalysis")
+    public AjaxResult getAccidentVehicleAnalysis(@RequestBody Map<String,Object> params){
+        return trafficIncidentsService.getAccidentVehicleAnalysis(params);
     }
 
     /**
diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcTrafficIncidentsMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcTrafficIncidentsMapper.java
index 2ed3bdc3..bff8b7ad 100644
--- a/zc-business/src/main/java/com/zc/business/mapper/DcTrafficIncidentsMapper.java
+++ b/zc-business/src/main/java/com/zc/business/mapper/DcTrafficIncidentsMapper.java
@@ -171,7 +171,7 @@ public interface DcTrafficIncidentsMapper {
      * @param
      * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
      */
-    List<Map<String,Long>> getAccidentVehicleAnalysis();
+    List<Map<String,Long>> getAccidentVehicleAnalysis(Map<String,Object> params);
 
     /**
      * @Description 收费站统计分析table
diff --git a/zc-business/src/main/java/com/zc/business/service/IDcTrafficIncidentsService.java b/zc-business/src/main/java/com/zc/business/service/IDcTrafficIncidentsService.java
index 2d822a76..3c781c6e 100644
--- a/zc-business/src/main/java/com/zc/business/service/IDcTrafficIncidentsService.java
+++ b/zc-business/src/main/java/com/zc/business/service/IDcTrafficIncidentsService.java
@@ -85,7 +85,7 @@ public interface IDcTrafficIncidentsService {
      * @author liuwenge
      * @date 2024/1/15 15:38
      */
-    AjaxResult getAccidentVehicleAnalysis();
+    AjaxResult getAccidentVehicleAnalysis(Map<String,Object> params);
 
     /**
      * @param params
diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcTrafficIncidentsServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcTrafficIncidentsServiceImpl.java
index 9757ee00..9590f334 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcTrafficIncidentsServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcTrafficIncidentsServiceImpl.java
@@ -205,9 +205,9 @@ public class DcTrafficIncidentsServiceImpl implements IDcTrafficIncidentsService
      * @return com.ruoyi.common.core.domain.AjaxResult
      */
     @Override
-    public AjaxResult getAccidentVehicleAnalysis(){
+    public AjaxResult getAccidentVehicleAnalysis(Map<String,Object> params){
 
-        List<Map<String,Long>> list = trafficIncidentsMapper.getAccidentVehicleAnalysis();
+        List<Map<String,Long>> list = trafficIncidentsMapper.getAccidentVehicleAnalysis(params);
 
         Map<String,Object> smallCar = new HashMap<>();
         smallCar.put("type","smallCar");
diff --git a/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml b/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml
index d4eacf37..d9e55435 100644
--- a/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml
@@ -172,14 +172,26 @@
 
     <select id="getAccidentVehicleAnalysis" resultType="java.util.Map">
         select t1.id,
-            case when ISNULL(end_time) then TIMESTAMPDIFF(MINUTE,start_time,now()) else TIMESTAMPDIFF(MINUTE,start_time,end_time) end minuteTime,
+            case when ISNULL(t1.end_time) then TIMESTAMPDIFF(MINUTE,t1.start_time,now()) else TIMESTAMPDIFF(MINUTE,t1.start_time,t1.end_time) end minuteTime,
             ifNull(t2.small_car,0) smallCar,
             ifNull(t2.trucks,0) trucks,
             ifNull(t2.buses,0) buses,
             ifNull(t2.tankers,0) tankers
         from dc_event t1
         left join dc_event_vehicle_accident t2 on t1.id = t2.id
-        where event_type = '1' and date_format(start_time,'%Y-%m-%d') = current_date
+        where t1.event_type = '1' and t1.direction = #{direction}
+            <if test="type != null and type == '1'.toString">
+                and DATE_FORMAT(t1.start_time,'%Y%m%d') = DATE_FORMAT(#{startTime},'%Y%m%d')
+            </if>
+            <if test="type != null and type == '2'.toString">
+                and DATE_FORMAT(t1.start_time,'%Y%m') = DATE_FORMAT(#{startTime},'%Y%m')
+            </if>
+            <if test="type != null and type == '3'.toString">
+                and YEAR(t1.start_time) = YEAR(#{startTime}) and QUARTER(t1.start_time) = QUARTER(#{startTime})
+            </if>
+            <if test="type != null and type == '4'.toString">
+                and YEAR(t1.start_time) = YEAR(#{startTime})
+            </if>
     </select>
 
     <select id="selectTollStationAnalysis" resultType="java.util.Map">