From 6c6c0825e59377261b9972af95e1e4dafb43fcfd Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 25 十一月 2022 17:44:04 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventAddDTO.java | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventAddDTO.java
index 8edfc83..563df7a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventAddDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventAddDTO.java
@@ -1,17 +1,18 @@
package com.panzhihua.common.model.dtos.grid;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.panzhihua.common.enums.EventType;
-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;
import java.util.List;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* 创建表单
@@ -20,7 +21,7 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Data
@ApiModel("特殊人群事件请求参数")
public class SpecialEventAddDTO {
@@ -30,12 +31,12 @@
@NotNull(message = "发生时间不能为空")
private Date happenTime;
- @Length(max=255)
+ @Length(max = 255)
@ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "41.40338,2.17403", required = true)
@NotNull(message = "发生的精度纬度信息不能为空")
private String happentLatLng;
- @Length(max=255)
+ @Length(max = 255)
@ApiModelProperty(value = "发生地点-位置备注", hidden = false, example = "")
private String happentAddress;
@@ -44,18 +45,18 @@
@NotNull(message = "发生区域-网格ID不能为空")
private Long gridId;
- @Length(max=255)
+ @Length(max = 500)
@ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
@NotNull(message = "事件描述不能为空")
private String eventDes;
- @Length(max=255)
+ @Length(max = 255)
@ApiModelProperty(value = "事件类型,逗号隔开", hidden = false, example = "邻里纠纷,土地承包租赁", required = true)
@NotNull(message = "事件类型不能为空")
private String eventClazz;
@Max(127)
- @ApiModelProperty(value = "危险级别:1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
+ @ApiModelProperty(value = "危险级别:0 (无) 1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
@NotNull(message = "危险级别不能为空")
private Integer dangerLevel;
@@ -81,20 +82,22 @@
@NotNull(message = "特殊人员信息不能为空")
private List<SpecialPopulationDTO> specialPopulation;
- @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 = "音频时长(单位：秒)", hidden = false, example = "10")
private Integer audioTime;
- @ApiModelProperty(value = "视频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
+ @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 = "(当前操作)用户ID", hidden = true, example = "1")
--
Gitblit v1.7.1