From 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 19 八月 2021 18:14:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventNewStatisticsVO.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventNewStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventNewStatisticsVO.java
index 884c209..86486e6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventNewStatisticsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventNewStatisticsVO.java
@@ -1,6 +1,8 @@
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 com.panzhihua.common.model.vos.grid.EventResourceVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -14,6 +16,7 @@
public class EventNewStatisticsVO {
@ApiModelProperty("事件id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("发布人昵称")
@@ -22,7 +25,7 @@
@ApiModelProperty("发布人头像")
private String imageUrl;
- @ApiModelProperty("发布时间")
+ @ApiModelProperty("事件上报时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
@@ -47,8 +50,20 @@
@ApiModelProperty("事件分类1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报")
private Integer eventType;
- @ApiModelProperty("事件处理状态(1待处理、4已解决)")
+ @ApiModelProperty("事件分类（1、办事事件2、宣传事件3、阅读事件）")
+ private Integer eventCategory;
+
+ @ApiModelProperty("事件处理状态(1待处理、2待验证、3已上报、4已解决、5草稿箱、6已撤销、7已失效 8 已发布)")
private Integer eventDealStatus;
+
+ @ApiModelProperty("随手拍图片集合")
+ private String photoPathList;
+
+ @ApiModelProperty("事件类型")
+ private String eventClazz;
+
+ @ApiModelProperty("发生区域")
+ private String gridName;
@ApiModelProperty(value = "音频")
private List<EventResourceVO> audios;
@@ -59,4 +74,7 @@
@ApiModelProperty(value = "图片")
private List<EventResourceVO> pics;
+ @ApiModelProperty(value = "事件处理流转记录")
+ private List<EventTransferRecordVO> transferRecordList;
+
}
--
Gitblit v1.7.1