From 3c91d0b370c82e91f35fcf0732daf2595158d656 Mon Sep 17 00:00:00 2001 From: wu Date: Fri, 16 Aug 2024 16:25:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=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/Alarm.java | 21 +++++++++++ .../java/com/ruoyi/page/domain/Event.java | 27 ++++++++++++-- .../main/java/com/ruoyi/page/domain/Fire.java | 29 +++++++++++++++ .../main/java/com/yingji/entity/Alarm.java | 22 ++++++++++++ .../src/main/java/com/yingji/entity/Fire.java | 29 +++++++++++++++ .../main/java/com/yingji/entity/Alarm.java | 22 ++++++++++++ .../main/java/com/yingji/entity/Event.java | 35 +++++++++++++++---- .../src/main/java/com/yingji/entity/Fire.java | 29 +++++++++++++++ .../main/java/com/yingji/entity/Event.java | 34 ++++++++++++++---- 9 files changed, 232 insertions(+), 16 deletions(-) diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Alarm.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Alarm.java index e530543..e8bff4d 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Alarm.java +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Alarm.java @@ -219,4 +219,25 @@ public class Alarm extends BaseEntity { @ApiModelProperty(value = "120的event_id") @TableField(value = "ai_120_id") private String ai120Id; + + /** + * 120的紧急系数 + */ + @ApiModelProperty(value = "120的紧急系数") + @TableField(value = "ai_120_num") + private Double ai120Num; + + /** + * 119的event_id + */ + @ApiModelProperty(value = "119的event_id") + @TableField(value = "ai_119_id") + private String ai119Id; + + /** + * 119的紧急系数 + */ + @ApiModelProperty(value = "119的紧急系数") + @TableField(value = "ai_119_num") + private Double ai119Num; } 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 8884fb2..ba72b10 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 @@ -120,10 +120,31 @@ public class Event extends BaseEntity { private String aiClass; /** - * 110的emergency_event_id + * 110的event_id */ - @ApiModelProperty(value = "110的emergency_event_id") + @ApiModelProperty(value = "110的event_id") @TableField(value = "ai_110_id") - private Long ai110Id; + private String ai110Id; + + /** + * 110的紧急系数 + */ + @ApiModelProperty(value = "110的紧急系数") + @TableField(value = "ai_110_num") + private Double ai110Num; + + /** + * 119的id + */ + @ApiModelProperty(value = "119的id") + @TableField(value = "ai_119_id") + private String ai119Id; + + /** + * 119的紧急系数 + */ + @ApiModelProperty(value = "119的紧急系数") + @TableField(value = "ai_119_num") + private Double ai119Num; } \ No newline at end of file diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Fire.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Fire.java index 15e6ad7..65d25bc 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Fire.java +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/Fire.java @@ -1,5 +1,6 @@ package com.ruoyi.page.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -133,5 +134,33 @@ public class Fire implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; + + /** + * 120的event_id + */ + @ApiModelProperty(value = "120的event_id") + @TableField(value = "ai_120_id") + private String ai120Id; + + /** + * 120的紧急系数 + */ + @ApiModelProperty(value = "120的紧急系数") + @TableField(value = "ai_120_num") + private Double ai120Num; + + /** + * 110的event_id + */ + @ApiModelProperty(value = "110的event_id") + @TableField(value = "ai_110_id") + private String ai110Id; + + /** + * 110的紧急系数 + */ + @ApiModelProperty(value = "110的紧急系数") + @TableField(value = "ai_110_num") + private Double ai110Num; } diff --git a/alarm/src/main/java/com/yingji/entity/Alarm.java b/alarm/src/main/java/com/yingji/entity/Alarm.java index c742ede..d3e3143 100644 --- a/alarm/src/main/java/com/yingji/entity/Alarm.java +++ b/alarm/src/main/java/com/yingji/entity/Alarm.java @@ -200,5 +200,27 @@ public class Alarm implements Serializable { @ApiModelProperty(value = "120的event_id") @TableField(value = "ai_120_id") private String ai120Id; + + /** + * 120的紧急系数 + */ + @ApiModelProperty(value = "120的紧急系数") + @TableField(value = "ai_120_num") + private Double ai120Num; + + /** + * 119的event_id + */ + @ApiModelProperty(value = "119的event_id") + @TableField(value = "ai_119_id") + private String ai119Id; + + /** + * 119的紧急系数 + */ + @ApiModelProperty(value = "119的紧急系数") + @TableField(value = "ai_119_num") + private Double ai119Num; + } diff --git a/fire/src/main/java/com/yingji/entity/Fire.java b/fire/src/main/java/com/yingji/entity/Fire.java index 903afea..bbdcf02 100644 --- a/fire/src/main/java/com/yingji/entity/Fire.java +++ b/fire/src/main/java/com/yingji/entity/Fire.java @@ -1,8 +1,10 @@ package com.yingji.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -130,4 +132,31 @@ public class Fire implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; + /** + * 120的event_id + */ + @ApiModelProperty(value = "120的event_id") + @TableField(value = "ai_120_id") + private String ai120Id; + + /** + * 120的紧急系数 + */ + @ApiModelProperty(value = "120的紧急系数") + @TableField(value = "ai_120_num") + private Double ai120Num; + + /** + * 110的event_id + */ + @ApiModelProperty(value = "110的event_id") + @TableField(value = "ai_110_id") + private String ai110Id; + + /** + * 110的紧急系数 + */ + @ApiModelProperty(value = "110的紧急系数") + @TableField(value = "ai_110_num") + private Double ai110Num; } diff --git a/page/src/main/java/com/yingji/entity/Alarm.java b/page/src/main/java/com/yingji/entity/Alarm.java index c742ede..c24f51b 100644 --- a/page/src/main/java/com/yingji/entity/Alarm.java +++ b/page/src/main/java/com/yingji/entity/Alarm.java @@ -200,5 +200,27 @@ public class Alarm implements Serializable { @ApiModelProperty(value = "120的event_id") @TableField(value = "ai_120_id") private String ai120Id; + + + /** + * 120的紧急系数 + */ + @ApiModelProperty(value = "120的紧急系数") + @TableField(value = "ai_120_num") + private Double ai120Num; + + /** + * 119的event_id + */ + @ApiModelProperty(value = "119的event_id") + @TableField(value = "ai_119_id") + private String ai119Id; + + /** + * 119的紧急系数 + */ + @ApiModelProperty(value = "119的紧急系数") + @TableField(value = "ai_119_num") + private Double ai119Num; } diff --git a/page/src/main/java/com/yingji/entity/Event.java b/page/src/main/java/com/yingji/entity/Event.java index 0e6dc70..927d612 100644 --- a/page/src/main/java/com/yingji/entity/Event.java +++ b/page/src/main/java/com/yingji/entity/Event.java @@ -139,13 +139,6 @@ public class Event implements Serializable { @ApiModelProperty(value = "事故类型") private String aiClass; - /** - * 110的emergency_event_id - */ - @ApiModelProperty(value = "110的emergency_event_id") - @TableField(value = "ai_110_id") - private Long ai110Id; - /** * 创建时间 */ @@ -162,5 +155,33 @@ public class Event implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; + /** + * 110的event_id + */ + @ApiModelProperty(value = "110的event_id") + @TableField(value = "ai_110_id") + private String ai110Id; + + /** + * 110的紧急系数 + */ + @ApiModelProperty(value = "110的紧急系数") + @TableField(value = "ai_110_num") + private Double ai110Num; + + /** + * 119的event_id + */ + @ApiModelProperty(value = "119的event_id") + @TableField(value = "ai_119_id") + private String ai119Id; + + /** + * 119的紧急系数 + */ + @ApiModelProperty(value = "119的紧急系数") + @TableField(value = "ai_119_num") + private Double ai119Num; + } diff --git a/page/src/main/java/com/yingji/entity/Fire.java b/page/src/main/java/com/yingji/entity/Fire.java index b531de8..4cce1f7 100644 --- a/page/src/main/java/com/yingji/entity/Fire.java +++ b/page/src/main/java/com/yingji/entity/Fire.java @@ -1,5 +1,6 @@ package com.yingji.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -150,5 +151,33 @@ public class Fire implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; + + /** + * 120的event_id + */ + @ApiModelProperty(value = "120的event_id") + @TableField(value = "ai_120_id") + private String ai120Id; + + /** + * 120的紧急系数 + */ + @ApiModelProperty(value = "120的紧急系数") + @TableField(value = "ai_120_num") + private Double ai120Num; + + /** + * 110的event_id + */ + @ApiModelProperty(value = "110的event_id") + @TableField(value = "ai_110_id") + private String ai110Id; + + /** + * 110的紧急系数 + */ + @ApiModelProperty(value = "110的紧急系数") + @TableField(value = "ai_110_num") + private Double ai110Num; } diff --git a/rescue/src/main/java/com/yingji/entity/Event.java b/rescue/src/main/java/com/yingji/entity/Event.java index 9d70880..3e9ec1a 100644 --- a/rescue/src/main/java/com/yingji/entity/Event.java +++ b/rescue/src/main/java/com/yingji/entity/Event.java @@ -133,12 +133,6 @@ public class Event implements Serializable { @Alias("AccidentType") private String accidentType; - /** - * 110的emergency_event_id - */ - @ApiModelProperty(value = "110的emergency_event_id") - @TableField(value = "ai_110_id") - private Long ai110Id; /** * 事故类型 @@ -161,5 +155,33 @@ public class Event implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; + + /** + * 110的event_id + */ + @ApiModelProperty(value = "110的event_id") + @TableField(value = "ai_110_id") + private String ai110Id; + + /** + * 110的紧急系数 + */ + @ApiModelProperty(value = "110的紧急系数") + @TableField(value = "ai_110_num") + private Double ai110Num; + + /** + * 119的event_id + */ + @ApiModelProperty(value = "119的event_id") + @TableField(value = "ai_119_id") + private String ai119Id; + + /** + * 119的紧急系数 + */ + @ApiModelProperty(value = "119的紧急系数") + @TableField(value = "ai_119_num") + private Double ai119Num; }