diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Event.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Event.java index b3dad76..8884fb2 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Event.java +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Event.java @@ -109,10 +109,16 @@ public class Event extends BaseEntity { /** * 事故类型 */ - @ApiModelProperty(value = "事故类型") + @ApiModelProperty(value = "事故类型编码") @Alias("AccidentType") private String accidentType; + /** + * 事故类型 + */ + @ApiModelProperty(value = "事故类型") + private String aiClass; + /** * 110的emergency_event_id */ diff --git a/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/EventMapper.xml b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/EventMapper.xml index 14b9464..50b4030 100644 --- a/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/EventMapper.xml +++ b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/EventMapper.xml @@ -21,25 +21,13 @@ + + + - select event_id, - event_name, - event_type, - event_level, - event_date_time, - event_area, - event_address, - event_longitude, - event_latitude, - send_amb_count, - event_describe, - alarm_unit, - alarm_unit_contactor, - alarm_unit_telephone, - attachment_info, - remark + select * from event diff --git a/page/src/main/java/com/yingji/entity/Event.java b/page/src/main/java/com/yingji/entity/Event.java index 3831306..0e6dc70 100644 --- a/page/src/main/java/com/yingji/entity/Event.java +++ b/page/src/main/java/com/yingji/entity/Event.java @@ -129,10 +129,16 @@ public class Event implements Serializable { /** * 事故类型 */ - @ApiModelProperty(value = "事故类型") + @ApiModelProperty(value = "事故类型编码") @Alias("AccidentType") private String accidentType; + /** + * 事故类型 + */ + @ApiModelProperty(value = "事故类型") + private String aiClass; + /** * 110的emergency_event_id */ diff --git a/page/src/main/java/com/yingji/entity/dto/response/EventsFindResponse.java b/page/src/main/java/com/yingji/entity/dto/response/EventsFindResponse.java index 7a3882a..4590e83 100644 --- a/page/src/main/java/com/yingji/entity/dto/response/EventsFindResponse.java +++ b/page/src/main/java/com/yingji/entity/dto/response/EventsFindResponse.java @@ -141,4 +141,23 @@ public class EventsFindResponse implements Serializable { @Alias("Remark") private String remark; + /** + * 事故类型 + */ + @ApiModelProperty(value = "事故类型编码") + @Alias("AccidentType") + private String accidentType; + + /** + * 事故类型 + */ + @ApiModelProperty(value = "事故类型") + private String aiClass; + + /** + * 110的emergency_event_id + */ + @ApiModelProperty(value = "110的emergency_event_id") + private Long ai110Id; + }