Merge remote-tracking branch 'origin/wushunjie' into wushunjie

RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Event.java

@@ -1,5 +1,7 @@
 package com.ruoyi.page.domain;
 
+import cn.hutool.core.annotation.Alias;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -103,4 +105,19 @@ public class Event extends BaseEntity {
      */
     @ApiModelProperty(value = "备注")
     private String remark;
+
+    /**
+     * 事故类型
+     */
+    @ApiModelProperty(value = "事故类型")
+    @Alias("AccidentType")
+    private String accidentType;
+
+    /**
+     * 110的emergency_event_id
+     */
+    @ApiModelProperty(value = "110的emergency_event_id")
+    @TableField(value = "ai_110_id")
+    private Long ai110Id;
+
 }

RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/FireServiceImpl.java

@@ -33,7 +33,8 @@ public class FireServiceImpl extends ServiceImpl<FireMapper, Fire> implements Fi
                 .ge(fire.getStartTime() != null, "create_time", fire.getStartTime())
                 .le(fire.getEndTime() != null, "create_time", fire.getEndTime())
                 .like(StrUtil.isNotEmpty(fire.getAjms()), "ajms", fire.getAjms())
-                .like(StrUtil.isNotEmpty(fire.getAfdz()), "afdz", fire.getAfdz());
+                .like(StrUtil.isNotEmpty(fire.getAfdz()), "afdz", fire.getAfdz())
+                .orderByDesc("create_time");
         return this.page(page, wrapper);
     }
 }

RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml

@@ -8,7 +8,7 @@ spring:
             master:
                 url: jdbc:mysql://localhost:3306/algorithms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: 123456
+                password: jichuang@123
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

alarm/src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ spring:
   datasource:
     url: jdbc:mysql://localhost:3306/algorithms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
     username: root
-    password: 123456
+    password: jichuang@123
     driverClassName: com.mysql.cj.jdbc.Driver
 
 

fire/src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ spring:
   datasource:
     url: jdbc:mysql://localhost:3306/algorithms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
     username: root
-    password: 123456
+    password: jichuang@123
     driverClassName: com.mysql.cj.jdbc.Driver
 
 

page/src/main/java/com/yingji/entity/Event.java

@@ -126,6 +126,13 @@ public class Event implements Serializable {
     @Alias("Remark")
     private String remark;
 
+    /**
+     * 事故类型
+     */
+    @ApiModelProperty(value = "事故类型")
+    @Alias("AccidentType")
+    private String accidentType;
+
     /**
      * 110的emergency_event_id
      */

page/src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ spring:
   datasource:
     url: jdbc:mysql://localhost:3306/algorithms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
     username: root
-    password: root
+    password: jichuang@123
     driverClassName: com.mysql.cj.jdbc.Driver
 
 

rescue/src/main/java/com/yingji/entity/Event.java

@@ -126,6 +126,13 @@ public class Event implements Serializable {
     @Alias("Remark")
     private String remark;
 
+    /**
+     * 事故类型
+     */
+    @ApiModelProperty(value = "事故类型")
+    @Alias("AccidentType")
+    private String accidentType;
+
     /**
      * 110的emergency_event_id
      */

rescue/src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ spring:
   datasource:
     url: jdbc:mysql://localhost:3306/algorithms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
     username: root
-    password: 123456
+    password: jichuang@123
     driverClassName: com.mysql.cj.jdbc.Driver