From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java |   44 ++++++++++++++++++++++++++++++--------------
 1 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java
index 88e94ef..2ee9e7c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java
@@ -1,15 +1,13 @@
 package com.panzhihua.common.model.dtos.grid;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
 
 /**
  * 创建表单
@@ -18,34 +16,52 @@
  * @version 1.0
  * @since 1.0
  * @date 2021-05-26
- * */
+ */
 @Data
 @ApiModel("事件处理请求参数")
 public class CommonEventDealDTO {
 
     @Max(9223372036854775807L)
-    @ApiModelProperty(value = "事件id", hidden = false, example = "1",required = true)
+    @ApiModelProperty(value = "事件id", hidden = false, example = "1", required = true)
     @NotNull
     private Long id;
 
-    @Length(max=255)
-    @ApiModelProperty(value = "办理意见", hidden = false, example = "",required = true)
+    @Length(max = 500, message = "办理意见不能超过500个字")
+    @ApiModelProperty(value = "办理意见", hidden = false, example = "", required = true)
     @NotNull
     private String processResult;
 
-    @ApiModelProperty(value = "音频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
+    @ApiModelProperty(value = "音频(限1个)", hidden = false,
+        example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
     private String audio;
 
-    @ApiModelProperty(value = "视频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
+    @ApiModelProperty(value = "音频时长(单位:秒)", hidden = false, example = "10")
+    private Integer audioTime;
+
+    @ApiModelProperty(value = "视频(限1个)", hidden = false,
+        example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
     private String video;
 
+    @ApiModelProperty(value = "视频时长(单位:秒)", hidden = false, example = "10")
+    private Integer videoTime;
+
     @ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
-            example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
+        example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
     private String pics;
+
+    @ApiModelProperty(value = "是否验证:社区后台处理时必填", hidden = false, example = "true")
+    private Boolean needVerify;
 
     @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
     private Long userId;
 
     @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
     private String userName;
+
+    @ApiModelProperty(value = "(当前操作)用户类型:0网格员 1 社区后台", hidden = true, example = "1")
+    private Integer operateType;
+    @ApiModelProperty(value = "(当前操作)用户社区ID", hidden = true, example = "1")
+    private Long communityId;
+    @ApiModelProperty(value = "(当前操作)用户社区名称", hidden = true, example = "学园社区")
+    private String communityName;
 }

--
Gitblit v1.7.1