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 @@ + @@ -56,6 +57,11 @@ + + + + + @@ -313,111 +319,119 @@ @@ -446,6 +460,7 @@ event_source_tips, in_tunnel, road_id, + lang, #{id}, @@ -470,6 +485,7 @@ #{eventSourceTips}, #{inTunnel}, #{roadId}, + #{lang}, @@ -497,6 +513,7 @@ event_source_tips = #{eventSourceTips}, in_tunnel = #{inTunnel}, road_id = #{roadId}, + road_id = #{lang}, where id = #{id}