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 1/7] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E6=9C=BA=E6=9E=84=20=E9=AB=98=E9=80=9F?=
 =?UTF-8?q?=E5=90=8D=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>

From 95d35013d696e6519bff3b55d6ae27ffcab9982d Mon Sep 17 00:00:00 2001
From: mengff <1198151809@qq.com>
Date: Wed, 24 Jan 2024 18:56:48 +0800
Subject: [PATCH 2/7] =?UTF-8?q?--=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/controller/DeviceController.java | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/controller/DeviceController.java b/zc-business/src/main/java/com/zc/business/controller/DeviceController.java
index 59068c78..3694dfa9 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DeviceController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DeviceController.java
@@ -23,7 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.zc.business.service.IDeviceService;
 
 /**
- * 【请填写功能名称】Controller
+ * 设备状态 Controller
  * 
  * @author ruoyi
  * @date 2024-01-20
@@ -36,7 +36,7 @@ public class DeviceController extends BaseController
     private IDeviceService deviceService;
 
     /**
-     * 查询【请填写功能名称】列表
+     * 查询设备状态列表
      */
     @PreAuthorize("@ss.hasPermi('system:device:list')")
     @GetMapping("/list")
@@ -48,10 +48,10 @@ public class DeviceController extends BaseController
     }
 
     /**
-     * 导出【请填写功能名称】列表
+     * 导出设备状态列表
      */
     @PreAuthorize("@ss.hasPermi('system:device:export')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @Log(title = "设备状态", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, Device device)
     {
@@ -61,7 +61,7 @@ public class DeviceController extends BaseController
     }
 
     /**
-     * 获取【请填写功能名称】详细信息
+     * 获取设备状态详细信息
      */
     @PreAuthorize("@ss.hasPermi('system:device:query')")
     @GetMapping(value = "/{id}")
@@ -71,10 +71,10 @@ public class DeviceController extends BaseController
     }
 
     /**
-     * 新增【请填写功能名称】
+     * 新增设备状态
      */
     @PreAuthorize("@ss.hasPermi('system:device:add')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @Log(title = "设备状态", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody Device device)
     {
@@ -82,10 +82,10 @@ public class DeviceController extends BaseController
     }
 
     /**
-     * 修改【请填写功能名称】
+     * 修改设备状态
      */
     @PreAuthorize("@ss.hasPermi('system:device:edit')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @Log(title = "设备状态", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody Device device)
     {
@@ -93,10 +93,10 @@ public class DeviceController extends BaseController
     }
 
     /**
-     * 删除【请填写功能名称】
+     * 删除设备状态
      */
     @PreAuthorize("@ss.hasPermi('system:device:remove')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+    @Log(title = "设备状态", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {

From 25b68b8cfff966724e772cd37f15c31640ba788c Mon Sep 17 00:00:00 2001
From: mengff <1198151809@qq.com>
Date: Wed, 24 Jan 2024 19:26:49 +0800
Subject: [PATCH 3/7] =?UTF-8?q?--=E8=AE=BE=E5=A4=87=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/zc/business/controller/DeviceController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zc-business/src/main/java/com/zc/business/controller/DeviceController.java b/zc-business/src/main/java/com/zc/business/controller/DeviceController.java
index 3694dfa9..170b58b2 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DeviceController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DeviceController.java
@@ -57,7 +57,7 @@ public class DeviceController extends BaseController
     {
         List<Device> list = deviceService.selectDeviceList(device);
         ExcelUtil<Device> util = new ExcelUtil<>(Device.class);
-        util.exportExcel(response, list, "【请填写功能名称】数据");
+        util.exportExcel(response, list, "设备状态数据");
     }
 
     /**

From e354d1ce59e66f0029380a8fcca9f2839ff179d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Thu, 25 Jan 2024 10:31:48 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=EF=BC=8C=E6=9C=80=E5=A4=A7=E6=8B=A5=E5=A0=B5?=
 =?UTF-8?q?=E9=87=8C=E7=A8=8B=20=E4=BF=AE=E6=94=B9=E6=8B=A5=E5=A0=B5?=
 =?UTF-8?q?=E9=87=8C=E7=A8=8B=E7=B1=BB=E5=9E=8Bfloat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/zc/business/domain/DcEvent.java |  6 ++++++
 .../business/domain/DcEventTrafficCongestion.java | 10 +++++++++-
 .../business/service/impl/DcEventServiceImpl.java |  5 +++++
 .../resources/mapper/business/DcEventMapper.xml   | 15 +++++++++++++--
 .../business/DcEventTrafficCongestionMapper.xml   |  7 ++++++-
 .../mapper/business/DcProcessConfigMapper.xml     |  3 +++
 6 files changed, 42 insertions(+), 4 deletions(-)

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 0847569b..292ed873 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
@@ -1,6 +1,7 @@
 package com.zc.business.domain;
 
 import java.util.Date;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -204,6 +205,11 @@ public class DcEvent extends BaseEntity {
     @ApiModelProperty("机构")
     @TableField(exist = false)
  private String organizationName;
+    @ApiModelProperty("事件流程")
+    @TableField(exist = false)
+ private List<DcProcessConfig> processConfigList;
+@ApiModelProperty("事件标题")
+    private String eventTitle;
 
     /**
      *
diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEventTrafficCongestion.java b/zc-business/src/main/java/com/zc/business/domain/DcEventTrafficCongestion.java
index f36a1f74..f667ebe2 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcEventTrafficCongestion.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcEventTrafficCongestion.java
@@ -32,7 +32,12 @@ public class DcEventTrafficCongestion extends BaseEntity
 
     /** 拥堵里程(公里) */
     @ApiModelProperty("拥堵里程(公里)")
-    private Long congestionMileage;
+    private Float congestionMileage;
+
+    /** 最大拥堵里程(公里) */
+    @ApiModelProperty("最大拥堵里程(公里)")
+    private Float maxCongestionMileage;
+
 
     /** 拥堵原因：
             1-车流量大
@@ -70,11 +75,14 @@ public class DcEventTrafficCongestion extends BaseEntity
     @ApiModelProperty("地点（收费站）：1-入口 2-出口 3-入口内广场 4--出口内广场5-外广场6-入口车道7-出口车道8-入口匝道9-出口匝道 ")
     private Long location;
 
+
     @ApiModelProperty("事件信息实体")
     //事件信息表
     @TableField(exist = false)
     private DcEvent dcEvent;
 
+
+
     @ApiModelProperty("路网设施实体")
     //事件信息表
     @TableField(exist = false)
diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java
index 2928a529..2ccd91e5 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java
@@ -46,6 +46,8 @@ private DcEventAbnormalWeatherMapper dcEventAbnormalWeatherMapper;
     @Autowired
     private DcEventTrafficControlMapper dcEventTrafficControlMapper;
 
+    @Autowired
+    private DcProcessConfigMapper dcProcessConfigMapper;
 
 
 
@@ -59,6 +61,9 @@ private DcEventAbnormalWeatherMapper dcEventAbnormalWeatherMapper;
     public DcEvent selectDcEventById( String id)
     {
         DcEvent dcEvent = dcEventMapper.selectDcEventById(id);
+
+        List<DcProcessConfig> processConfigList = dcProcessConfigMapper.selectDcProcessConfigByEventType(Math.toIntExact(dcEvent.getEventType()));
+       dcEvent.setProcessConfigList(processConfigList);
         return dcEvent;
     }
 
diff --git a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
index 7180adbe..425ef99a 100644
--- a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
@@ -28,6 +28,7 @@
             <result property="stringEventSource"    column="stringEventSource"    />
             <result property="roadId"    column="road_id"    />
             <result property="lang"    column="lang"    />
+            <result property="eventTitle"    column="event_title"    />
         </resultMap>
     <resultMap type="com.zc.business.domain.DcEvent" id="DcEventResultById">
             <result property="id"    column="id"    />
@@ -54,6 +55,7 @@
             <result property="eventName"    column="event_name"    />
             <result property="nodeNode"    column="node_node"    />
             <result property="roadId"    column="road_id"    />
+        <result property="eventTitle"    column="event_title"    />
             <result property="commonPhrases"    column="common_phrases"    />
         <result property="stringEventType"    column="stringEventType"    />
         <result property="stringEventSource"    column="stringEventSource"    />
@@ -64,6 +66,7 @@
 
         </resultMap>
 
+<!--
     <resultMap type="com.zc.business.domain.DcEvent" id="DcEventResultListAll">
         <result property="id"    column="id"    />
         <result property="deptId"    column="dept_id"    />
@@ -88,9 +91,9 @@
         <result property="inTunnel"    column="in_tunnel"    />
         <result property="stringEventType"    column="stringEventType"    />
         <result property="stringEventSource"    column="stringEventSource"    />
-        <!--     <result property="dcProcessConfig.processNode"   column="process_node"    />
+        &lt;!&ndash;     <result property="dcProcessConfig.processNode"   column="process_node"    />
                 <result property="dcProcessConfig.commonPhrases"   column="common_phrases"    />
-                <result property="dcProcessConfig.nodeNode"   column="node_node"    /> -->
+                <result property="dcProcessConfig.nodeNode"   column="node_node"    /> &ndash;&gt;
         <result property="dcEventMap.processNode" column="process_node"/>
         <result property="dcEventMap.commonPhrases" column="common_phrases"/>
         <result property="dcEventMap.nodeNode" column="node_node"/>
@@ -118,6 +121,7 @@
         <result property="dcEventMap.contactNumber" column="contact_number"/>
     </resultMap>
 
+-->
 
 <!--        <sql id="selectDcEventVo">
             select id, dept_id, stake_mark, direction, user_id, start_time, end_time, estimated_end_time, event_level, event_type, event_subclass, event_cause, description, event_state, event_source, event_nature, remark, create_time, update_time, event_source_tips, in_tunnel from dc_event
@@ -134,6 +138,7 @@
             estimated_end_time,
             event_level,
             event_type,
+            event_title,
             CASE event_type
                 WHEN '1' THEN '交通事故'
                 WHEN '2' THEN '车辆故障'
@@ -246,6 +251,7 @@
 	dc_event.event_source_tips,
 	dc_event.in_tunnel,
 	dc_event.road_id,
+	dc_event.event_title,
 
 	dc_event_type.event_name AS event_name,
 	dc_process_config.node_node AS node_node,
@@ -322,7 +328,9 @@
         /*详情可以调用事件处理流程*/
         SELECT 	dc_event.id AS id,
                   dc_event.stake_mark,
+                  dc_event.event_title,
                   dc_event.direction,
+                  dc_event.event_title,
                   dc_event.user_id,
                   dc_event.start_time,
                   dc_event.end_time,
@@ -461,6 +469,7 @@
                 <if test="inTunnel != null">in_tunnel,</if>
                 <if test="roadId != null">road_id,</if>
                 <if test="lang != null">lang,</if>
+                <if test="eventTitle != null">event_title,</if>
             </trim>
             <trim prefix="values (" suffix=")" suffixOverrides=",">
                 <if test="id != null">#{id},</if>
@@ -486,6 +495,7 @@
                 <if test="inTunnel != null">#{inTunnel},</if>
                 <if test="roadId != null">#{roadId},</if>
                 <if test="lang != null">#{lang},</if>
+                <if test="eventTitle != null">#{eventTitle},</if>
             </trim>
         </insert>
 
@@ -514,6 +524,7 @@
                 <if test="inTunnel != null">in_tunnel = #{inTunnel},</if>
                 <if test="roadId != null">road_id = #{roadId},</if>
                 <if test="lang != null">road_id = #{lang},</if>
+                <if test="eventTitle != null">event_title = #{eventTitle},</if>
             </trim>
             where id = #{id}
         </update>
diff --git a/zc-business/src/main/resources/mapper/business/DcEventTrafficCongestionMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventTrafficCongestionMapper.xml
index 04b8d7de..eea4c5ea 100644
--- a/zc-business/src/main/resources/mapper/business/DcEventTrafficCongestionMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcEventTrafficCongestionMapper.xml
@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="facilityId"    column="facility_id"    />
         <result property="rampId"    column="ramp_id"    />
         <result property="location"    column="location"    />
+        <result property="maxCongestionMileage"    column="max_congestion_mileage"    />
 
         <result property="dcFacility.facilityName"    column="facility_name"    />
         <result property="dcFacility.facilityType"    column="facility_type"    />
@@ -22,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDcEventTrafficCongestionVo">
-        select id, congestion_mileage, congestion_cause, facility_id, ramp_id, location from dc_event_traffic_congestion
+        select id, congestion_mileage, congestion_cause, facility_id, ramp_id, location,max_congestion_mileage from dc_event_traffic_congestion
     </sql>
     <!--     -->
     <sql id="selectDcEventTrafficCongestionVoById">
@@ -33,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             dc_event_traffic_congestion.id as id,
             dc_event_traffic_congestion.location as location,
             dc_event_traffic_congestion.ramp_id as ramp_id,
+            dc_event_traffic_congestion.max_congestion_mileage as max_congestion_mileage,
 
             dc_facility.other_config as other_config,
             dc_facility.remark as remark,
@@ -69,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="facilityId != null">facility_id,</if>
             <if test="rampId != null">ramp_id,</if>
             <if test="location != null">location,</if>
+            <if test="maxCongestionMileage != null">max_congestion_mileage,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -77,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="facilityId != null">#{facilityId},</if>
             <if test="rampId != null">#{rampId},</if>
             <if test="location != null">#{location},</if>
+            <if test="maxCongestionMileage != null">#{maxCongestionMileage},</if>
          </trim>
     </insert>
 
@@ -88,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="facilityId != null">facility_id = #{facilityId},</if>
             <if test="rampId != null">ramp_id = #{rampId},</if>
             <if test="location != null">location = #{location},</if>
+            <if test="maxCongestionMileage != null">max_congestion_mileage = #{maxCongestionMileage},</if>
         </trim>
         where id = #{id}
     </update>
diff --git a/zc-business/src/main/resources/mapper/business/DcProcessConfigMapper.xml b/zc-business/src/main/resources/mapper/business/DcProcessConfigMapper.xml
index 9b949a05..85d34f15 100644
--- a/zc-business/src/main/resources/mapper/business/DcProcessConfigMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcProcessConfigMapper.xml
@@ -83,4 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="deleteDcProcessConfigByEventType" parameterType="Integer">
         delete from dc_process_config where event_type = #{eventType}
     </delete>
+
+
+
 </mapper>
\ No newline at end of file

From 5e202d96b0893bac4f0b7540f585ba72ebcf6f70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Thu, 25 Jan 2024 10:42:48 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/business/DcEventMapper.xml      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
index 425ef99a..f7eb0541 100644
--- a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
@@ -433,10 +433,10 @@
         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_section on dc_stake_mark.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
+                 LEFT JOIN dc_organization ON dc_stake_mark.stake_mark = dc_organization.stake_mark
 
         where dc_event.id = #{id}
 

From bc1b8479f15b9ae10c09a06e981a6c53831377b6 Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Thu, 25 Jan 2024 10:45:15 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zc/business/domain/DcBoardReleaseLog.java | 10 +++---
 .../java/com/zc/business/domain/DcDevice.java |  2 +-
 .../zc/business/domain/DcEventHistory.java    | 12 +++----
 .../com/zc/business/domain/DcEventMap.java    |  2 +-
 .../com/zc/business/domain/DcFacility.java    |  2 +-
 .../zc/business/domain/DcOrganization.java    | 12 +++----
 .../com/zc/business/domain/DcWarning.java     | 12 +++----
 .../DcPerceivedEventsWarningMapper.java       |  2 +-
 .../service/impl/DcDeviceServiceImpl.java     |  6 ++--
 .../service/impl/DcFacilityServiceImpl.java   |  4 +--
 .../business/DcBoardReleaseLogMapper.xml      |  4 +--
 .../mapper/business/DcDeviceMapper.xml        | 10 +++---
 .../business/DcEventConstructionMapper.xml    |  2 +-
 .../mapper/business/DcEventHistoryMapper.xml  | 12 +++----
 .../mapper/business/DcEventMapper.xml         | 10 +++---
 .../business/DcEventServiceAreaMapper.xml     |  2 +-
 .../DcEventTrafficCongestionMapper.xml        |  2 +-
 .../business/DcEventTrafficControlMapper.xml  |  2 +-
 .../mapper/business/DcOrganizationMapper.xml  | 10 +++---
 .../DcPerceivedEventsWarningMapper.xml        | 32 +++++++++----------
 .../business/DcTrafficIncidentsMapper.xml     |  2 +-
 21 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java b/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java
index 1599ad83..262dc44c 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java
@@ -37,7 +37,7 @@ public class DcBoardReleaseLog extends BaseEntity
     /** 桩号 */
     @Excel(name = "桩号")
     @ApiModelProperty(value="桩号")
-    private String stakeMarkId;
+    private String stakeMark;
 
     /** 方向1-上行,2-中,3-下行 */
     @Excel(name = "方向1-上行,2-中,3-下行")
@@ -118,12 +118,12 @@ public class DcBoardReleaseLog extends BaseEntity
         return deviceName;
     }
 
-    public String getStakeMarkId() {
-        return stakeMarkId;
+    public String getStakeMark() {
+        return stakeMark;
     }
 
-    public void setStakeMarkId(String stakeMarkId) {
-        this.stakeMarkId = stakeMarkId;
+    public void setStakeMark(String stakeMark) {
+        this.stakeMark = stakeMark;
     }
 
     public String getDirection() {
diff --git a/zc-business/src/main/java/com/zc/business/domain/DcDevice.java b/zc-business/src/main/java/com/zc/business/domain/DcDevice.java
index 8b036887..3843bfed 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcDevice.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcDevice.java
@@ -22,7 +22,7 @@ public class DcDevice {
     @ApiModelProperty("产品ID")
     private Long productId;
     @ApiModelProperty("桩号")
-    private String stakeMarkId;
+    private String stakeMark;
     @ApiModelProperty("方向1-上行(菏泽方向),2-中,3-下行(济南方向)")
     private String direction;
     @ApiModelProperty("设备名称")
diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEventHistory.java b/zc-business/src/main/java/com/zc/business/domain/DcEventHistory.java
index a4916fe3..19e99a8f 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcEventHistory.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcEventHistory.java
@@ -28,7 +28,7 @@ public class DcEventHistory extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String stakeMarkId;
+    private String stakeMark;
 
     /** 1-上
             2-中
@@ -127,14 +127,14 @@ public class DcEventHistory extends BaseEntity
     {
         return groupId;
     }
-    public void setStakeMarkId(String stakeMarkId) 
+    public void setStakeMark(String stakeMark)
     {
-        this.stakeMarkId = stakeMarkId;
+        this.stakeMark = stakeMark;
     }
 
-    public String getStakeMarkId() 
+    public String getStakeMark()
     {
-        return stakeMarkId;
+        return stakeMark;
     }
     public void setDirection(String direction) 
     {
@@ -286,7 +286,7 @@ public class DcEventHistory extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
             .append("groupId", getGroupId())
-            .append("stakeMarkId", getStakeMarkId())
+            .append("stakeMark", getStakeMark())
             .append("direction", getDirection())
             .append("roadId", getRoadId())
             .append("startTime", getStartTime())
diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEventMap.java b/zc-business/src/main/java/com/zc/business/domain/DcEventMap.java
index 58cebd89..66875dbf 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcEventMap.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcEventMap.java
@@ -48,7 +48,7 @@ public class DcEventMap {
     @ApiModelProperty("机构地址")
     private String organizationAddress;
     @ApiModelProperty("机构所在桩号")
-    private String dcOrganizationStakeMarkId;
+    private String dcOrganizationStakeMark;
     @ApiModelProperty("车牌号")
     private String vehiclePlate;
     @ApiModelProperty("车辆类型")
diff --git a/zc-business/src/main/java/com/zc/business/domain/DcFacility.java b/zc-business/src/main/java/com/zc/business/domain/DcFacility.java
index 11f3e6eb..616f2d2f 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcFacility.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcFacility.java
@@ -18,7 +18,7 @@ public class DcFacility {
     @ApiModelProperty("ID")
     private Long id;
     @ApiModelProperty("桩号")
-    private String stakeMarkId;
+    private String stakeMark;
     @ApiModelProperty("方向")
     private String direction;
     @ApiModelProperty("道路标识")
diff --git a/zc-business/src/main/java/com/zc/business/domain/DcOrganization.java b/zc-business/src/main/java/com/zc/business/domain/DcOrganization.java
index a6e9ce80..f396054a 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcOrganization.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcOrganization.java
@@ -39,7 +39,7 @@ public class DcOrganization extends TreeEntity
     /** 桩号 */
     @ApiModelProperty("桩号")
     @Excel(name = "桩号")
-    private String stakeMarkId;
+    private String stakeMark;
 
     /** 救援单位 */
     @ApiModelProperty("救援单位")
@@ -119,14 +119,14 @@ public class DcOrganization extends TreeEntity
     {
         return organizationAddress;
     }
-    public void setStakeMarkId(String stakeMarkId) 
+    public void setStakeMark(String stakeMark)
     {
-        this.stakeMarkId = stakeMarkId;
+        this.stakeMark = stakeMark;
     }
 
-    public String getStakeMarkId() 
+    public String getStakeMark()
     {
-        return stakeMarkId;
+        return stakeMark;
     }
     public void setRescueUnit(String rescueUnit) 
     {
@@ -155,7 +155,7 @@ public class DcOrganization extends TreeEntity
             .append("organizationType", getOrganizationType())
             .append("organizationName", getOrganizationName())
             .append("organizationAddress", getOrganizationAddress())
-            .append("stakeMarkId", getStakeMarkId())
+            .append("stakeMark", getStakeMark())
             .append("rescueUnit", getRescueUnit())
             .append("description", getDescription())
             .append("createTime", getCreateTime())
diff --git a/zc-business/src/main/java/com/zc/business/domain/DcWarning.java b/zc-business/src/main/java/com/zc/business/domain/DcWarning.java
index 7204f2cb..55c1dfb6 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcWarning.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcWarning.java
@@ -23,7 +23,7 @@ public class DcWarning extends BaseEntity
 
     /** 所在桩号 */
     @Excel(name = "所在桩号")
-    private String stakeMarkId;
+    private String stakeMark;
 
     /** 方向：
             1-上行
@@ -179,14 +179,14 @@ public class DcWarning extends BaseEntity
     {
         return id;
     }
-    public void setStakeMarkId(String stakeMarkId) 
+    public void setStakeMark(String stakeMark)
     {
-        this.stakeMarkId = stakeMarkId;
+        this.stakeMark = stakeMark;
     }
 
-    public String getStakeMarkId() 
+    public String getStakeMark()
     {
-        return stakeMarkId;
+        return stakeMark;
     }
     public void setDirection(String direction) 
     {
@@ -292,7 +292,7 @@ public class DcWarning extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("stakeMarkId", getStakeMarkId())
+            .append("stakeMark", getStakeMark())
             .append("direction", getDirection())
             .append("deptId", getDeptId())
             .append("warningState", getWarningState())
diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcPerceivedEventsWarningMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcPerceivedEventsWarningMapper.java
index 4393be4a..8c249b45 100644
--- a/zc-business/src/main/java/com/zc/business/mapper/DcPerceivedEventsWarningMapper.java
+++ b/zc-business/src/main/java/com/zc/business/mapper/DcPerceivedEventsWarningMapper.java
@@ -56,7 +56,7 @@ public interface DcPerceivedEventsWarningMapper {
     //查询某个路段下的全部桩号
     List<HashMap<String,Object>> selectSectionMark(DcWarning dcWarning);
     //根据桩号查询条数
-    String selectSectionNumber(@Param("stakeMarkId") String markId,@Param("direction") String direction);
+    String selectSectionNumber(@Param("stakeMark") String markId,@Param("direction") String direction);
     //预警事件,事件列表 查询状态为上报的感知事件
     List<HashMap<String,Object>> selectWarningEscalation(DcWarning dcWarning);
     //修改感知事件信息
diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java
index a0f9b336..0bc79af1 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java
@@ -61,8 +61,8 @@ public class DcDeviceServiceImpl extends ServiceImpl<DcDeviceMapper, DcDevice> i
         }
 
         // 木桩
-        if (StringUtils.hasText(dcDevice.getStakeMarkId())) {
-            queryWrapper.eq(DcDevice::getStakeMarkId, dcDevice.getStakeMarkId());
+        if (StringUtils.hasText(dcDevice.getStakeMark())) {
+            queryWrapper.eq(DcDevice::getStakeMark, dcDevice.getStakeMark());
         }
 
         // 设备名称
@@ -281,7 +281,7 @@ public class DcDeviceServiceImpl extends ServiceImpl<DcDeviceMapper, DcDevice> i
     public DcStakeMark exampleQueryTheAssociatedPileNumber(DcDevice dcDevice) {
         DcStakeMark dcStakeMark = new DcStakeMark();
         dcStakeMark.setDirection(dcDevice.getDirection());
-        dcStakeMark.setId(dcDevice.getStakeMarkId());
+        dcStakeMark.setId(dcDevice.getStakeMark());
         List<DcStakeMark> dcStakeMarks = dcStakeMarkService.listStakeMark(dcStakeMark);
         if (dcStakeMarks.size() == 1) {
             return dcStakeMarks.get(0);
diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcFacilityServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcFacilityServiceImpl.java
index 1c746baf..4737cc8d 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcFacilityServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcFacilityServiceImpl.java
@@ -34,8 +34,8 @@ public class DcFacilityServiceImpl extends ServiceImpl<DcFacilityMapper, DcFacil
         }
 
         // 木桩
-        if (StringUtils.hasText(dcFacility.getStakeMarkId())) {
-            queryWrapper.eq(DcFacility::getStakeMarkId, dcFacility.getStakeMarkId());
+        if (StringUtils.hasText(dcFacility.getStakeMark())) {
+            queryWrapper.eq(DcFacility::getStakeMark, dcFacility.getStakeMark());
         }
 
         // 方向
diff --git a/zc-business/src/main/resources/mapper/business/DcBoardReleaseLogMapper.xml b/zc-business/src/main/resources/mapper/business/DcBoardReleaseLogMapper.xml
index c3635195..39f25722 100644
--- a/zc-business/src/main/resources/mapper/business/DcBoardReleaseLogMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcBoardReleaseLogMapper.xml
@@ -17,12 +17,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="releaseUserId"    column="release_user_id"    />
         <result property="platform"    column="platform"    />
         <result property="releaseIp"    column="release_ip"    />
-        <result property="stakeMarkId"    column="stake_mark_id"    />
+        <result property="stakeMark"    column="stake_mark"    />
         <result property="direction"    column="direction"    />
     </resultMap>
 
     <sql id="selectDcBoardReleaseLogVo">
-        select t1.id, t1.device_id, t2.device_name,t2.stake_mark_id, t2.direction,t1.release_content, t1.release_status,
+        select t1.id, t1.device_id, t2.device_name,t2.stake_mark, t2.direction,t1.release_content, t1.release_status,
             t1.release_time,t1.release_dept_name,t1.release_dept_id,t1.release_user_name,t1.release_user_id,t1.platform,release_ip
         from dc_board_release_log t1
         left join dc_device t2 on t1.device_id = t2.iot_device_id
diff --git a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml
index 3e71d46c..de2898c4 100644
--- a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml
@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="iotDeviceId" column="iot_device_id"/>
         <result property="groupId" column="group_id"/>
         <result property="productId" column="product_id"/>
-        <result property="stakeMarkId" column="stake_mark_id"/>
+        <result property="stakeMark" column="stake_mark"/>
         <result property="direction" column="direction"/>
         <result property="deviceName" column="device_name"/>
         <result property="deviceCode" column="device_code"/>
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                iot_device_id,
                group_id,
                product_id,
-               stake_mark_id,
+               stake_mark,
                direction,
                device_name,
                device_code,
@@ -60,17 +60,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectDcDeviceList" parameterType="dcDevice" resultMap="DcDevice">
-        select t1.id, t1.iot_device_id, t1.group_id, t1.product_id, t1.stake_mark_id, t1.direction, t1.device_name, t1.device_code, t1.device_type,
+        select t1.id, t1.iot_device_id, t1.group_id, t1.product_id, t1.stake_mark, t1.direction, t1.device_name, t1.device_code, t1.device_type,
         t1.installation_Date,t1.production_date,t1.durable_years,t1.installation_site,t1.use_state,t1.device_state,t1.other_config,t1.remark,t1.create_time,t1.update_time,
         t2.longitude,t2.latitude
         from dc_device t1
-        left join dc_stake_mark t2 on t1.stake_mark_id = t2.id and t1.direction = t2.direction
+        left join dc_stake_mark t2 on t1.stake_mark = t2.id and t1.direction = t2.direction
         <where>
             <if test="id != null  and id != ''">and t1.id = #{id}</if>
             <if test="iotDeviceId != null  and iotDeviceId != ''">and t1.iot_device_id = #{iotDeviceId}</if>
             <if test="groupId != null  and groupId != ''">and t1.group_id = #{groupId}</if>
             <if test="productId != null  and productId != ''">and t1.product_id = #{productId}</if>
-            <if test="stakeMarkId != null  and stakeMarkId != ''">and t1.stake_mark_id = #{stakeMarkId}</if>
+            <if test="stakeMark != null  and stakeMark != ''">and t1.stake_mark = #{stakeMark}</if>
             <if test="direction != null  and direction != ''">and t1.direction = #{direction}</if>
             <if test="deviceName != null  and deviceName != ''">and t1.device_name like concat('%', #{deviceName}, '%')</if>
             <if test="deviceCode != null  and deviceCode != ''">and t1.device_code = #{deviceCode}</if>
diff --git a/zc-business/src/main/resources/mapper/business/DcEventConstructionMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventConstructionMapper.xml
index 0090c311..92c2e7cd 100644
--- a/zc-business/src/main/resources/mapper/business/DcEventConstructionMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcEventConstructionMapper.xml
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dcFacility.facilityName"    column="facility_name"    />
         <result property="dcFacility.facilityType"    column="facility_type"    />
         <result property="dcFacility.direction"    column="direction"    />
-        <result property="dcFacility.stakeMarkId"    column="stake_mark"    />
+        <result property="dcFacility.stakeMark"    column="stake_mark"    />
         <result property="dcFacility.remark"    column="remark"    />
         <result property="dcFacility.otherConfig"    column="other_config"    />
     </resultMap>
diff --git a/zc-business/src/main/resources/mapper/business/DcEventHistoryMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventHistoryMapper.xml
index 9c0e6645..d9bf7524 100644
--- a/zc-business/src/main/resources/mapper/business/DcEventHistoryMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcEventHistoryMapper.xml
@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.zc.business.domain.DcEventHistory" id="DcEventHistoryResult">
         <result property="id"    column="id"    />
         <result property="groupId"    column="group_id"    />
-        <result property="stakeMarkId"    column="stake_mark_id"    />
+        <result property="stakeMark"    column="stake_mark"    />
         <result property="direction"    column="direction"    />
         <result property="roadId"    column="road_id"    />
         <result property="startTime"    column="start_time"    />
@@ -30,14 +30,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDcEventHistoryVo">
-        select id, group_id, stake_mark_id, direction, road_id, start_time, end_time, event_level, event_category, event_type, event_subclass, event_cause, impact_level, description, handling_person, handling_result, other_config, event_source, event_nature, remark, create_time, update_time from dc_event_history
+        select id, group_id, stake_mark, direction, road_id, start_time, end_time, event_level, event_category, event_type, event_subclass, event_cause, impact_level, description, handling_person, handling_result, other_config, event_source, event_nature, remark, create_time, update_time from dc_event_history
     </sql>
 
     <select id="selectDcEventHistoryList" parameterType="DcEventHistory" resultMap="DcEventHistoryResult">
         <include refid="selectDcEventHistoryVo"/>
         <where>  
             <if test="groupId != null "> and group_id = #{groupId}</if>
-            <if test="stakeMarkId != null  and stakeMarkId != ''"> and stake_mark_id = #{stakeMarkId}</if>
+            <if test="stakeMark != null  and stakeMark != ''"> and stake_mark = #{stakeMark}</if>
             <if test="direction != null  and direction != ''"> and direction = #{direction}</if>
             <if test="roadId != null "> and road_id = #{roadId}</if>
             <if test="startTime != null "> and start_time = #{startTime}</if>
@@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="groupId != null">group_id,</if>
-            <if test="stakeMarkId != null and stakeMarkId != ''">stake_mark_id,</if>
+            <if test="stakeMark != null and stakeMark != ''">stake_mark,</if>
             <if test="direction != null and direction != ''">direction,</if>
             <if test="roadId != null">road_id,</if>
             <if test="startTime != null">start_time,</if>
@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="groupId != null">#{groupId},</if>
-            <if test="stakeMarkId != null and stakeMarkId != ''">#{stakeMarkId},</if>
+            <if test="stakeMark != null and stakeMark != ''">#{stakeMark},</if>
             <if test="direction != null and direction != ''">#{direction},</if>
             <if test="roadId != null">#{roadId},</if>
             <if test="startTime != null">#{startTime},</if>
@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update dc_event_history
         <trim prefix="SET" suffixOverrides=",">
             <if test="groupId != null">group_id = #{groupId},</if>
-            <if test="stakeMarkId != null and stakeMarkId != ''">stake_mark_id = #{stakeMarkId},</if>
+            <if test="stakeMark != null and stakeMark != ''">stake_mark = #{stakeMark},</if>
             <if test="direction != null and direction != ''">direction = #{direction},</if>
             <if test="roadId != null">road_id = #{roadId},</if>
             <if test="startTime != null">start_time = #{startTime},</if>
diff --git a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
index 7180adbe..dc1f0098 100644
--- a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
@@ -107,7 +107,7 @@
         <result property="dcEventMap.organizationType" column="organization_type"/>
         <result property="dcEventMap.organizationName" column="organization_name"/>
         <result property="dcEventMap.organizationAddress" column="organization_address"/>
-        <result property="dcEventMap.dcOrganizationStakeMarkId" column="dc_organization_stake_mark_id"/>
+        <result property="dcEventMap.dcOrganizationStakeMark" column="dc_organization_stake_mark"/>
         <result property="dcEventMap.dcOrganizationDescription" column="dc_organization_description"/>
         <result property="dcEventMap.vehiclePlate" column="vehicle_plate"/>
         <result property="dcEventMap.vehicleType" column="vehicle_type"/>
@@ -264,7 +264,7 @@
 	dc_organization.organization_type,
 	dc_organization.organization_name,
 	dc_organization.organization_address,
-	dc_organization.stake_mark_id AS dc_organization_stake_mark_id,
+	dc_organization.stake_mark AS dc_organization_stake_mark,
 	dc_organization.rescue_unit,
 	dc_organization.description AS dc_organization_description,
 	dc_vehicles.vehicle_plate,
@@ -424,11 +424,11 @@
 
         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_stake_mark on dc_stake_mark.stake_mark = dc_event.stake_mark and dc_stake_mark.direction = dc_event.description
+                 LEFT JOIN dc_road_section on dc_stake_mark.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
+                 LEFT JOIN dc_organization ON dc_stake_mark.stake_mark = dc_organization.stake_mark
 
         where dc_event.id = #{id}
 
diff --git a/zc-business/src/main/resources/mapper/business/DcEventServiceAreaMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventServiceAreaMapper.xml
index 24ec259f..8ca2b8ab 100644
--- a/zc-business/src/main/resources/mapper/business/DcEventServiceAreaMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcEventServiceAreaMapper.xml
@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dcFacility.facilityName"    column="facility_name"    />
         <result property="dcFacility.facilityType"    column="facility_type"    />
         <result property="dcFacility.direction"    column="direction"    />
-        <result property="dcFacility.stakeMarkId"    column="stake_mark"    />
+        <result property="dcFacility.stakeMark"    column="stake_mark"    />
         <result property="dcFacility.remark"    column="remark"    />
         <result property="dcFacility.otherConfig"    column="other_config"    />
     </resultMap>
diff --git a/zc-business/src/main/resources/mapper/business/DcEventTrafficCongestionMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventTrafficCongestionMapper.xml
index 04b8d7de..5ff940ee 100644
--- a/zc-business/src/main/resources/mapper/business/DcEventTrafficCongestionMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcEventTrafficCongestionMapper.xml
@@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dcFacility.facilityName"    column="facility_name"    />
         <result property="dcFacility.facilityType"    column="facility_type"    />
         <result property="dcFacility.direction"    column="direction"    />
-        <result property="dcFacility.stakeMarkId"    column="stake_mark"    />
+        <result property="dcFacility.stakeMark"    column="stake_mark"    />
         <result property="dcFacility.remark"    column="remark"    />
         <result property="dcFacility.otherConfig"    column="other_config"    />
 
diff --git a/zc-business/src/main/resources/mapper/business/DcEventTrafficControlMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventTrafficControlMapper.xml
index d4751c11..a1028599 100644
--- a/zc-business/src/main/resources/mapper/business/DcEventTrafficControlMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcEventTrafficControlMapper.xml
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dcFacility.facilityName"    column="facility_name"    />
         <result property="dcFacility.facilityType"    column="facility_type"    />
         <result property="dcFacility.direction"    column="direction"    />
-        <result property="dcFacility.stakeMarkId"    column="stake_mark"    />
+        <result property="dcFacility.stakeMark"    column="stake_mark"    />
         <result property="dcFacility.remark"    column="remark"    />
         <result property="dcFacility.otherConfig"    column="other_config"    />
 
diff --git a/zc-business/src/main/resources/mapper/business/DcOrganizationMapper.xml b/zc-business/src/main/resources/mapper/business/DcOrganizationMapper.xml
index dc6df91e..eec53113 100644
--- a/zc-business/src/main/resources/mapper/business/DcOrganizationMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcOrganizationMapper.xml
@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="organizationType"    column="organization_type"    />
         <result property="organizationName"    column="organization_name"    />
         <result property="organizationAddress"    column="organization_address"    />
-        <result property="stakeMarkId"    column="stake_mark_id"    />
+        <result property="stakeMark"    column="stake_mark"    />
         <result property="rescueUnit"    column="rescue_unit"    />
         <result property="description"    column="description"    />
         <result property="createTime"    column="create_time"    />
@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectDcOrganizationVo">
         select id,direction, parent_id,
                organization_type, organization_name,
-               organization_address, stake_mark_id,
+               organization_address, stake_mark,
                rescue_unit, description, create_time,
                update_time from dc_organization
     </sql>
@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="organizationType != null">organization_type,</if>
             <if test="organizationName != null and organizationName != ''">organization_name,</if>
             <if test="organizationAddress != null">organization_address,</if>
-            <if test="stakeMarkId != null">stake_mark_id,</if>
+            <if test="stakeMark != null">stake_mark,</if>
             <if test="rescueUnit != null">rescue_unit,</if>
             <if test="description != null">`description`,</if>
             <if test="createTime != null">create_time,</if>
@@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="organizationType != null">#{organizationType},</if>
             <if test="organizationName != null and organizationName != ''">#{organizationName},</if>
             <if test="organizationAddress != null">#{organizationAddress},</if>
-            <if test="stakeMarkId != null">#{stakeMarkId},</if>
+            <if test="stakeMark != null">#{stakeMark},</if>
             <if test="rescueUnit != null">#{rescueUnit},</if>
             <if test="description != null">#{description},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="organizationType != null">organization_type = #{organizationType},</if>
             <if test="organizationName != null and organizationName != ''">organization_name = #{organizationName},</if>
             <if test="organizationAddress != null">organization_address = #{organizationAddress},</if>
-            <if test="stakeMarkId != null">stake_mark_id = #{stakeMarkId},</if>
+            <if test="stakeMark != null">stake_mark = #{stakeMark},</if>
             <if test="rescueUnit != null">rescue_unit = #{rescueUnit},</if>
             <if test="description != null">description = #{description},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
diff --git a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
index 83aebdd1..3302b343 100644
--- a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
@@ -15,14 +15,14 @@
     </select>
 
     <select id="selectPerceivedEventsList" resultType="com.zc.business.domain.DcWarning">
-        SELECT warning.`id`,warning.`stake_mark_id`, warning.`direction`,
+        SELECT warning.`id`,warning.`stake_mark`, warning.`direction`,
         mark.longitude,mark.latitude,warning.lane,
         warning.`dept_id`,warning.`warning_state`,warning.`warning_time`,
         warning.`user_id`, warning.`warning_source`,warning.`warning_level`,
         warning.`remark`, warning.`create_time`,warning.`update_time`,
         warning.`warning_type`,warning.`warning_subclass`,warning.`warning_title`,
         warning.`other_config` FROM dc_warning AS warning
-        LEFT JOIN dc_stake_mark AS mark ON mark.id=warning.stake_mark_id
+        LEFT JOIN dc_stake_mark AS mark ON mark.id=warning.stake_mark
         <where>
             <if test="warningType != null  and warningType != ''"> and warning_type = #{warningType}</if>
             <if test="warningSubclass != null  and warningSubclass != ''"> and warning_subclass = #{warningSubclass}</if>
@@ -30,7 +30,7 @@
     </select>
     <select id="selectSectionPerceivedEventsList" resultType="hashmap">
         SELECT COUNT(1) as number,section.section_name sectionName  FROM dc_warning AS warning
-        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.id
+        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.id
         LEFT JOIN dc_road_section AS  section ON mark.section_id=section.id
         where DATE_FORMAT(warning.create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
         group by section.section_name
@@ -38,7 +38,7 @@
     </select>
     <select id="selectSectionPerceivedNumber" resultType="java.util.HashMap">
         SELECT COUNT(1) as number,section.section_name sectionName  FROM dc_warning AS warning
-        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.id
+        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.id
         LEFT JOIN dc_road_section AS  section ON mark.section_id=section.id
         where DATE_FORMAT(warning.create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
         group by section.section_name
@@ -76,7 +76,7 @@
     <select id="selectWarningTrendDay" resultType="java.util.HashMap">
         SELECT DATE_FORMAT(warning.create_time, '%Y-%m-%d %H') AS time, COUNT(*) AS number
         FROM dc_warning AS warning
-        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.id
+        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.id
         WHERE  DATE_FORMAT(warning.create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
           AND warning.direction=#{direction}
           AND mark.`section_id`=#{sectionId}
@@ -85,7 +85,7 @@
     <select id="selectWarningTrendMonth" resultType="java.util.HashMap">
         SELECT DATE(warning.create_time) AS DAY, COUNT(*) AS number
         FROM dc_warning as warning
-        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.id
+        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.id
         WHERE DATE_FORMAT(warning.create_time,'%Y-%m') =DATE_FORMAT(#{createTime},'%Y-%m')
           AND warning.direction=#{direction}
           and mark.`section_id`=#{sectionId}
@@ -103,7 +103,7 @@
             MONTH(warning.create_time) AS MONTH,
             COUNT(*) AS number
         FROM dc_warning as warning
-        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.id
+        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.id
         WHERE YEAR(warning.create_time) =DATE_FORMAT(#{createTime},'%Y')
           AND warning.direction=#{direction}
           and mark.`section_id`=#{sectionId}
@@ -114,14 +114,14 @@
     <select id="selectWarningTrendYear" resultType="java.util.HashMap">
         SELECT YEAR(warning.create_time) AS YEAR, COUNT(*) AS number
         FROM dc_warning as warning
-        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.id
+        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.id
         where  mark.`section_id`=#{sectionId}   AND warning.direction=#{direction}
         GROUP BY YEAR
     </select>
     <select id="selectWarningSectionTypeDay" resultType="java.util.HashMap">
         SELECT warning.warning_type warningType,COUNT(*) AS number
         FROM dc_warning as warning
-        LEFT JOIN dc_stake_mark as mark on warning.stake_mark_id=mark.id
+        LEFT JOIN dc_stake_mark as mark on warning.stake_mark=mark.id
         where DATE_FORMAT(warning.create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
           AND warning.direction=#{direction}
            and   mark.`section_id`=#{sectionId}
@@ -131,7 +131,7 @@
     <select id="selectWarningSectionTypeMonth" resultType="java.util.HashMap">
         SELECT warning.warning_type warningType,COUNT(*) AS number
         FROM dc_warning as warning
-        LEFT JOIN dc_stake_mark as mark on warning.stake_mark_id=mark.id
+        LEFT JOIN dc_stake_mark as mark on warning.stake_mark=mark.id
         where DATE_FORMAT(warning.create_time,'%Y-%m') =DATE_FORMAT(#{createTime},'%Y-%m')
           AND warning.direction=#{direction}
           and   mark.`section_id`=#{sectionId}
@@ -149,7 +149,7 @@
             warning.warning_type warningType,
             COUNT(*) AS number
         FROM dc_warning as warning
-                 LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.id
+                 LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.id
         WHERE YEAR(warning.create_time) =DATE_FORMAT(#{createTime},'%Y')
           AND warning.direction=#{direction}
           and mark.`section_id`=#{sectionId}
@@ -160,7 +160,7 @@
         SELECT warning.warning_type warningType, COUNT(*) AS number,
                DATE_FORMAT(warning.create_time, '%Y') as createTime
         FROM dc_warning as warning
-        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.id
+        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.id
         where  mark.`section_id`=#{sectionId}   AND warning.direction=#{direction}
         GROUP BY warningType
     </select>
@@ -169,14 +169,14 @@
         SELECT id FROM dc_stake_mark AS mark   WHERE mark.section_id=#{sectionId}
     </select>
     <select id="selectSectionNumber" resultType="java.lang.String">
-        select count(1) from dc_warning where stake_mark_id=#{stakeMarkId}  AND warning.direction=#{direction}
+        select count(1) from dc_warning where stake_mark=#{stakeMark}  AND warning.direction=#{direction}
     </select>
     <select id="selectWarningEscalation" resultType="java.util.HashMap">
         select org.organization_name,warning.warning_type,warning.warning_subclass,
         warning_title,warning.warning_state,warning.
         warning_source,DATE_FORMAT(warning.create_time,'%Y-%m-%d %H:%m:%s') createTime from dc_warning as warning
-        LEFT JOIN dc_stake_mark as mark on warning.stake_mark_id=mark.id
-        LEFT JOIN dc_organization as org on mark.id=org.stake_mark_id AND mark.direction=org.direction
+        LEFT JOIN dc_stake_mark as mark on warning.stake_mark=mark.id
+        LEFT JOIN dc_organization as org on mark.id=org.stake_mark AND mark.direction=org.direction
         <where>
             <if test="warningState != null  and warningState != ''"> and warning.warning_state = #{warningState}</if>
         </where>
@@ -185,7 +185,7 @@
     <update id="updateWarning">
         update dc_warning
         <trim prefix="SET" suffixOverrides=",">
-            <if test="stakeMarkId != null and stakeMarkId != ''">stake_mark_id = #{stakeMarkId},</if>
+            <if test="stakeMark != null and stakeMark != ''">stake_mark = #{stakeMark},</if>
             <if test="direction != null">direction = #{direction},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="warningState != null">warning_state = #{warningState},</if>
diff --git a/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml b/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml
index 11f18424..10315f58 100644
--- a/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml
@@ -23,7 +23,7 @@
 
     <select id="getEventListByType" resultType="java.util.Map" parameterType="String">
         select t1.id,t1.stake_mark stakeMark,t1.direction, t2.longitude,t2.latitude
-        from dc_event t1 left join dc_stake_mark t2 on t1.stake_mark = t2.id and t1.direction = t2.direction
+        from dc_event t1 left join dc_stake_mark t2 on t1.stake_mark = t2.stake_mark and t1.direction = t2.direction
         where t1.event_type = #{eventType} and t1.event_state != '2'
     </select>
 

From 53a3e5fc2ce5f9d4744af1da4008950db0bc5701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Thu, 25 Jan 2024 11:00:44 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zc-business/src/main/resources/mapper/business/DcEventMapper.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
index f789993f..64a9f5cf 100644
--- a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
@@ -334,6 +334,7 @@
                   dc_event.end_time,
                   dc_event.estimated_end_time,
                   dc_event.event_level,
+                  dc_event.event_title,
                   dc_event.event_type AS event_type,
                   CASE dc_event.event_type
                       WHEN '1' THEN '交通事故'