From 71949fe2af29b044d2d584e48df30a3f28fd2024 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:25:47 +0800
Subject: [PATCH] 判断一个点是否在一组经纬度包围圈内工具类

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventAddDTO.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 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 fb24a73..2859a6e 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,6 +1,7 @@
 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;
@@ -21,7 +22,7 @@
  * @date 2021-05-26
  * */
 @Data
-@ApiModel("特殊人气事件请求参数")
+@ApiModel("特殊人群事件请求参数")
 public class SpecialEventAddDTO {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -43,7 +44,7 @@
     @NotNull(message = "发生区域-网格ID不能为空")
     private Long gridId;
 
-    @Length(max=255)
+    @Length(max=500)
     @ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
     @NotNull(message = "事件描述不能为空")
     private String eventDes;
@@ -77,15 +78,21 @@
     private Boolean major;
 
     @ApiModelProperty(value = "特殊人群", hidden = false, required = true)
-    @NotNull(message = "特殊人群不能为空")
+    @NotNull(message = "特殊人员信息不能为空")
     private List<SpecialPopulationDTO> specialPopulation;
 
     @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")
     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")
     private String pics;

--
Gitblit v1.7.1