From 1bc2303b4bdb31b982ad6537b4554f316ff9c873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Tue, 23 Jan 2024 16:55:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E9=80=9A=E7=AE=A1=E5=88=B6=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=20=E6=96=B0=E5=A2=9E=20=E8=BD=A6=E8=BE=86=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=20=E9=99=90=E5=88=B6=E7=B1=BB=E5=9E=8B=20=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=20=E6=8E=AA=E6=96=BD=20=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/DcEventTrafficControl.java         | 12 +++++++++
 .../business/DcEventTrafficControlMapper.xml  | 27 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEventTrafficControl.java b/zc-business/src/main/java/com/zc/business/domain/DcEventTrafficControl.java
index 94f8d215..72cfacb9 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcEventTrafficControl.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcEventTrafficControl.java
@@ -73,6 +73,18 @@ public class DcEventTrafficControl extends BaseEntity
     @ApiModelProperty("原因类型")
     private String causeType;
 
+    @ApiModelProperty("措施  1-临时关闭2-限行车辆3-限行车道4-限行车道且限行车辆5-间隔放行6-并道行驶 7-限速',")
+    private Long measure; //措施
+    @ApiModelProperty("分类 1-主线关闭2-主线限行3-主线间隔放行4-主线并道5-主线限速',")
+    private Long classify; //分类
+    @ApiModelProperty("限制类型    1-只允许2-禁止',")
+    private Long limitedType ;//限制类型
+    @ApiModelProperty("车辆类型 1- 10座以下客车 2-10座以下客车(间隔放行)........")
+    private Long vehicleType ;//车辆类型
+
+
+
+
     @ApiModelProperty("事件信息实体")
     //事件信息表
     @TableField(exist = false)
diff --git a/zc-business/src/main/resources/mapper/business/DcEventTrafficControlMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventTrafficControlMapper.xml
index f3074cec..0913c4ad 100644
--- a/zc-business/src/main/resources/mapper/business/DcEventTrafficControlMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcEventTrafficControlMapper.xml
@@ -13,6 +13,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="rampId"    column="ramp_id"    />
         <result property="rampId"    column="road_id"    />
         <result property="causeType"    column="cause_type"    />
+
+        <result property="measure"    column="measure"    />
+        <result property="classify"    column="classify"    />
+        <result property="limitedType"    column="limited_type"    />
+        <result property="vehicleType"    column="vehicle_type"    />
         <result property="dcFacility.facilityName"    column="facility_name"    />
         <result property="dcFacility.facilityType"    column="facility_type"    />
         <result property="dcFacility.direction"    column="direction"    />
@@ -23,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDcEventTrafficControlVo">
-        select id, control_type, control_cause, exits_inlets, facility_id, ramp_id,road_id,cause_type from dc_event_traffic_control
+        select id, control_type, control_cause, exits_inlets, facility_id, ramp_id,road_id,cause_type,measure,classify,limited_type,vehicle_type from dc_event_traffic_control
     </sql>
     <!--关联路网设施查询-->
     <sql id="selectDcEventTrafficControlVoById">
@@ -50,6 +55,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="facilityId != null "> and facility_id = #{facilityId}</if>
             <if test="rampId != null "> and ramp_id = #{rampId}</if>
             <if test="causeType != null "> and cause_type = #{causeType}</if>
+
+            <if test="measure != null "> and measure = #{measure}</if>
+            <if test="classify != null "> and classify = #{classify}</if>
+            <if test="limitedType != null "> and limited_type = #{limitedType}</if>
+            <if test="vehicleType != null "> and vehicle_type = #{vehicleType}</if>
+
         </where>
     </select>
     
@@ -70,6 +81,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="rampId != null">ramp_id,</if>
             <if test="roadId != null">road_id,</if>
             <if test="causeType != null">cause_type,</if>
+
+            <if test="measure != null">measure,</if>
+            <if test="classify != null">classify,</if>
+            <if test="vehicleType != null">vehicle_type,</if>
+            <if test="limitedType != null">limited_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -80,6 +96,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="rampId != null">#{rampId},</if>
             <if test="roadId != null">#{roadId},</if>
             <if test="causeType != null">#{causeType},</if>
+
+            <if test="measure != null">#{measure},</if>
+            <if test="classify != null">#{classify},</if>
+            <if test="vehicleType != null">#{vehicleType},</if>
+            <if test="limitedType != null">#{limitedType},</if>
          </trim>
     </insert>
 
@@ -93,6 +114,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="rampId != null">ramp_id = #{rampId},</if>
             <if test="roadId != null">road_id = #{roadId},</if>
             <if test="causeType != null">cause_type = #{causeType},</if>
+            <if test="measure != null">measure = #{measure},</if>
+            <if test="classify != null">classify = #{classify},</if>
+            <if test="vehicleType != null">vehicle_type = #{vehicleType},</if>
+            <if test="limitedType != null">limited_type = #{limitedType},</if>
         </trim>
         where id = #{id}
     </update>