Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-dc into develop

zc-business/src/main/java/com/zc/business/domain/DcWarning.java

@@ -113,7 +113,15 @@ public class DcWarning extends BaseEntity
 
     private String latitude;
 
+    private String vehicleType;
 
+    public String getVehicleType() {
+        return vehicleType;
+    }
+
+    public void setVehicleType(String vehicleType) {
+        this.vehicleType = vehicleType;
+    }
 
     public String getLane() {
         return lane;

zc-business/src/main/java/com/zc/business/service/impl/DcEventTypeServiceImpl.java

@@ -35,7 +35,10 @@ public class DcEventTypeServiceImpl implements IDcEventTypeService
     @Override
     public DcEventType selectDcEventTypeByEventType(Integer eventType)
     {
-        return dcEventTypeMapper.selectDcEventTypeByEventType(eventType);
+        DcEventType dcEventType = dcEventTypeMapper.selectDcEventTypeByEventType(eventType);
+        List<DcProcessConfig> configList = dcProcessConfigMapper.selectDcProcessConfigByEventType(eventType);
+        dcEventType.setProcessConfigList(configList);
+        return dcEventType;
     }
 
     /**

zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml

@@ -252,6 +252,7 @@
             <if test="warningTitle != null">warning_title = #{warningTitle},</if>
             <if test="otherConfig != null">other_config = #{otherConfig},</if>
             <if test="lane != null">lane = #{lane},</if>
+            <if test="vehicleType != null">vehicle_type = #{vehicleType},</if>
         </trim>
         where id = #{id}
     </update>

zc-business/src/main/resources/mapper/business/DcWarningMapper.xml

@@ -22,11 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="warningTitle"    column="warning_title"    />
         <result property="otherConfig"    column="other_config"    />
         <result property="lane"    column="lane"    />
+        <result property="vehicleType"    column="vehicle_type"    />
     </resultMap>
 
     <sql id="selectDcWarningVo">
         select id, stake_mark stakeMark, direction, dept_id deptId,
-               warning_state warningState,
+               warning_state warningState,vehicle_type,
                DATE_FORMAT(warning_time,'%Y-%m-%d %H:%m:%s')warningTime,
                user_id userId, warning_source warningSource, warning_level warningLevel,
                remark,   DATE_FORMAT(create_time,'%Y-%m-%d %H:%m:%s')createTime,
@@ -60,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="export" resultType="com.zc.business.domain.DcWarning">
         SELECT warning.`id`,warning.`stake_mark`, warning.`direction`,
-               mark.longitude,mark.latitude,warning.lane,
+               mark.longitude,mark.latitude,warning.lane,vehicle_type,
                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`,
@@ -89,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warningTitle != null">warning_title,</if>
             <if test="otherConfig != null">other_config,</if>
             <if test="lane != null">lane,</if>
+            <if test="vehicleType != null">vehicle_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -108,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warningTitle != null">#{warningTitle},</if>
             <if test="otherConfig != null">#{otherConfig},</if>
             <if test="lane != null">#{lane},</if>
+            <if test="vehicleType != null">#{vehicleType},</if>
          </trim>
     </insert>
 
@@ -130,6 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warningTitle != null">warning_title = #{warningTitle},</if>
             <if test="otherConfig != null">other_config = #{otherConfig},</if>
             <if test="lane != null">lane = #{lane},</if>
+            <if test="vehicleType != null">vehicle_type = #{vehicleType},</if>
         </trim>
         where id = #{id}
     </update>