From 3eee4ef8dddb8d113490dc84ed174e1faa09b00f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 01 七月 2021 11:30:15 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVO.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 d332150..d5f06d1 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,6 +1,9 @@
package com.panzhihua.common.model.vos.grid;
import java.util.*;
+
+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;
@@ -19,7 +22,11 @@
public class EventVO {
@ApiModelProperty(value = "id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
+
+ @ApiModelProperty(value = "事件处理状态")
+ private Integer eventDealStatus;
@ApiModelProperty(value = "服务单号")
private String orderSn;
@@ -34,9 +41,14 @@
private Long gridMemberCommunity;
@ApiModelProperty(value = "网格ID")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long gridId;
+ @ApiModelProperty(value = "网格名称")
+ private String gridName;
+
@ApiModelProperty(value = "网格员")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long gridMemberId;
@ApiModelProperty(value = "网格员名字")
@@ -77,7 +89,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date happenTime;
- @ApiModelProperty(value = "发生地点")
+ @ApiModelProperty(value = "事件发生地点备注")
private String happentAddress;
@ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）")
@@ -85,6 +97,9 @@
@ApiModelProperty(value = "事件状态（1草稿箱2发布3逻辑删除4、撤销）")
private Integer eventStatus;
+
+ @ApiModelProperty(value = "事件类型")
+ private String eventClazz;
@ApiModelProperty(value = "1待处理2已解决3待验证")
private Integer eventProcessStatus;
@@ -107,6 +122,9 @@
@ApiModelProperty(value = "事件来源")
private String eventResource;
+
+ @ApiModelProperty(value = "事件发生地点")
+ private String happenAddress;
@ApiModelProperty(value = "危险级别")
private Integer dangerLevel;
@@ -146,7 +164,7 @@
private Long createBy;
@ApiModelProperty(value = "创建时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty(value = "修改人")
--
Gitblit v1.7.1