From 94782e82d05ae42e3fd59be93668b48bbb114a15 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 21 一月 2022 13:49:50 +0800
Subject: [PATCH] 仁和区bug提交
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridIncidentStatisticsVO.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridIncidentStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridIncidentStatisticsVO.java
index 098695f..0205f4e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridIncidentStatisticsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridIncidentStatisticsVO.java
@@ -1,11 +1,14 @@
package com.panzhihua.common.model.vos.community.screen.event;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.Date;
@Data
@ApiModel("大屏网格下事件统计返回参数")
@@ -15,13 +18,30 @@
@JsonSerialize(using = ToStringSerializer.class)
private Long eventId;
- @ApiModelProperty("事件状态(1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群上报、7随手拍处理)")
+// 旧版参照@ApiModelProperty("事件状态(1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群上报、7随手拍处理)")
+ /**
+ * type不代表网格类型
+ */
+ @ApiModelProperty("事件状态(1治安防控、2民生服务、3矛盾劝解、4不稳定因素、5突发事件报告、6特殊人群服务、9防灾减灾、10其他)")
private Integer type;
+
+ @ApiModelProperty("事件类型(1、网格事件 2、随手拍事件)")
+ private Integer eventType;
@ApiModelProperty("事件发生经纬度")
private String latLng;
- @ApiModelProperty("处理状态")
+ @ApiModelProperty("事件内容")
+ private String content;
+
+ @ApiModelProperty("事件封面")
+ private String cover;
+
+ @ApiModelProperty("处理状态（1.已处理 2.待处理）")
private Integer status;
+ @ApiModelProperty("事件创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createAt;
+
}
--
Gitblit v1.7.1