事件查询详情 机构 高速名称 车道

zc-business/src/main/java/com/zc/business/controller/DcEventController.java

@@ -57,6 +57,7 @@ public class DcEventController extends BaseController
 
         return getDataTable(list);
     }
+
     /**调度记录-事件列表 按时间展示交通事件。默认当天时间 。可查询条件 交通事件状态 ，时间范围
      *
      */

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;

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">
@@ -411,13 +417,21 @@
                   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_process_config.node_node AS node_node,
-           dc_process_config.common_phrases as common_phrases
+                  dc_organization.organization_name as organization_name,
+                  dc_road.road_name as road_name
+
         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
+                 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
+
         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>