From 70e3f2670456a9c1856a31a32c84bd0ea8c41e04 Mon Sep 17 00:00:00 2001
From: wu <wsjxh1023@163.com>
Date: Mon, 17 Jun 2024 09:27:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=8B=E6=95=85=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/page/domain/Event.java     |  8 +++++++-
 .../resources/mapper/page/EventMapper.xml     | 20 ++++---------------
 .../main/java/com/yingji/entity/Event.java    |  8 +++++++-
 .../dto/response/EventsFindResponse.java      | 19 ++++++++++++++++++
 4 files changed, 37 insertions(+), 18 deletions(-)

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 @@
         <result property="alarmUnitTelephone" column="alarm_unit_telephone"/>
         <result property="attachmentInfo" column="attachment_info"/>
         <result property="remark" column="remark"/>
+        <result property="accidentType" column="accident_type"/>
+        <result property="aiClass" column="ai_class"/>
+        <result property="ai110Id" column="ai_110_id"/>
     </resultMap>
 
     <sql id="selectEventVo">
-        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
     </sql>
 
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;
+
 }