From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVO.java | 142 +++++++++++++++++++++++-----------------------
1 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVO.java
index d5f06d1..293b68e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVO.java
@@ -1,14 +1,15 @@
package com.panzhihua.common.model.vos.grid;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+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 com.fasterxml.jackson.annotation.JsonFormat;
/**
*
@@ -16,172 +17,171 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Data
@ApiModel("事件返回参数")
public class EventVO {
@ApiModelProperty(value = "id")
- @JsonSerialize(using = ToStringSerializer.class)
- private Long id;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
- @ApiModelProperty(value = "事件处理状态")
+ @ApiModelProperty(value = "事件处理状态")
private Integer eventDealStatus;
@ApiModelProperty(value = "服务单号")
- private String orderSn;
+ private String orderSn;
@ApiModelProperty(value = "1、办件事件2是宣传事件3是阅读事件")
- private Long eventCategory;
+ private Long eventCategory;
@ApiModelProperty(value = "网格员所处的街道")
- private Long gridMemberStreet;
+ private Long gridMemberStreet;
@ApiModelProperty(value = "网格员所处社区")
- private Long gridMemberCommunity;
+ private Long gridMemberCommunity;
@ApiModelProperty(value = "网格ID")
- @JsonSerialize(using = ToStringSerializer.class)
- private Long gridId;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long gridId;
- @ApiModelProperty(value = "网格名称")
- private String gridName;
+ @ApiModelProperty(value = "网格名称")
+ private String gridName;
@ApiModelProperty(value = "网格员")
- @JsonSerialize(using = ToStringSerializer.class)
- private Long gridMemberId;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long gridMemberId;
@ApiModelProperty(value = "网格员名字")
- private String gridMemberName;
+ private String gridMemberName;
- @ApiModelProperty(value = "网格员头像url")
- private String gridMemberImageUrl;
+ @ApiModelProperty(value = "网格员头像url")
+ private String gridMemberImageUrl;
@ApiModelProperty(value = "网格员联系方式")
- private String gridMemberTelephone;
+ private String gridMemberTelephone;
@ApiModelProperty(value = "事件标题")
- private String eventTitle;
+ private String eventTitle;
@ApiModelProperty(value = "宣传类型")
- private String propagandaType;
+ private String propagandaType;
@ApiModelProperty(value = "宣传时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date propagandaTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date propagandaTime;
@ApiModelProperty(value = "当event_type_category是1填写事件类型1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报")
- private Integer eventType;
+ private Integer eventType;
@ApiModelProperty(value = "事件描述")
- private String eventDes;
+ private String eventDes;
@ApiModelProperty(value = "宣传对象")
- private String propagandaObject;
+ private String propagandaObject;
@ApiModelProperty(value = "宣传人数")
- private String propagandaNum;
+ private String propagandaNum;
@ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)")
- private Integer communityProcess;
+ private Integer communityProcess;
@ApiModelProperty(value = "发生时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date happenTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date happenTime;
@ApiModelProperty(value = "事件发生地点备注")
- private String happentAddress;
+ private String happentAddress;
@ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）")
- private String happentLatLng;
+ private String happentLatLng;
@ApiModelProperty(value = "事件状态（1草稿箱2发布3逻辑删除4、撤销）")
- private Integer eventStatus;
+ private Integer eventStatus;
- @ApiModelProperty(value = "事件类型")
- private String eventClazz;
+ @ApiModelProperty(value = "事件类型")
+ private String eventClazz;
@ApiModelProperty(value = "1待处理2已解决3待验证")
- private Integer eventProcessStatus;
+ private Integer eventProcessStatus;
@ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）")
- private Integer processType;
+ private Integer processType;
@ApiModelProperty(value = "处理人ID")
- private Long processUserId;
+ private Long processUserId;
@ApiModelProperty(value = "处理人名称")
- private String processUserName;
+ private String processUserName;
@ApiModelProperty(value = "处理时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date processDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date processDate;
@ApiModelProperty(value = "解决人针对解决事件的处理描述")
- private String processDesc;
+ private String processDesc;
@ApiModelProperty(value = "事件来源")
- private String eventResource;
+ private String eventResource;
- @ApiModelProperty(value = "事件发生地点")
- private String happenAddress;
+ @ApiModelProperty(value = "事件发生地点")
+ private String happenAddress;
@ApiModelProperty(value = "危险级别")
- private Integer dangerLevel;
+ private Integer dangerLevel;
@ApiModelProperty(value = "红牌")
- private Boolean redCard;
+ private Boolean redCard;
@ApiModelProperty(value = "黄牌")
- private Boolean yellowCard;
+ private Boolean yellowCard;
@ApiModelProperty(value = "是否有效")
- private Boolean invalid;
+ private Boolean invalid;
@ApiModelProperty(value = "是否重大")
- private Boolean major;
+ private Boolean major;
@ApiModelProperty(value = "死亡人数")
- private Integer deathsNumber;
+ private Integer deathsNumber;
@ApiModelProperty(value = "受伤人数")
- private Integer injuriesNumber;
+ private Integer injuriesNumber;
@ApiModelProperty(value = "是否疑难事件")
- private Boolean difficult;
+ private Boolean difficult;
@ApiModelProperty(value = "是否紧急")
- private Boolean urgent;
+ private Boolean urgent;
@ApiModelProperty(value = "是否催办")
- private Boolean urgentDell;
+ private Boolean urgentDell;
@ApiModelProperty(value = "上报提交时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date submitDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date submitDate;
@ApiModelProperty(value = "创建人")
- private Long createBy;
+ private Long createBy;
@ApiModelProperty(value = "创建时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
- private Date createAt;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date createAt;
@ApiModelProperty(value = "修改人")
- private Long updateBy;
+ private Long updateBy;
@ApiModelProperty(value = "修改时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date updateAt;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
- @ApiModelProperty(value = "音频")
+ @ApiModelProperty(value = "音频")
private List<EventResourceVO> audios;
- @ApiModelProperty(value = "视频")
- private List<EventResourceVO> videos;
+ @ApiModelProperty(value = "视频")
+ private List<EventResourceVO> videos;
- @ApiModelProperty(value = "图片")
- private List<EventResourceVO> pics;
-
+ @ApiModelProperty(value = "图片")
+ private List<EventResourceVO> pics;
}
--
Gitblit v1.7.1