From 9b9dad6963f1718e3771e47f089ddb2aa7ca1cd6 Mon Sep 17 00:00:00 2001
From: wu <wsjxh1023@163.com>
Date: Tue, 18 Jun 2024 19:04:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96119=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/yingji/entity/Fire.java | 37 +++++++++++++++++++
 .../entity/dto/response/EventsResponse.java   |  7 ++++
 2 files changed, 44 insertions(+)

diff --git a/page/src/main/java/com/yingji/entity/Fire.java b/page/src/main/java/com/yingji/entity/Fire.java
index 919d805..b531de8 100644
--- a/page/src/main/java/com/yingji/entity/Fire.java
+++ b/page/src/main/java/com/yingji/entity/Fire.java
@@ -1,9 +1,11 @@
 package com.yingji.entity;
 
 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;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -21,97 +23,132 @@ import java.util.Date;
 public class Fire implements Serializable {
 
     private static final long serialVersionUID = -96682169109217319L;
+
     /**
      * 主键id
      */
     @ApiModelProperty(value = "主键id")
     private String id;
+
     /**
      * 行政区划
      */
     @ApiModelProperty(value = "行政区划")
     private String xzqh;
+
     /**
      * 案件编号
      */
     @ApiModelProperty(value = "案件编号")
     private String ajbh;
+
     /**
      * 案件描述
      */
     @ApiModelProperty(value = "案件描述")
     private String ajms;
+
     /**
      * 归队时间
      */
     @ApiModelProperty(value = "归队时间")
+    @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 gdsj;
+
     private String jjyxm;
+
     /**
      * 时间戳
      */
     @ApiModelProperty(value = "时间戳")
+    @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 sjc;
+
     /**
      * 纬度
      */
     @ApiModelProperty(value = "纬度")
     private String wd;
+
     /**
      * 经度
      */
     @ApiModelProperty(value = "经度")
     private String jd;
+
     /**
      * 备注信息
      */
     @ApiModelProperty(value = "备注信息")
     private String bcxx;
+
     /**
      * 结束时间
      */
     @ApiModelProperty(value = "结束时间")
+    @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 jssj;
+
     /**
      * 案发地址
      */
     @ApiModelProperty(value = "案发地址")
     private String afdz;
+
     /**
      * 出动时间
      */
     @ApiModelProperty(value = "出动时间")
+    @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 cdsj;
+
     /**
      * 立案方式代码
      */
     @ApiModelProperty(value = "立案方式代码")
     private String lafsdm;
+
     /**
      * topic
      */
     @ApiModelProperty(value = "topic")
     private String topic;
+    @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 xdsj;
+
     /**
      * 立案时间
      */
     @ApiModelProperty(value = "立案时间")
+    @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 lasj;
+
     /**
      * 行政区划名称
      */
     @ApiModelProperty(value = "行政区划名称")
     private String xzqhmc;
+
     /**
      * 到达现场时间
      */
     @ApiModelProperty(value = "到达现场时间")
+    @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 ddxcsj;
+
     /**
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间")
+    @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;
 }
 
diff --git a/rescue/src/main/java/com/yingji/entity/dto/response/EventsResponse.java b/rescue/src/main/java/com/yingji/entity/dto/response/EventsResponse.java
index 95214a4..d933d68 100644
--- a/rescue/src/main/java/com/yingji/entity/dto/response/EventsResponse.java
+++ b/rescue/src/main/java/com/yingji/entity/dto/response/EventsResponse.java
@@ -144,4 +144,11 @@ public class EventsResponse implements Serializable {
     @ApiModelProperty(value = "事件编码 主键")
     private String eventId;
 
+    /**
+     * 事故类型
+     */
+    @ApiModelProperty(value = "事故类型编码")
+    @Alias("AccidentType")
+    private String accidentType;
+
 }