From 6f0f7a5660f17b1281f35911a838d3831f9aa0c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Wed, 24 Jan 2024 16:25:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=9F=A5=E8=AF=A2=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=20=E6=9C=BA=E6=9E=84=20=E9=AB=98=E9=80=9F=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=20=E8=BD=A6=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DcEventController.java         |   1 +
 .../java/com/zc/business/domain/DcEvent.java  |  20 ++
 .../mapper/business/DcEventMapper.xml         | 221 ++++++++++--------
 3 files changed, 140 insertions(+), 102 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/controller/DcEventController.java b/zc-business/src/main/java/com/zc/business/controller/DcEventController.java
index db486cba..fb255909 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcEventController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcEventController.java
@@ -57,6 +57,7 @@ public class DcEventController extends BaseController
 
         return getDataTable(list);
     }
+
     /**调度记录-事件列表 按时间展示交通事件。默认当天时间 。可查询条件 交通事件状态 ，时间范围
      *
      */
diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEvent.java b/zc-business/src/main/java/com/zc/business/domain/DcEvent.java
index 111e8c88..0847569b 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcEvent.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcEvent.java
@@ -188,6 +188,26 @@ public class DcEvent extends BaseEntity {
     @ApiModelProperty("高速公路")
     private Long roadId;
 
+    /**
+     * 2024-1-24新增
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("发生时间")
+    private Date occurrenceTime;
+    @ApiModelProperty("是否是感知事件  0 表示 false，1 表示 true")
+    private Integer isPerceived;
+ @ApiModelProperty("影响车道")
+    private Long lang;
+    @ApiModelProperty("高速名")
+    @TableField(exist = false)
+ private String roadName;
+    @ApiModelProperty("机构")
+    @TableField(exist = false)
+ private String organizationName;
+
+    /**
+     *
+     */
     @ApiModelProperty("事件详情参数")
     @TableField(exist = false)
     private DcEventMap dcEventMap;
diff --git a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
index 5b2a7e8c..7180adbe 100644
--- a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
@@ -27,6 +27,7 @@
             <result property="stringEventType"    column="stringEventType"    />
             <result property="stringEventSource"    column="stringEventSource"    />
             <result property="roadId"    column="road_id"    />
+            <result property="lang"    column="lang"    />
         </resultMap>
     <resultMap type="com.zc.business.domain.DcEvent" id="DcEventResultById">
             <result property="id"    column="id"    />
@@ -56,6 +57,11 @@
             <result property="commonPhrases"    column="common_phrases"    />
         <result property="stringEventType"    column="stringEventType"    />
         <result property="stringEventSource"    column="stringEventSource"    />
+        <result property="lang"    column="lang"    />
+        <result property="roadName"    column="road_name"    />
+        <result property="organizationName"    column="organization_name"    />
+
+
         </resultMap>
 
     <resultMap type="com.zc.business.domain.DcEvent" id="DcEventResultListAll">
@@ -313,111 +319,119 @@
 <!--    事件详情 包含事件类型 节点-->
     <select id="selectDcEventById" parameterType="String" resultMap="DcEventResultById">
 
- /*详情可以调用事件处理流程*/
- SELECT 	dc_event.id AS id,
-           dc_event.stake_mark,
-           dc_event.direction,
-           dc_event.user_id,
-           dc_event.start_time,
-           dc_event.end_time,
-           dc_event.estimated_end_time,
-           dc_event.event_level,
-           dc_event.event_type AS event_type,
-           CASE dc_event.event_type
-               WHEN '1' THEN '交通事故'
-               WHEN '2' THEN '车辆故障'
-               WHEN '3' THEN '交通管制'
-               WHEN '4' THEN '交通拥堵'
-               WHEN '5' THEN '非法上路'
-               WHEN '6' THEN '路障清除'
-               WHEN '7' THEN '施工建设'
-               WHEN '8' THEN '服务区异常'
-               WHEN '9' THEN '设施设备隐患'
-               WHEN '10' THEN '异常天气'
-               WHEN '11' THEN '其他事件'
-               ELSE '其他'
-               END AS stringEventType,
-           CASE  dc_event.event_subclass
-               WHEN '1-1'THEN '追尾'
-               WHEN '1-2'THEN '侧翻'
-               WHEN '1-3'THEN '撞护栏'
-               WHEN '1-4'THEN '自然'
-               WHEN '1-5'THEN '其他事故'
-               WHEN '2-1'THEN '车辆故障'
-               WHEN '3-1'THEN '主线封闭和限行'
-               WHEN '3-2'THEN '收费站封闭和限行'
-               WHEN '3-3'THEN '立交封闭和限行'
-               WHEN '3-4'THEN '服务区封闭和限行'
-               WHEN '4-1'THEN '道路拥堵'
-               WHEN '4-2'THEN '立交拥堵'
-               WHEN '4-3'THEN '收费站拥堵'
-               WHEN '4-4'THEN '服务区拥堵'
-               WHEN '5-1'THEN '行人'
-               WHEN '5-2'THEN '非机动车'
-               WHEN '5-3'THEN '摩托车'
-               WHEN '5-4'THEN '其他'
-               WHEN '6-1'THEN '烟雾'
-               WHEN '6-2'THEN '倒伏树木'
-               WHEN '6-3'THEN '撒落物'
-               WHEN '6-4'THEN '动物'
-               WHEN '6-5'THEN '其他'
-               WHEN '7-1'THEN '道路养护施工'
-               WHEN '7-2'THEN '收费站养护施工'
-               WHEN '7-3'THEN '服务区养护施工'
-               WHEN '7-4'THEN '枢纽立交匝道养护施工'
-               WHEN '7-5'THEN '地方道路养护施工'
-               WHEN '7-6'THEN '道路工程建设施工'
-               WHEN '7-7'THEN '收费站工程建设施工'
-               WHEN '7-8'THEN '服务区工程建设施工'
-               WHEN '7-9' THEN '枢纽立交匝道工程建设施工'
-               WHEN '7-10' THEN'地方道路工程建设施工'
-               WHEN '8-1'THEN'封闭、暂停营业'
-               WHEN '8-2'THEN'重要设施停用'
-               WHEN '8-3'THEN'服务区其他异常'
-               WHEN '9-1'THEN'摄像机'
-               WHEN '9-2'THEN'护栏'
-               WHEN '9-3'THEN'隔离栅'
-               WHEN '9-4'THEN'情报板'
-               WHEN '9-5'THEN'防炫板'
-               WHEN '9-6'THEN'其他'
-               WHEN '10-1' THEN'雨'
-               WHEN '10-2' THEN'雪'
-               WHEN '10-3' THEN'雾'
-               WHEN '10-4' THEN'大风'
-               WHEN '10-5' THEN'低温寒潮'
-               WHEN '10-6' THEN'路面积雪'
-               WHEN '10-7' THEN'路面结冰'
-               WHEN '10-8' THEN'路面积水'
-               WHEN '10-9' THEN'其他'
-               WHEN '11-1' THEN'其他事件'
-               END AS event_subclass,
+        /*详情可以调用事件处理流程*/
+        SELECT 	dc_event.id AS id,
+                  dc_event.stake_mark,
+                  dc_event.direction,
+                  dc_event.user_id,
+                  dc_event.start_time,
+                  dc_event.end_time,
+                  dc_event.estimated_end_time,
+                  dc_event.event_level,
+                  dc_event.event_type AS event_type,
+                  CASE dc_event.event_type
+                      WHEN '1' THEN '交通事故'
+                      WHEN '2' THEN '车辆故障'
+                      WHEN '3' THEN '交通管制'
+                      WHEN '4' THEN '交通拥堵'
+                      WHEN '5' THEN '非法上路'
+                      WHEN '6' THEN '路障清除'
+                      WHEN '7' THEN '施工建设'
+                      WHEN '8' THEN '服务区异常'
+                      WHEN '9' THEN '设施设备隐患'
+                      WHEN '10' THEN '异常天气'
+                      WHEN '11' THEN '其他事件'
+                      ELSE '其他'
+                      END AS stringEventType,
+                  CASE  dc_event.event_subclass
+                      WHEN '1-1'THEN '追尾'
+                      WHEN '1-2'THEN '侧翻'
+                      WHEN '1-3'THEN '撞护栏'
+                      WHEN '1-4'THEN '自然'
+                      WHEN '1-5'THEN '其他事故'
+                      WHEN '2-1'THEN '车辆故障'
+                      WHEN '3-1'THEN '主线封闭和限行'
+                      WHEN '3-2'THEN '收费站封闭和限行'
+                      WHEN '3-3'THEN '立交封闭和限行'
+                      WHEN '3-4'THEN '服务区封闭和限行'
+                      WHEN '4-1'THEN '道路拥堵'
+                      WHEN '4-2'THEN '立交拥堵'
+                      WHEN '4-3'THEN '收费站拥堵'
+                      WHEN '4-4'THEN '服务区拥堵'
+                      WHEN '5-1'THEN '行人'
+                      WHEN '5-2'THEN '非机动车'
+                      WHEN '5-3'THEN '摩托车'
+                      WHEN '5-4'THEN '其他'
+                      WHEN '6-1'THEN '烟雾'
+                      WHEN '6-2'THEN '倒伏树木'
+                      WHEN '6-3'THEN '撒落物'
+                      WHEN '6-4'THEN '动物'
+                      WHEN '6-5'THEN '其他'
+                      WHEN '7-1'THEN '道路养护施工'
+                      WHEN '7-2'THEN '收费站养护施工'
+                      WHEN '7-3'THEN '服务区养护施工'
+                      WHEN '7-4'THEN '枢纽立交匝道养护施工'
+                      WHEN '7-5'THEN '地方道路养护施工'
+                      WHEN '7-6'THEN '道路工程建设施工'
+                      WHEN '7-7'THEN '收费站工程建设施工'
+                      WHEN '7-8'THEN '服务区工程建设施工'
+                      WHEN '7-9' THEN '枢纽立交匝道工程建设施工'
+                      WHEN '7-10' THEN'地方道路工程建设施工'
+                      WHEN '8-1'THEN'封闭、暂停营业'
+                      WHEN '8-2'THEN'重要设施停用'
+                      WHEN '8-3'THEN'服务区其他异常'
+                      WHEN '9-1'THEN'摄像机'
+                      WHEN '9-2'THEN'护栏'
+                      WHEN '9-3'THEN'隔离栅'
+                      WHEN '9-4'THEN'情报板'
+                      WHEN '9-5'THEN'防炫板'
+                      WHEN '9-6'THEN'其他'
+                      WHEN '10-1' THEN'雨'
+                      WHEN '10-2' THEN'雪'
+                      WHEN '10-3' THEN'雾'
+                      WHEN '10-4' THEN'大风'
+                      WHEN '10-5' THEN'低温寒潮'
+                      WHEN '10-6' THEN'路面积雪'
+                      WHEN '10-7' THEN'路面结冰'
+                      WHEN '10-8' THEN'路面积水'
+                      WHEN '10-9' THEN'其他'
+                      WHEN '11-1' THEN'其他事件'
+                      END AS event_subclass,
+
 
+                  dc_event.event_cause,
+                  dc_event.description,
+                  dc_event.event_state,
+                  CASE  dc_event.event_source
+                      WHEN '1' THEN '96659'
+                      WHEN '2' THEN '交警转接'
+                      WHEN '3' THEN '道路巡查'
+                      WHEN '4' THEN '视频巡查'
+                      WHEN '5' THEN '视频AI'
+                      WHEN '6' THEN '一键救援'
+                      ELSE '其他'
+                      END AS stringEventSource,
+                  dc_event.event_nature,
+                  dc_event.remark,
+                  dc_event.create_time,
+                  dc_event.update_time,
+                  dc_event.event_source_tips,
+                  dc_event.in_tunnel,
+                  dc_event.lang as lang,
+                  dc_event_type.event_name AS event_name,
+                  dc_organization.organization_name as organization_name,
+                  dc_road.road_name as road_name
+
+        FROM dc_event
+                 LEFT JOIN dc_event_type ON  dc_event_type.event_type = dc_event.event_type
+                 LEFT JOIN dc_stake_mark on dc_stake_mark.stake_mark = dc_event.stake_mark
+                 LEFT JOIN dc_road_section on dc_stake_marks.section_id = dc_road_section.id
+                 LEFT JOIN dc_road on dc_road_section.road_id = dc_road.id
+            --  &#45;&#45; 关联机构表
+                 LEFT JOIN dc_organization ON dc_stake_marks.stake_mark = dc_organization.stake_mark
 
-           dc_event.event_cause,
-           dc_event.description,
-           dc_event.event_state,
-           CASE  dc_event.event_source
-               WHEN '1' THEN '96659'
-               WHEN '2' THEN '交警转接'
-               WHEN '3' THEN '道路巡查'
-               WHEN '4' THEN '视频巡查'
-               WHEN '5' THEN '视频AI'
-               WHEN '6' THEN '一键救援'
-               ELSE '其他'
-               END AS stringEventSource,
-           dc_event.event_nature,
-           dc_event.remark,
-           dc_event.create_time,
-           dc_event.update_time,
-           dc_event.event_source_tips,
-           dc_event.in_tunnel,
-           dc_event_type.event_name AS event_name,
-           dc_process_config.node_node AS node_node,
-           dc_process_config.common_phrases as common_phrases
- FROM dc_event
-          LEFT JOIN dc_process_config on dc_process_config.event_type = dc_event.event_type
-          LEFT JOIN dc_event_type ON  dc_event_type.event_type = dc_process_config.event_type
         where dc_event.id = #{id}
+
     </select>
 
 
@@ -446,6 +460,7 @@
                 <if test="eventSourceTips != null">event_source_tips,</if>
                 <if test="inTunnel != null">in_tunnel,</if>
                 <if test="roadId != null">road_id,</if>
+                <if test="lang != null">lang,</if>
             </trim>
             <trim prefix="values (" suffix=")" suffixOverrides=",">
                 <if test="id != null">#{id},</if>
@@ -470,6 +485,7 @@
                 <if test="eventSourceTips != null">#{eventSourceTips},</if>
                 <if test="inTunnel != null">#{inTunnel},</if>
                 <if test="roadId != null">#{roadId},</if>
+                <if test="lang != null">#{lang},</if>
             </trim>
         </insert>
 
@@ -497,6 +513,7 @@
                 <if test="eventSourceTips != null">event_source_tips = #{eventSourceTips},</if>
                 <if test="inTunnel != null">in_tunnel = #{inTunnel},</if>
                 <if test="roadId != null">road_id = #{roadId},</if>
+                <if test="lang != null">road_id = #{lang},</if>
             </trim>
             where id = #{id}
         </update>