From 26b79e4b4595e2acd8ca8d6d3866608a4a0e7251 Mon Sep 17 00:00:00 2001 From: wu Date: Tue, 11 Jun 2024 15:41:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=8B=E6=95=85=E7=B1=BB?= =?UTF-8?q?=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 | 19 ++++++++++++++++++- .../page/service/impl/FireServiceImpl.java | 3 ++- .../src/main/resources/application-druid.yml | 2 +- alarm/src/main/resources/application-dev.yml | 2 +- fire/src/main/resources/application-dev.yml | 2 +- .../main/java/com/yingji/entity/Event.java | 7 +++++++ page/src/main/resources/application-dev.yml | 2 +- .../main/java/com/yingji/entity/Event.java | 7 +++++++ rescue/src/main/resources/application-dev.yml | 2 +- 9 files changed, 39 insertions(+), 7 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 4695237..b3dad76 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 @@ -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; + +} \ No newline at end of file diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/FireServiceImpl.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/FireServiceImpl.java index 122e844..62dc5cf 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/FireServiceImpl.java +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/service/impl/FireServiceImpl.java @@ -33,7 +33,8 @@ public class FireServiceImpl extends ServiceImpl 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); } } diff --git a/RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml b/RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml index a3a7ec1..1aea442 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml +++ b/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: # 从数据源开关/默认关闭 diff --git a/alarm/src/main/resources/application-dev.yml b/alarm/src/main/resources/application-dev.yml index 668eef7..8dff4eb 100644 --- a/alarm/src/main/resources/application-dev.yml +++ b/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 diff --git a/fire/src/main/resources/application-dev.yml b/fire/src/main/resources/application-dev.yml index 4feda61..af445be 100644 --- a/fire/src/main/resources/application-dev.yml +++ b/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 diff --git a/page/src/main/java/com/yingji/entity/Event.java b/page/src/main/java/com/yingji/entity/Event.java index 4c6611d..3831306 100644 --- a/page/src/main/java/com/yingji/entity/Event.java +++ b/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 */ diff --git a/page/src/main/resources/application-dev.yml b/page/src/main/resources/application-dev.yml index 9cbe9a0..ebd6b92 100644 --- a/page/src/main/resources/application-dev.yml +++ b/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 diff --git a/rescue/src/main/java/com/yingji/entity/Event.java b/rescue/src/main/java/com/yingji/entity/Event.java index 1a88050..df00b56 100644 --- a/rescue/src/main/java/com/yingji/entity/Event.java +++ b/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 */ diff --git a/rescue/src/main/resources/application-dev.yml b/rescue/src/main/resources/application-dev.yml index 647069b..3011cee 100644 --- a/rescue/src/main/resources/application-dev.yml +++ b/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