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/dtos/community/bigscreen/event/ScreenEventListDTO.java | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenEventListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenEventListDTO.java index b46b013..a60f2d5 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenEventListDTO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenEventListDTO.java @@ -1,42 +1,43 @@ package com.panzhihua.common.model.dtos.community.bigscreen.event; +import java.util.List; + +import javax.validation.constraints.NotNull; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.util.List; @Data @ApiModel("大屏事件列表请求参数") public class ScreenEventListDTO { - @ApiModelProperty(value = "分页每页数量",example = "10") + @ApiModelProperty(value = "分页每页数量", example = "10") private Long pageSize = 10L; - @ApiModelProperty(value = "分页当前记录数",example = "1") + @ApiModelProperty(value = "分页当前记录数", example = "1") private Long pageNum = 1L; @ApiModelProperty(value = "社区id", example = "2", required = true) @NotNull(message = "社区id不能为空") private Long communityId; - @ApiModelProperty(value="查询开始时间") + @ApiModelProperty(value = "查询开始时间") private String startTime; - @ApiModelProperty(value="查询结束时间") + @ApiModelProperty(value = "查询结束时间") private String endTime; - @ApiModelProperty(value="网格id") + @ApiModelProperty(value = "网格id") private List<Long> gridIds; - @ApiModelProperty(value="事件类型(1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报 8宣传教育)") + @ApiModelProperty(value = "事件类型(1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报 8宣传教育)") private List<Integer> eventTypes; - @ApiModelProperty(value="事件分类(1、办件事件2、宣传事件3、阅读事件)",hidden = true) + @ApiModelProperty(value = "事件分类(1、办件事件2、宣传事件3、阅读事件)", hidden = true) private Integer eventCategory = 1; - @ApiModelProperty(value="事件处理状态(1待处理、2待验证、3已上报、4已解决、5草稿箱、6已撤销、7已失效 8 已发布)") + @ApiModelProperty(value = "事件处理状态(1待处理、2待验证、3已上报、4已解决、5草稿箱、6已撤销、7已失效 8 已发布)") private Integer eventDealStatus; @ApiModelProperty("是否紧急") @@ -48,7 +49,7 @@ /** * 事件类型(1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报 8宣传教育) */ - public interface eventType{ + public interface eventType { int za = 1; int gg = 2; int md = 3; -- Gitblit v1.7.1