none

CeDo

2021-05-28 f495b3389331dac4f5c66a9383a8a0c7ff82e37d

none

 .gitignore

@@ -1 +1,4 @@
/springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/


.idea

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EventType.java

New file
@@ -0,0 +1,20 @@
package com.panzhihua.common.enums;

/**
 * @ClasssName 事件常量
 * @Description TODO
 * @Author cedoo
 * @Date 2021/5/28
 * @Version 1.0
 **/
public class EventType {
    //当event_type_category是1填写事件分类
    // 1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报 7 宣传教育
    public static Integer EMERGENCIES = 5;    //5 突发事件
    public static Integer CONTRADICTION = 3;    //3 矛盾纠纷
    public static Integer HAZARD=1;    //1 治安隐患
    public static Integer UNSTABLE=4;    //4 不稳定因素
    public static Integer PUBLIC=2;    //2 公共服务
    public static Integer PROPAGANDA=7;    //7 宣传教育
    public static Integer SPECIAL = 6;    //6 特殊人群信息上报
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java

copy from springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EmergenciesEventEditDTO.java
copy to springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java
File was copied from springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EmergenciesEventEditDTO.java
@@ -8,6 +8,7 @@

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import java.util.Date;


@@ -20,21 +21,22 @@
 * @date 2021-05-26
 * */
@Data
@ApiModel("突发事件编辑请求参数")
public class EmergenciesEventEditDTO {
@ApiModel("事件请求参数")
public class CommonEventAddDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "id,如果是新增则不填", hidden = false, example = "1")
    private Long id;
    @Max(127)
    @ApiModelProperty(value = "事件分类：1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件", hidden = false, example = "1", required = true)
    @NotNull(message = "事件分类不能为空")
    private Integer eventType;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "发生时间", hidden = false, example = "2021-05-01 18:05:50", required = true)
    @NotNull
    @NotNull(message = "发生时间不能为空")
    private Date happenTime;

    @Length(max=255)
    @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "41.40338,2.17403", required = true)
    @NotNull
    @NotNull(message = "发生的精度纬度信息不能为空")
    private String happentLatLng;

    @Length(max=255)
@@ -44,40 +46,40 @@
    //位置备注
    @Max(9223372036854775807L)
    @ApiModelProperty(value = "发生区域-网格ID", hidden = false, example = "1", required = true)
    @NotNull
    @NotNull(message = "发生区域-网格ID不能为空")
    private Long gridId;

    @Length(max=255)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
    @NotNull
    @NotNull(message = "事件描述不能为空")
    private String eventDes;

    @Length(max=255)
    @ApiModelProperty(value = "事件类型,逗号隔开", hidden = false, example = "邻里纠纷,土地承包租赁", required = true)
    @NotNull
    @NotNull(message = "事件类型不能为空")
    private String eventClazz;

    @Max(127)
    @ApiModelProperty(value = "危险级别", hidden = false, example = "1", required = true)
    @NotNull
    @ApiModelProperty(value = "危险级别:1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
    @NotNull(message = "危险级别不能为空")
    private Integer dangerLevel;

    @Max(9999999999L)
    @ApiModelProperty(value = "死亡人数", hidden = false, example = "1", required = true)
    @NotNull
    @NotNull(message = "死亡人数不能为空")
    private Integer deathsNumber;

    @Max(9999999999L)
    @ApiModelProperty(value = "受伤人数", hidden = false, example = "1", required = true)
    @NotNull
    @NotNull(message = "受伤人数不能为空")
    private Integer injuriesNumber;

    @ApiModelProperty(value = "是否紧急", hidden = false, example = "true", required = true)
    @NotNull
    @NotNull(message = "是否紧急不能为空")
    private Boolean urgent;

    @ApiModelProperty(value = "是否重大", hidden = false, example = "true", required = true)
    @NotNull
    @NotNull(message = "是否重大不能为空")
    private Boolean major;

    @ApiModelProperty(value = "音频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java

File was renamed from springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventDealDTO.java
@@ -20,8 +20,8 @@
 * @date 2021-05-26
 * */
@Data
@ApiModel("突发事件处理请求参数")
public class EventDealDTO {
@ApiModel("事件处理请求参数")
public class CommonEventDealDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "事件id", hidden = false, example = "1",required = true)

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDeleteDTO.java

New file
@@ -0,0 +1,28 @@
package com.panzhihua.common.model.dtos.grid;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;


/**
 * 删除表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("删除事件请求参数")
public class CommonEventDeleteDTO {

    @ApiModelProperty(value = "id", hidden = false, example = "1")
    private Long id;

    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventEditDTO.java

copy from springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EmergenciesEventEditDTO.java
copy to springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventEditDTO.java
File was copied from springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EmergenciesEventEditDTO.java
@@ -8,6 +8,7 @@

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import java.util.Date;


@@ -20,8 +21,13 @@
 * @date 2021-05-26
 * */
@Data
@ApiModel("突发事件编辑请求参数")
public class EmergenciesEventEditDTO {
@ApiModel("事件编辑请求参数")
public class CommonEventEditDTO {

    @Max(127)
    @ApiModelProperty(value = "事件分类：1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件", hidden = false, example = "1", required = true)
    @NotNull(message = "事件分类不能为空")
    private Integer eventType;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "id,如果是新增则不填", hidden = false, example = "1")
@@ -29,12 +35,12 @@

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "发生时间", hidden = false, example = "2021-05-01 18:05:50", required = true)
    @NotNull
    @NotNull(message = "发生时间不能为空")
    private Date happenTime;

    @Length(max=255)
    @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "41.40338,2.17403", required = true)
    @NotNull
    @NotNull(message = "发生的精度纬度信息不能为空")
    private String happentLatLng;

    @Length(max=255)
@@ -44,40 +50,40 @@
    //位置备注
    @Max(9223372036854775807L)
    @ApiModelProperty(value = "发生区域-网格ID", hidden = false, example = "1", required = true)
    @NotNull
    @NotNull(message = "发生区域-网格ID不能为空")
    private Long gridId;

    @Length(max=255)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
    @NotNull
    @NotNull(message = "事件描述不能为空")
    private String eventDes;

    @Length(max=255)
    @ApiModelProperty(value = "事件类型,逗号隔开", hidden = false, example = "邻里纠纷,土地承包租赁", required = true)
    @NotNull
    @NotNull(message = "事件类型不能为空")
    private String eventClazz;

    @Max(127)
    @ApiModelProperty(value = "危险级别", hidden = false, example = "1", required = true)
    @NotNull
    @ApiModelProperty(value = "危险级别:1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
    @NotNull(message = "危险级别不能为空")
    private Integer dangerLevel;

    @Max(9999999999L)
    @ApiModelProperty(value = "死亡人数", hidden = false, example = "1", required = true)
    @NotNull
    @NotNull(message = "死亡人数不能为空")
    private Integer deathsNumber;

    @Max(9999999999L)
    @ApiModelProperty(value = "受伤人数", hidden = false, example = "1", required = true)
    @NotNull
    @NotNull(message = "受伤人数不能为空")
    private Integer injuriesNumber;

    @ApiModelProperty(value = "是否紧急", hidden = false, example = "true", required = true)
    @NotNull
    @NotNull(message = "是否紧急不能为空")
    private Boolean urgent;

    @ApiModelProperty(value = "是否重大", hidden = false, example = "true", required = true)
    @NotNull
    @NotNull(message = "是否重大不能为空")
    private Boolean major;

    @ApiModelProperty(value = "音频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventPublicDTO.java

copy from springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventRepublicDTO.java
copy to springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventPublicDTO.java
File was copied from springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventRepublicDTO.java
@@ -3,7 +3,6 @@
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;
@@ -19,11 +18,11 @@
 * */
@Data
@ApiModel("事件重新发布请求参数")
public class EventRepublicDTO {
public class CommonEventPublicDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "事件id", hidden = false, example = "1", required = true)
    @NotNull
    @NotNull(message = "事件ID不能为空")
    private Long id;

    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventReportDTO.java

File was renamed from springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EmergenciesEventReportDTO.java
@@ -18,22 +18,22 @@
 * */
@Data
@ApiModel("上报社区请求参数")
public class EmergenciesEventReportDTO {
public class CommonEventReportDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "事件ID", hidden = false, example = "1",required = true)
    @NotNull
    @NotNull(message = "事件ID不能为空")
    private Long eventId;

    @Length(max=255)
    @ApiModelProperty(value = "办理意见", hidden = false, example = "",required = true)
    @NotNull
    @NotNull(message = "办理意见不能为空")
    private String processResult;

    //事件下游机构或网格员
    @Max(9223372036854775807L)
    @ApiModelProperty(value = "社区ID", hidden = false, example = "1",required = true)
    @NotNull
    @NotNull(message = "社区ID不能为空")
    private Long toId;

    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventRepublicDTO.java

File was renamed from springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventRepublicDTO.java
@@ -19,7 +19,7 @@
 * */
@Data
@ApiModel("事件重新发布请求参数")
public class EventRepublicDTO {
public class CommonEventRepublicDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "事件id", hidden = false, example = "1", required = true)

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventVerifyDTO.java

File was renamed from springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVerifyDTO.java
@@ -21,7 +21,7 @@
 * */
@Data
@ApiModel("突发事件处理请求参数")
public class EventVerifyDTO {
public class CommonEventVerifyDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "事件id", hidden = false, example = "1")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EmergenciesEventAddDTO.java

File was deleted

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventDeleteDTO.java

@@ -13,7 +13,7 @@
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * @date 2021-05-28
 * */
@Data
@ApiModel("删除事件请求参数")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java

@@ -28,8 +28,17 @@

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格ID", hidden = false, example = "1", required = true)
    @NotNull
    @NotNull(message = "网格ID不能为空")
    private Long gridId;

    @Max(127)
    @ApiModelProperty(value = "事件分类：1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件", hidden = false, example = "1", required = true)
    @NotNull(message = "事件分类不能为空")
    private Integer eventType;

    @Max(value = 6, message = "事件处理状态参数错误")
    @ApiModelProperty(value = "事件处理状态（为空时查询全部）：1 待处理、2 待验证、3 已上报、4 已解决、5 草稿箱、6已撤销", hidden = false, example = "1")
    private Integer eventDealStatus;

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;
@@ -41,7 +50,7 @@
    private String sortAttr="createAt";

    @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
    @Pattern(regexp = "asc|desc|ASC|DESC")
    @Pattern(regexp = "asc|desc|ASC|DESC", message = "排序方式参数错误")
    private String sortType="desc";

    public String getSortColumns(){
@@ -106,12 +115,6 @@
    @ApiModelProperty(value = "宣传时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date propagandaTimeEnd;


    @Max(127)
    @ApiModelProperty(value = "当event_type_category是1填写事件类型1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报", hidden = false, example = "1")
    private Integer eventType;


    @Length(max=255)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "")
@@ -276,8 +279,6 @@
    @ApiModelProperty(value = "修改时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAtEnd;


    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventAddDTO.java

File was renamed from springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EmergenciesEventEditDTO.java
@@ -9,6 +9,7 @@
import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;


/**
@@ -20,66 +21,65 @@
 * @date 2021-05-26
 * */
@Data
@ApiModel("突发事件编辑请求参数")
public class EmergenciesEventEditDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "id,如果是新增则不填", hidden = false, example = "1")
    private Long id;
@ApiModel("特殊人气事件请求参数")
public class SpecialEventAddDTO {

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "发生时间", hidden = false, example = "2021-05-01 18:05:50", required = true)
    @NotNull
    @NotNull(message = "发生时间不能为空")
    private Date happenTime;

    @Length(max=255)
    @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "41.40338,2.17403", required = true)
    @NotNull
    @NotNull(message = "发生的精度纬度信息不能为空")
    private String happentLatLng;

    @Length(max=255)
    @ApiModelProperty(value = "发生地点-位置备注", hidden = false, example = "")
    private String happentAddress;

    //位置备注
    @Max(9223372036854775807L)
    @ApiModelProperty(value = "发生区域-网格ID", hidden = false, example = "1", required = true)
    @NotNull
    @NotNull(message = "发生区域-网格ID不能为空")
    private Long gridId;

    @Length(max=255)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
    @NotNull
    @NotNull(message = "事件描述不能为空")
    private String eventDes;

    @Length(max=255)
    @ApiModelProperty(value = "事件类型,逗号隔开", hidden = false, example = "邻里纠纷,土地承包租赁", required = true)
    @NotNull
    @NotNull(message = "事件类型不能为空")
    private String eventClazz;

    @Max(127)
    @ApiModelProperty(value = "危险级别", hidden = false, example = "1", required = true)
    @NotNull
    @ApiModelProperty(value = "危险级别:1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
    @NotNull(message = "危险级别不能为空")
    private Integer dangerLevel;

    @Max(9999999999L)
    @ApiModelProperty(value = "死亡人数", hidden = false, example = "1", required = true)
    @NotNull
    @NotNull(message = "死亡人数不能为空")
    private Integer deathsNumber;

    @Max(9999999999L)
    @ApiModelProperty(value = "受伤人数", hidden = false, example = "1", required = true)
    @NotNull
    @NotNull(message = "受伤人数不能为空")
    private Integer injuriesNumber;

    @ApiModelProperty(value = "是否紧急", hidden = false, example = "true", required = true)
    @NotNull
    @NotNull(message = "是否紧急不能为空")
    private Boolean urgent;

    @ApiModelProperty(value = "是否重大", hidden = false, example = "true", required = true)
    @NotNull
    @NotNull(message = "是否重大不能为空")
    private Boolean major;

    @ApiModelProperty(value = "特殊人群", hidden = false, required = true)
    @NotNull(message = "特殊人群不能为空")
    private List<SpecialPopulationDTO> specialPopulation;

    @ApiModelProperty(value = "音频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
    private String audio;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java

copy from springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EmergenciesEventEditDTO.java
copy to springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java
File was copied from springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EmergenciesEventEditDTO.java
@@ -9,6 +9,7 @@
import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;


/**
@@ -20,66 +21,65 @@
 * @date 2021-05-26
 * */
@Data
@ApiModel("突发事件编辑请求参数")
public class EmergenciesEventEditDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "id,如果是新增则不填", hidden = false, example = "1")
    private Long id;
@ApiModel("特殊人气事件请求参数")
public class SpecialEventEditDTO {

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "发生时间", hidden = false, example = "2021-05-01 18:05:50", required = true)
    @NotNull
    @NotNull(message = "发生时间不能为空")
    private Date happenTime;

    @Length(max=255)
    @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "41.40338,2.17403", required = true)
    @NotNull
    @NotNull(message = "发生的精度纬度信息不能为空")
    private String happentLatLng;

    @Length(max=255)
    @ApiModelProperty(value = "发生地点-位置备注", hidden = false, example = "")
    private String happentAddress;

    //位置备注
    @Max(9223372036854775807L)
    @ApiModelProperty(value = "发生区域-网格ID", hidden = false, example = "1", required = true)
    @NotNull
    @NotNull(message = "发生区域-网格ID不能为空")
    private Long gridId;

    @Length(max=255)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
    @NotNull
    @NotNull(message = "事件描述不能为空")
    private String eventDes;

    @Length(max=255)
    @ApiModelProperty(value = "事件类型,逗号隔开", hidden = false, example = "邻里纠纷,土地承包租赁", required = true)
    @NotNull
    @NotNull(message = "事件类型不能为空")
    private String eventClazz;

    @Max(127)
    @ApiModelProperty(value = "危险级别", hidden = false, example = "1", required = true)
    @NotNull
    @ApiModelProperty(value = "危险级别:1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
    @NotNull(message = "危险级别不能为空")
    private Integer dangerLevel;

    @Max(9999999999L)
    @ApiModelProperty(value = "死亡人数", hidden = false, example = "1", required = true)
    @NotNull
    @NotNull(message = "死亡人数不能为空")
    private Integer deathsNumber;

    @Max(9999999999L)
    @ApiModelProperty(value = "受伤人数", hidden = false, example = "1", required = true)
    @NotNull
    @NotNull(message = "受伤人数不能为空")
    private Integer injuriesNumber;

    @ApiModelProperty(value = "是否紧急", hidden = false, example = "true", required = true)
    @NotNull
    @NotNull(message = "是否紧急不能为空")
    private Boolean urgent;

    @ApiModelProperty(value = "是否重大", hidden = false, example = "true", required = true)
    @NotNull
    @NotNull(message = "是否重大不能为空")
    private Boolean major;

    @ApiModelProperty(value = "特殊人群", hidden = false, required = true)
    @NotNull(message = "特殊人群不能为空")
    private List<SpecialPopulationDTO> specialPopulation;

    @ApiModelProperty(value = "音频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
    private String audio;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialPopulationDTO.java

New file
@@ -0,0 +1,26 @@
package com.panzhihua.common.model.dtos.grid;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;

/**
 * @ClasssName SpecialPopulationDTO
 * @Description TODO
 * @Author cedoo
 * @Date 2021/5/28
 * @Version 1.0
 **/
@Data
@ApiModel("特殊人员信息")
public class SpecialPopulationDTO {
    @ApiModelProperty(value = "身份证", hidden = false, required = true)
    @NotNull(message = "身份证不能为空")
    private String idCard;
    @ApiModelProperty(value = "姓名", hidden = false, required = true)
    @NotNull(message = "姓名不能为空")
    private String name;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/UserEventGridDataVO.java

New file
@@ -0,0 +1,24 @@
package com.panzhihua.common.model.vos.grid;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;
import java.util.Map;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("用户网格待处理数据统计信息")
public class UserEventGridDataVO {

    private Map<Integer, Integer> gridData;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java

@@ -462,28 +462,28 @@
    R<EventGridMemberGpsLogDetailsVO> eventGridMemberGpsLogDetails(@PathVariable("id") Long id);

    /**
     * 添加突发事件
     * @param emergenciesEventAddDTO
     * 添加事件
     * @param commonEventAddDTO
     * @return
     */
    @PostMapping("/event/addEmergencies")
    R addEmergencies(@RequestBody EmergenciesEventAddDTO emergenciesEventAddDTO);
    @PostMapping("/event/addCommon")
    R addCommon(@RequestBody CommonEventAddDTO commonEventAddDTO);

    /**
     * 保存突发事件草稿
     * @param emergenciesEventEditDTO
     * 保存事件草稿
     * @param commonEventEditDTO
     * @return
     */
    @PostMapping("/event/saveEmergenciesDraft")
    R saveEmergenciesDraft(@RequestBody EmergenciesEventEditDTO emergenciesEventEditDTO);
    @PostMapping("/event/saveDraft")
    R saveDraft(@RequestBody CommonEventEditDTO commonEventEditDTO);

    /**
     * 突发事件上报社区
     * @param emergenciesEventReportDTO
     * @param commonEventReportDTO
     * @return
     */
    @PostMapping("/event/emergenciesReport")
    R emergenciesReport(@RequestBody EmergenciesEventReportDTO emergenciesEventReportDTO);
    @PostMapping("/event/report")
    R report(@RequestBody CommonEventReportDTO commonEventReportDTO);

    /**
     * 突发事件撤销
@@ -494,6 +494,38 @@
    R emergenciesRevoke(@RequestBody EventRevokeDTO eventRevokeDTO);

    /**
     * 处理事件
     * @param commonEventDealDTO
     * @return
     */
    @PostMapping("/event/dealEvent")
    R dealEvent(@RequestBody CommonEventDealDTO commonEventDealDTO);

    /**
     * 处理事件
     * @param commonEventVerifyDTO
     * @return
     */
    @PostMapping("/event/verify")
    R verifyEvent(@RequestBody CommonEventVerifyDTO commonEventVerifyDTO);

    /**
     * 处理事件
     * @param commonEventRepublicDTO
     * @return
     */
    @PostMapping("/event/republish")
    R republishEvent(@RequestBody CommonEventRepublicDTO commonEventRepublicDTO);

    /**
     * 网格数据待处理统计信息
     * @param pageEventGridDataDTO
     * @return
     */
    @PostMapping("/eventgriddata/getGridData")
    R getGridData(@RequestBody PageEventGridDataDTO pageEventGridDataDTO);

    /**
     * 查询用户网格
     * @param pageEventGridDataDTO
     * @return
@@ -502,26 +534,34 @@
    R userGrid(@RequestBody PageEventGridDataDTO pageEventGridDataDTO);

    /**
     * 处理事件
     * @param eventDealDTO
     * 特殊人员信息上报
     * @param specialEventAddDTO
     * @return
     */
    @PostMapping("/event/dealEvent")
    R dealEvent(@RequestBody EventDealDTO eventDealDTO);
    @PostMapping("/event/addSpecial")
    R addSpecial(@RequestBody SpecialEventAddDTO specialEventAddDTO);

    /**
     * 处理事件
     * @param eventVerifyDTO
     * 获取指定特殊人员信息
     * @param idCard
     * @return
     */
    @PostMapping("/event/verify")
    R verifyEvent(@RequestBody EventVerifyDTO eventVerifyDTO);
    @PostMapping("/event/addSpecial")
    R getSpecialPopulation(String idCard);

    /**
     * 处理事件
     * @param eventRepublicDTO
     * 保存殊人群事件上报草稿
     * @param specialEventEditDTO
     * @return
     */
    @PostMapping("/event/republish")
    R republishEvent(@RequestBody EventRepublicDTO eventRepublicDTO);
    @PostMapping("/event/saveSpecialDraft")
    R saveSpecialDraft(@RequestBody SpecialEventEditDTO specialEventEditDTO);

    /**
     * 草稿发布
     * @param commonEventPublicDTO
     * @return
     */
    @PostMapping("/event/draftRelease")
    R draftRelease(@RequestBody CommonEventPublicDTO commonEventPublicDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IdCard.java

@@ -57,10 +57,6 @@
        return sex;
    }

    public static String domicile(String cardId){
        return "-";
    }

    public static void main(String[] args) {
        System.out.println(birthDay("120000197802150561"));
        System.out.println(birthDay("32000019951110538X"));

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventApi.java

New file
@@ -0,0 +1,252 @@
package com.panzhihua.grid_app.api;


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.IdCardUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
//import com.panzhihua.common.model.vos.IPageVO;
import com.panzhihua.common.service.grid.GridService;

import javax.annotation.Resource;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventVO;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Slf4j
@RestController
@RequestMapping("/event")
@Api(tags = {"事件-突发/矛盾纠纷事件/治安隐患/不稳定因素/公共服务 @陈东"})
public class EventApi extends BaseController {


    @Resource
    private GridService gridService;

    private boolean isDefaultType(Integer eventType){
        if(eventType==null){
            return false;
        }
        boolean inType = eventType==1 | eventType==2 |eventType==3| eventType==4| eventType==5;
        return inType;
    }

    /**
     * 事件列表
     * @param pageEventDTO 查找事件
     * @return 查找结果
     */
    @GetMapping("/usersList")
    @ApiOperation(value = "事件列表", response= EventVO.class)
    R usersList(@Validated @ModelAttribute PageEventDTO pageEventDTO){
        ClazzUtils.setIfStringIsEmpty(pageEventDTO);
        if(!isDefaultType(pageEventDTO.getEventType())){
            return R.fail(400, "事件类型错误");
        }
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        pageEventDTO.setUserId(loginUserInfoVO.getUserId());
        return gridService.query(pageEventDTO);
    }

    /**
     * 新增事件
     * @param {classNameFirstLower}AddDTO 添加事件传递对象
     * @return 新增结果
     */
    @PostMapping("/release")
    @ApiOperation(value = "发布事件(直接)", response = R.class)
    R add(@Validated @RequestBody CommonEventAddDTO commonEventAddDTO){
        ClazzUtils.setIfStringIsEmpty(commonEventAddDTO);
        if(!isDefaultType(commonEventAddDTO.getEventType())){
            return R.fail(400, "事件类型错误");
        }
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        commonEventAddDTO.setUserId(loginUserInfoVO.getUserId());
        commonEventAddDTO.setUserName(loginUserInfoVO.getName());
        commonEventAddDTO.setPhone(loginUserInfoVO.getPhone());
        return gridService.addCommon(commonEventAddDTO);
    }

    /**
     * 保存草稿
     * @param commonEventEditDTO 保存草稿传递对象
     * @return 新增结果
     */
    @PostMapping("/draft")
    @ApiOperation(value = "保存草稿", response = R.class)
    R saveDraft(@Validated @RequestBody CommonEventEditDTO commonEventEditDTO){
        ClazzUtils.setIfStringIsEmpty(commonEventEditDTO);
        ClazzUtils.setIfStringIsEmpty(commonEventEditDTO);
        if(!isDefaultType(commonEventEditDTO.getEventType())){
            return R.fail(400, "事件类型错误");
        }
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        commonEventEditDTO.setUserId(loginUserInfoVO.getUserId());
        commonEventEditDTO.setUserName(loginUserInfoVO.getName());
        commonEventEditDTO.setPhone(loginUserInfoVO.getPhone());
        return gridService.saveDraft(commonEventEditDTO);
    }

    /**
     * 上报社区
     * @param commonEventReportDTO 上报社区传递对象
     * @return 上报结果
     */
    @PutMapping("/report")
    @ApiOperation(value = "上报社区", response = R.class)
    R report(@Validated @RequestBody CommonEventReportDTO commonEventReportDTO){
        LoginUserInfoVO loginUserInfoVO = getLoginUserInfo();
        ClazzUtils.setIfStringIsEmpty(commonEventReportDTO);
        commonEventReportDTO.setUserId(loginUserInfoVO.getUserId());
        commonEventReportDTO.setUserName(loginUserInfoVO.getName());
        return gridService.report(commonEventReportDTO);
    }


    /**
     * 撤销事件
     * @param eventRevokeDTO 修改事件传递对象
     * @return 修改结果
     */
    @PutMapping("/revoke")
    @ApiOperation(value = "撤销事件", response = R.class)
    R revoke(@Validated @RequestBody EventRevokeDTO eventRevokeDTO){
        ClazzUtils.setIfStringIsEmpty(eventRevokeDTO);
        eventRevokeDTO.setUserId(getUserId());
        return gridService.emergenciesRevoke(eventRevokeDTO);
    }

    /**
     * 处理事件
     * @param commonEventDealDTO 修改事件传递对象
     * @return 处理结果
     */
    @PutMapping("/deal")
    @ApiOperation(value = "处理事件", response = R.class)
    R deal(@Validated @RequestBody CommonEventDealDTO commonEventDealDTO){
        ClazzUtils.setIfStringIsEmpty(commonEventDealDTO);
        LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
        commonEventDealDTO.setUserId(loginUserInfoVO.getUserId());
        commonEventDealDTO.setUserName(loginUserInfoVO.getName());
        return gridService.dealEvent(commonEventDealDTO);
    }

    /**
     * 验证事件
     * @param commonEventVerifyDTO 验证事件传递对象
     * @return 验证结果
     */
    @PutMapping("/verify")
    @ApiOperation(value = "验证事件", response = R.class)
    R verify(@Validated @RequestBody CommonEventVerifyDTO commonEventVerifyDTO){
        ClazzUtils.setIfStringIsEmpty(commonEventVerifyDTO);
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        commonEventVerifyDTO.setUserId(loginUserInfoVO.getUserId());
        commonEventVerifyDTO.setUserName(loginUserInfoVO.getName());
        return gridService.verifyEvent(commonEventVerifyDTO);
    }

    /**
     * 重新发布事件
     * @param commonEventRepublicDTO 重新发布事件传递对象
     * @return 修改结果
     */
    @PutMapping("/republish")
    @ApiOperation(value = "重新发布事件", response = R.class)
    R republish(@Validated @RequestBody CommonEventRepublicDTO commonEventRepublicDTO){
        ClazzUtils.setIfStringIsEmpty(commonEventRepublicDTO);
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        commonEventRepublicDTO.setUserId(loginUserInfoVO.getUserId());
        commonEventRepublicDTO.setUserName(loginUserInfoVO.getName());
        return gridService.republishEvent(commonEventRepublicDTO);
    }

    /**
     * 查询事件详细信息
     * @param id 事件 id
     * @return 查找结果
     */
    @GetMapping("/{id}")
    @ApiOperation(value = "查询事件详细信息")
    R<EventDetailsVO> details(@PathVariable("id") Long id){
        return gridService.eventDetails(id);
    }

    /**
     * 发布草稿
     * @param commonEventPublicDTO 添加事件传递对象
     * @return 新增结果
     */
    @PutMapping("/draft/release")
    @ApiOperation(value = "发布草稿", response = R.class)
    R release(@Validated @RequestBody CommonEventPublicDTO commonEventPublicDTO){
        ClazzUtils.setIfStringIsEmpty(commonEventPublicDTO);
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        commonEventPublicDTO.setUserId(loginUserInfoVO.getUserId());
        commonEventPublicDTO.setUserName(loginUserInfoVO.getName());
        return gridService.draftRelease(commonEventPublicDTO);
    }

    //---
    //---

    /**
     * 添加特殊人群
     * @param specialEventAddDTO 特殊人群信息
     * @return 查找结果
     */
    @PostMapping("/special")
    @ApiOperation(value = "添加特殊人群")
    R addSpecial(@Validated @RequestBody SpecialEventAddDTO specialEventAddDTO){
        ClazzUtils.setIfStringIsEmpty(specialEventAddDTO);
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        specialEventAddDTO.setUserId(loginUserInfoVO.getUserId());
        specialEventAddDTO.setUserName(loginUserInfoVO.getName());
        specialEventAddDTO.setPhone(loginUserInfoVO.getPhone());
        return gridService.addSpecial(specialEventAddDTO);
    }

    /**
     * 保存特殊人群草稿
     * @param specialEventEditDTO 保存草稿传递对象
     * @return 新增结果
     */
    @PostMapping("/special/draft")
    @ApiOperation(value = "保存特殊人群草稿", response = R.class)
    R saveSpecialDraft(@Validated @RequestBody SpecialEventEditDTO specialEventEditDTO){
        ClazzUtils.setIfStringIsEmpty(specialEventEditDTO);
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        specialEventEditDTO.setUserId(loginUserInfoVO.getUserId());
        specialEventEditDTO.setUserName(loginUserInfoVO.getName());
        specialEventEditDTO.setPhone(loginUserInfoVO.getPhone());
        return gridService.saveSpecialDraft(specialEventEditDTO);
    }


    @GetMapping("/special/{idCard}")
    @ApiOperation(value = "查询特殊人群信息")
    R getSpecialByIdCard(@PathVariable String idCard){
        if(idCard!=null){
            boolean verified = IdCardUtil.strongVerifyIdNumber(idCard);
            if(!verified){
                return R.fail("身份证格式错误");
            }
            return gridService.getSpecialPopulation(idCard);
        }
        return R.fail();
    }

}

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventGridDataApi.java

New file
@@ -0,0 +1,137 @@
package com.panzhihua.grid_app.api;


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.common.model.vos.grid.UserEventGridDataVO;
import com.panzhihua.common.utlis.ClazzUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.model.dtos.grid.EventGridDataEditDTO;
//import com.panzhihua.common.model.vos.IPageVO;
import com.panzhihua.common.service.grid.GridService;

import javax.annotation.Resource;
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
import com.panzhihua.common.model.dtos.grid.EventGridDataAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridDataDeleteDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Slf4j
@RestController
@RequestMapping("/eventgriddata")
@Api(tags = {"区县/街道/社区/网格员网格数据管理 @陈东"})
public class EventGridDataApi extends BaseController {

    @Resource
    private GridService gridService;

    /**
     * 我的网格
     * @return 查找结果
     */
    @GetMapping("/myGrid")
    @ApiOperation(value = "我的网格", response= EventGridDataVO.class)
    R myGrid(){
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        PageEventGridDataDTO pageEventGridDataDTO = new PageEventGridDataDTO();
        pageEventGridDataDTO.setUserId(loginUserInfoVO.getUserId());
        pageEventGridDataDTO.setType(3l);
        return gridService.userGrid(pageEventGridDataDTO);
    }


    //-------------

    /**
     * 网格数据待处理统计信息
     * @return 查找结果
     */
    @GetMapping("/myGridData")
    @ApiOperation(value = "网格统计数据", response= UserEventGridDataVO.class)
    R myGridData(){
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        PageEventGridDataDTO pageEventGridDataDTO = new PageEventGridDataDTO();
        pageEventGridDataDTO.setUserId(loginUserInfoVO.getUserId());
        pageEventGridDataDTO.setType(3l);
        return gridService.getGridData(pageEventGridDataDTO);
    }




    /**
     * 新增区县/街道/社区/网格员网格数据管理
     * @param {classNameFirstLower}AddDTO 添加区县/街道/社区/网格员网格数据管理传递对象
     * @return 新增结果
     */
    @PostMapping()
    @ApiOperation(value = "新增区县/街道/社区/网格员网格数据管理", response = R.class)
    R add(@Validated @RequestBody EventGridDataAddDTO eventGridDataAddDTO){
        ClazzUtils.setIfStringIsEmpty(eventGridDataAddDTO);
        eventGridDataAddDTO.setUserId(getUserId());
        return gridService.add(eventGridDataAddDTO);
    }

    /**
     * 修改
     * @param eventGridDataEditDTO 修改区县/街道/社区/网格员网格数据管理传递对象
     * @return 修改结果
     */
    @PutMapping()
    @ApiOperation(value = "编辑区县/街道/社区/网格员网格数据管理", response = R.class)
    R edit(@Validated @RequestBody EventGridDataEditDTO eventGridDataEditDTO){
        ClazzUtils.setIfStringIsEmpty(eventGridDataEditDTO);
        eventGridDataEditDTO.setUserId(getUserId());
        return gridService.edit(eventGridDataEditDTO);
    }

    /**
     * 分页查找
     * @param pageEventGridDataDTO 查找区县/街道/社区/网格员网格数据管理传递对象
     * @return 查找结果
     */
    @GetMapping()
    @ApiOperation(value = "查询区县/街道/社区/网格员网格数据管理", response= EventGridDataVO.class)
    R query(@Validated @ModelAttribute PageEventGridDataDTO pageEventGridDataDTO){
        ClazzUtils.setIfStringIsEmpty(pageEventGridDataDTO);
        return gridService.query(pageEventGridDataDTO);
    }

    /**
     * 删除
     * @param eventGridDataDeleteDTO 删除区县/街道/社区/网格员网格数据管理传递对象
     * @return 删除结果
     */
    @DeleteMapping()
    @ApiOperation(value = "删除区县/街道/社区/网格员网格数据管理", response = R.class)
    R delete(@Validated @RequestBody EventGridDataDeleteDTO  eventGridDataDeleteDTO){
        ClazzUtils.setIfStringIsEmpty(eventGridDataDeleteDTO);
        return gridService.delete(eventGridDataDeleteDTO);
    }

    /**
     * 查询区县/街道/社区/网格员网格数据管理详细信息
     * @param id 区县/街道/社区/网格员网格数据管理 id
     * @return 查找结果
     */
    @GetMapping("/{id}")
    @ApiOperation(value = "查询区县/街道/社区/网格员网格数据管理详细信息")
    R<EventGridDataDetailsVO> details(@PathVariable("id") Long id){
        return gridService.eventGridDataDetails(id);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventApi.java

New file
@@ -0,0 +1,100 @@
package com.panzhihua.grid_backstage.api;


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.ClazzUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.model.dtos.grid.EventEditDTO;
//import com.panzhihua.common.model.vos.IPageVO;
import com.panzhihua.common.service.grid.GridService;

import javax.annotation.Resource;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.common.model.dtos.grid.EventAddDTO;
import com.panzhihua.common.model.dtos.grid.EventDeleteDTO;
import com.panzhihua.common.model.dtos.grid.PageEventDTO;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Slf4j
@RestController
@RequestMapping("/event")
@Api(tags = {"事件"})
public class EventApi extends BaseController {

    @Resource
    private GridService gridService;

    /**
     * 新增事件
     * @param {classNameFirstLower}AddDTO 添加事件传递对象
     * @return 新增结果
     */
    @PostMapping()
    @ApiOperation(value = "新增事件", response = R.class)
    R add(@Validated @RequestBody EventAddDTO eventAddDTO){
        ClazzUtils.setIfStringIsEmpty(eventAddDTO);
        eventAddDTO.setUserId(getUserId());
        return gridService.add(eventAddDTO);
    }

    /**
     * 修改
     * @param eventEditDTO 修改事件传递对象
     * @return 修改结果
     */
    @PutMapping()
    @ApiOperation(value = "编辑事件", response = R.class)
    R edit(@Validated @RequestBody EventEditDTO eventEditDTO){
        ClazzUtils.setIfStringIsEmpty(eventEditDTO);
        eventEditDTO.setUserId(getUserId());
        return gridService.edit(eventEditDTO);
    }

    /**
     * 分页查找
     * @param pageEventDTO 查找事件传递对象
     * @return 查找结果
     */
    @GetMapping()
    @ApiOperation(value = "查询事件", response= EventVO.class)
    R query(@Validated @ModelAttribute PageEventDTO pageEventDTO){
        ClazzUtils.setIfStringIsEmpty(pageEventDTO);
        return gridService.query(pageEventDTO);
    }

    /**
     * 删除
     * @param eventDeleteDTO 删除事件传递对象
     * @return 删除结果
     */
    @DeleteMapping()
    @ApiOperation(value = "删除事件", response = R.class)
    R delete(@Validated @RequestBody EventDeleteDTO  eventDeleteDTO){
        ClazzUtils.setIfStringIsEmpty(eventDeleteDTO);
        return gridService.delete(eventDeleteDTO);
    }

    /**
     * 查询事件详细信息
     * @param id 事件 id
     * @return 查找结果
     */
    @GetMapping("/{id}")
    @ApiOperation(value = "查询事件详细信息")
    R<EventDetailsVO> details(@PathVariable("id") Long id){
        return gridService.eventDetails(id);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridDataApi.java

New file
@@ -0,0 +1,117 @@
package com.panzhihua.grid_backstage.api;


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.common.utlis.ClazzUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.model.dtos.grid.EventGridDataEditDTO;
//import com.panzhihua.common.model.vos.IPageVO;
import com.panzhihua.common.service.grid.GridService;

import javax.annotation.Resource;
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
import com.panzhihua.common.model.dtos.grid.EventGridDataAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridDataDeleteDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Slf4j
@RestController
@RequestMapping("/eventgriddata")
@Api(tags = {"区县/街道/社区/网格员网格数据管理 @陈东"})
public class EventGridDataApi extends BaseController {

    @Resource
    private GridService gridService;

    /**
     * 我的网格
     * @return 查找结果
     */
    @GetMapping("/myGrid")
    @ApiOperation(value = "我的网格", response= EventGridDataVO.class)
    R myGrid(){
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        PageEventGridDataDTO pageEventGridDataDTO = new PageEventGridDataDTO();
        pageEventGridDataDTO.setUserId(loginUserInfoVO.getUserId());
        pageEventGridDataDTO.setType(3l);
        return gridService.userGrid(pageEventGridDataDTO);
    }


    /**
     * 新增区县/街道/社区/网格员网格数据管理
     * @param {classNameFirstLower}AddDTO 添加区县/街道/社区/网格员网格数据管理传递对象
     * @return 新增结果
     */
    @PostMapping()
    @ApiOperation(value = "新增区县/街道/社区/网格员网格数据管理", response = R.class)
    R add(@Validated @RequestBody EventGridDataAddDTO eventGridDataAddDTO){
        ClazzUtils.setIfStringIsEmpty(eventGridDataAddDTO);
        eventGridDataAddDTO.setUserId(getUserId());
        return gridService.add(eventGridDataAddDTO);
    }

    /**
     * 修改
     * @param eventGridDataEditDTO 修改区县/街道/社区/网格员网格数据管理传递对象
     * @return 修改结果
     */
    @PutMapping()
    @ApiOperation(value = "编辑区县/街道/社区/网格员网格数据管理", response = R.class)
    R edit(@Validated @RequestBody EventGridDataEditDTO eventGridDataEditDTO){
        ClazzUtils.setIfStringIsEmpty(eventGridDataEditDTO);
        eventGridDataEditDTO.setUserId(getUserId());
        return gridService.edit(eventGridDataEditDTO);
    }

    /**
     * 分页查找
     * @param pageEventGridDataDTO 查找区县/街道/社区/网格员网格数据管理传递对象
     * @return 查找结果
     */
    @GetMapping()
    @ApiOperation(value = "查询区县/街道/社区/网格员网格数据管理", response= EventGridDataVO.class)
    R query(@Validated @ModelAttribute PageEventGridDataDTO pageEventGridDataDTO){
        ClazzUtils.setIfStringIsEmpty(pageEventGridDataDTO);
        return gridService.query(pageEventGridDataDTO);
    }

    /**
     * 删除
     * @param eventGridDataDeleteDTO 删除区县/街道/社区/网格员网格数据管理传递对象
     * @return 删除结果
     */
    @DeleteMapping()
    @ApiOperation(value = "删除区县/街道/社区/网格员网格数据管理", response = R.class)
    R delete(@Validated @RequestBody EventGridDataDeleteDTO  eventGridDataDeleteDTO){
        ClazzUtils.setIfStringIsEmpty(eventGridDataDeleteDTO);
        return gridService.delete(eventGridDataDeleteDTO);
    }

    /**
     * 查询区县/街道/社区/网格员网格数据管理详细信息
     * @param id 区县/街道/社区/网格员网格数据管理 id
     * @return 查找结果
     */
    @GetMapping("/{id}")
    @ApiOperation(value = "查询区县/街道/社区/网格员网格数据管理详细信息")
    R<EventGridDataDetailsVO> details(@PathVariable("id") Long id){
        return gridService.eventGridDataDetails(id);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridMemberRelationApi.java

New file
@@ -0,0 +1,100 @@
package com.panzhihua.grid_backstage.api;


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.ClazzUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationEditDTO;
//import com.panzhihua.common.model.vos.IPageVO;
import com.panzhihua.common.service.grid.GridService;

import javax.annotation.Resource;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Slf4j
@RestController
@RequestMapping("/eventgridmemberrelation")
@Api(tags = {"网格和网格员的关联关系"})
public class EventGridMemberRelationApi extends BaseController {

    @Resource
    private GridService gridService;

    /**
     * 新增网格和网格员的关联关系
     * @param {classNameFirstLower}AddDTO 添加网格和网格员的关联关系传递对象
     * @return 新增结果
     */
    @PostMapping()
    @ApiOperation(value = "新增网格和网格员的关联关系", response = R.class)
    R add(@Validated @RequestBody EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO){
        ClazzUtils.setIfStringIsEmpty(eventGridMemberRelationAddDTO);
        eventGridMemberRelationAddDTO.setUserId(getUserId());
        return gridService.add(eventGridMemberRelationAddDTO);
    }

    /**
     * 修改
     * @param eventGridMemberRelationEditDTO 修改网格和网格员的关联关系传递对象
     * @return 修改结果
     */
    @PutMapping()
    @ApiOperation(value = "编辑网格和网格员的关联关系", response = R.class)
    R edit(@Validated @RequestBody EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO){
        ClazzUtils.setIfStringIsEmpty(eventGridMemberRelationEditDTO);
        eventGridMemberRelationEditDTO.setUserId(getUserId());
        return gridService.edit(eventGridMemberRelationEditDTO);
    }

    /**
     * 分页查找
     * @param pageEventGridMemberRelationDTO 查找网格和网格员的关联关系传递对象
     * @return 查找结果
     */
    @GetMapping()
    @ApiOperation(value = "查询网格和网格员的关联关系", response= EventGridMemberRelationVO.class)
    R query(@Validated @ModelAttribute PageEventGridMemberRelationDTO pageEventGridMemberRelationDTO){
        ClazzUtils.setIfStringIsEmpty(pageEventGridMemberRelationDTO);
        return gridService.query(pageEventGridMemberRelationDTO);
    }

    /**
     * 删除
     * @param eventGridMemberRelationDeleteDTO 删除网格和网格员的关联关系传递对象
     * @return 删除结果
     */
    @DeleteMapping()
    @ApiOperation(value = "删除网格和网格员的关联关系", response = R.class)
    R delete(@Validated @RequestBody EventGridMemberRelationDeleteDTO  eventGridMemberRelationDeleteDTO){
        ClazzUtils.setIfStringIsEmpty(eventGridMemberRelationDeleteDTO);
        return gridService.delete(eventGridMemberRelationDeleteDTO);
    }

    /**
     * 查询网格和网格员的关联关系详细信息
     * @param id 网格和网格员的关联关系 id
     * @return 查找结果
     */
    @GetMapping("/{id}")
    @ApiOperation(value = "查询网格和网格员的关联关系详细信息")
    R<EventGridMemberRelationDetailsVO> details(@PathVariable("id") Long id){
        return gridService.eventGridMemberRelationDetails(id);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java

@@ -6,14 +6,8 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.service_grid.model.dos.EventResourceDO;
import com.panzhihua.service_grid.service.EventResourceService;
import com.panzhihua.service_grid.service.EventService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -65,12 +59,12 @@

    /**
     * 删除事件
     * @param EventDeleteDTO
     * @param CommonEventDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/delete")
    R delete(@RequestBody EventDeleteDTO EventDeleteDTO){
        return eventService.delete(EventDeleteDTO);
    R delete(@RequestBody CommonEventDeleteDTO CommonEventDeleteDTO){
        return eventService.delete(CommonEventDeleteDTO);
    };

    /**
@@ -85,32 +79,32 @@

    /**
     * 添加突发事件
     * @param emergenciesEventAddDTO
     * @param commonEventAddDTO
     * @return 新增结果
     */
    @PostMapping("/addEmergencies")
    R addEmergencies(@RequestBody EmergenciesEventAddDTO emergenciesEventAddDTO){
        return eventService.addEmergencies(emergenciesEventAddDTO);
    @PostMapping("/addCommon")
    R addCommon(@RequestBody CommonEventAddDTO commonEventAddDTO){
        return eventService.addCommon(commonEventAddDTO);
    };
    /**
     * 保存草稿
     * @param {classNameFirstLower}AddDTO 添加事件传递对象
     * @return 新增结果
     */
    @PostMapping("/saveEmergenciesDraft")
    R saveEmergenciesDraft(@RequestBody EmergenciesEventEditDTO emergenciesEventEditDTO){
        return eventService.saveEmergenciesDraft(emergenciesEventEditDTO);
    @PostMapping("/saveDraft")
    R saveDraft(@RequestBody CommonEventEditDTO commonEventEditDTO){
        return eventService.saveDraft(commonEventEditDTO);
    }


    /**
     * 突发事件上报社区
     * @param emergenciesEventReportDTO
     * @param commonEventReportDTO
     * @return
     */
    @PostMapping("/emergenciesReport")
    R emergenciesReport(@RequestBody EmergenciesEventReportDTO emergenciesEventReportDTO){
        return eventService.emergenciesReport(emergenciesEventReportDTO);
    @PostMapping("/report")
    R report(@RequestBody CommonEventReportDTO commonEventReportDTO){
        return eventService.report(commonEventReportDTO);
    }


@@ -125,32 +119,41 @@
    }
    /**
     * 处理事件
     * @param eventDealDTO
     * @param commonEventDealDTO
     * @return
     */
    @PostMapping("/dealEvent")
    R dealEvent(@RequestBody EventDealDTO eventDealDTO){
        return eventService.dealEvent(eventDealDTO);
    R dealEvent(@RequestBody CommonEventDealDTO commonEventDealDTO){
        return eventService.dealEvent(commonEventDealDTO);
    }

    /**
     * 处理事件
     * @param eventVerifyDTO
     * @param commonEventVerifyDTO
     * @return
     */
    @PostMapping("/verify")
    R verifyEvent(@RequestBody EventVerifyDTO eventVerifyDTO){
        return eventService.verifyEvent(eventVerifyDTO);
    R verifyEvent(@RequestBody CommonEventVerifyDTO commonEventVerifyDTO){
        return eventService.verifyEvent(commonEventVerifyDTO);
    }

    /**
     * 重新发布事件
     * @param eventRepublicDTO
     * @param commonEventRepublicDTO
     * @return
     */
    @PostMapping("/republish")
    R republishEvent(@RequestBody EventRepublicDTO eventRepublicDTO){
        return eventService.republishEvent(eventRepublicDTO);
    R republishEvent(@RequestBody CommonEventRepublicDTO commonEventRepublicDTO){
        return eventService.republishEvent(commonEventRepublicDTO);
    }

    /**
     * 草稿发布
     * @param commonEventPublicDTO
     * @return
     */
    @PostMapping("/event/draftRelease")
    R draftRelease(@RequestBody CommonEventPublicDTO commonEventPublicDTO){
        return eventService.draftRelease(commonEventPublicDTO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java

@@ -7,7 +7,6 @@
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.service_grid.model.dos.EventDO;
import org.springframework.transaction.annotation.Transactional;

/**
 * 事件 service
@@ -42,10 +41,10 @@

    /**
     * 删除事件
     * @param EventDeleteDTO
     * @param CommonEventDeleteDTO
     * @return 平台用户信息
     */
    R delete(EventDeleteDTO EventDeleteDTO);
    R delete(CommonEventDeleteDTO CommonEventDeleteDTO);

    /**
     * 查询事件详细信息
@@ -55,25 +54,25 @@
    R<EventDetailsVO> eventDetails(Long id);

    /**
     * 添加突发事件
     * @param emergenciesEventAddDTO
     * 添加事件
     * @param commonEventAddDTO
     * @return
     */
    R addEmergencies(EmergenciesEventAddDTO emergenciesEventAddDTO);
    R addCommon(CommonEventAddDTO commonEventAddDTO);

    /**
     * 保存突发事件草稿
     * @param emergenciesEventEditDTO
     * 保存事件草稿
     * @param commonEventEditDTO
     * @return
     */
    R saveEmergenciesDraft(EmergenciesEventEditDTO emergenciesEventEditDTO);
    R saveDraft(CommonEventEditDTO commonEventEditDTO);

    /**
     * 突发事件上报
     * @param emergenciesEventReportDTO
     * @param commonEventReportDTO
     * @return
     */
    R emergenciesReport(EmergenciesEventReportDTO emergenciesEventReportDTO);
    R report(CommonEventReportDTO commonEventReportDTO);

    /**
     * 突发事件撤销
@@ -83,22 +82,29 @@
    R emergenciesRevoke(EventRevokeDTO eventRevokeDTO);
    /**
     * 处理事件
     * @param eventDealDTO
     * @param commonEventDealDTO
     * @return
     */
    R dealEvent(EventDealDTO eventDealDTO);
    R dealEvent(CommonEventDealDTO commonEventDealDTO);

    /**
     * 确认事件
     * @param eventVerifyDTO
     * @param commonEventVerifyDTO
     * @return
     */
    R verifyEvent(EventVerifyDTO eventVerifyDTO);
    R verifyEvent(CommonEventVerifyDTO commonEventVerifyDTO);

    /**
     * 重新发布事件
     * @param eventRepublicDTO
     * @param commonEventRepublicDTO
     * @return
     */
    R republishEvent(EventRepublicDTO eventRepublicDTO);
    R republishEvent(CommonEventRepublicDTO commonEventRepublicDTO);

    /**
     * 草稿发布
     * @param commonEventPublicDTO
     * @return
     */
    R draftRelease(CommonEventPublicDTO commonEventPublicDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -129,10 +129,10 @@

    /**
     * 删除事件
     * @param EventDeleteDTO
     * @param CommonEventDeleteDTO
     * @return 平台用户信息
     */
    public R delete(EventDeleteDTO EventDeleteDTO){
    public R delete(CommonEventDeleteDTO CommonEventDeleteDTO){
        return R.fail();
    }

@@ -231,57 +231,56 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R addEmergencies(EmergenciesEventAddDTO emergenciesEventAddDTO) {
    public R addCommon(CommonEventAddDTO commonEventAddDTO) {
        EventDO eventDO = new EventDO();
        BeanUtils.copyProperties(emergenciesEventAddDTO, eventDO);
        eventDO.setGridMemberId(emergenciesEventAddDTO.getUserId());
        BeanUtils.copyProperties(commonEventAddDTO, eventDO);
        eventDO.setGridMemberId(commonEventAddDTO.getUserId());
        eventDO.setEventCategory(1l);//办件事件
        eventDO.setEventType(5);//突发事件分类
        eventDO.setEventStatus(2);//事件状态 2发布
        eventDO.setProcessType(1);//网格员处理
        eventDO.setCommunityProcess(0);//非 社区处理
        eventDO.setEventProcessStatus(1);
        eventDO.setGridMemberId(emergenciesEventAddDTO.getUserId());
        eventDO.setGridMemberName(emergenciesEventAddDTO.getUserName());
        eventDO.setGridMemberTelephone(emergenciesEventAddDTO.getPhone());
        eventDO.setCreateBy(emergenciesEventAddDTO.getUserId());
        eventDO.setGridMemberId(commonEventAddDTO.getUserId());
        eventDO.setGridMemberName(commonEventAddDTO.getUserName());
        eventDO.setGridMemberTelephone(commonEventAddDTO.getPhone());
        eventDO.setCreateBy(commonEventAddDTO.getUserId());
        if(eventMapper.insert(eventDO)==1){
            //添加音频
            if(StringUtils.isNotEmpty(emergenciesEventAddDTO.getAudio())){
            if(StringUtils.isNotEmpty(commonEventAddDTO.getAudio())){
                EventResourceDO eventResourceDO = new EventResourceDO();
                eventResourceDO.setClassification(1);
                eventResourceDO.setType(2);
                eventResourceDO.setUrl(emergenciesEventAddDTO.getAudio());
                eventResourceDO.setUrl(commonEventAddDTO.getAudio());
                eventResourceDO.setRefId(eventDO.getId());
                eventResourceDO.setCreateBy(emergenciesEventAddDTO.getUserId());
                eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
                int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if(audioAdd!=1){
                    throw new ServiceException("添加音频失败");
                }
            }
            //添加视频
            if(StringUtils.isNotEmpty(emergenciesEventAddDTO.getVideo())){
            if(StringUtils.isNotEmpty(commonEventAddDTO.getVideo())){
                EventResourceDO eventResourceDO = new EventResourceDO();
                eventResourceDO.setClassification(1);
                eventResourceDO.setType(3);
                eventResourceDO.setUrl(emergenciesEventAddDTO.getVideo());
                eventResourceDO.setUrl(commonEventAddDTO.getVideo());
                eventResourceDO.setRefId(eventDO.getId());
                eventResourceDO.setCreateBy(emergenciesEventAddDTO.getUserId());
                eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
                int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if(videoAdd!=1){
                    throw new ServiceException("添加视频失败");
                }
            }
            //添加图片
            if(StringUtils.isNotEmpty(emergenciesEventAddDTO.getPics())){
                String[] pica = emergenciesEventAddDTO.getPics().split(",");
            if(StringUtils.isNotEmpty(commonEventAddDTO.getPics())){
                String[] pica = commonEventAddDTO.getPics().split(",");
                for (int i = 0; i < pica.length; i++) {
                    EventResourceDO eventResourceDO = new EventResourceDO();
                    eventResourceDO.setClassification(1);
                    eventResourceDO.setType(1);
                    eventResourceDO.setUrl(pica[i]);
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setCreateBy(emergenciesEventAddDTO.getUserId());
                    eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
                    int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if(picAdd!=1){
                        throw new ServiceException("添加图片失败");
@@ -294,54 +293,55 @@
    }

    @Override
    public R saveEmergenciesDraft(EmergenciesEventEditDTO emergenciesEventEditDTO) {
        if(emergenciesEventEditDTO.getId()==null) {
    @Transactional(rollbackFor = Exception.class)
    public R saveDraft(CommonEventEditDTO commonEventEditDTO) {
        if(commonEventEditDTO.getId()==null) {
            EventDO eventDO = new EventDO();
            BeanUtils.copyProperties(emergenciesEventEditDTO, eventDO);
            eventDO.setGridMemberId(emergenciesEventEditDTO.getUserId());
            BeanUtils.copyProperties(commonEventEditDTO, eventDO);
            eventDO.setGridMemberId(commonEventEditDTO.getUserId());
            eventDO.setEventCategory(1l);//办件事件
            eventDO.setEventType(5);//突发事件分类
            eventDO.setEventStatus(1);//事件状态 1草稿
            eventDO.setProcessType(1);//网格员处理
            eventDO.setCommunityProcess(0);//非 社区处理
            eventDO.setCreateBy(emergenciesEventEditDTO.getUserId());
            eventDO.setCreateBy(commonEventEditDTO.getUserId());
            if (eventMapper.insert(eventDO) > 0) {
                //添加音频
                if (StringUtils.isNotEmpty(emergenciesEventEditDTO.getAudio())) {
                if (StringUtils.isNotEmpty(commonEventEditDTO.getAudio())) {
                    EventResourceDO eventResourceDO = new EventResourceDO();
                    eventResourceDO.setClassification(1);
                    eventResourceDO.setType(2);
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(emergenciesEventEditDTO.getAudio());
                    eventResourceDO.setCreateBy(emergenciesEventEditDTO.getUserId());
                    eventResourceDO.setUrl(commonEventEditDTO.getAudio());
                    eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
                    int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (audioAdd != 1) {
                        throw new ServiceException("添加音频失败");
                    }
                }
                //添加视频
                if (StringUtils.isNotEmpty(emergenciesEventEditDTO.getVideo())) {
                if (StringUtils.isNotEmpty(commonEventEditDTO.getVideo())) {
                    EventResourceDO eventResourceDO = new EventResourceDO();
                    eventResourceDO.setClassification(1);
                    eventResourceDO.setType(3);
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(emergenciesEventEditDTO.getVideo());
                    eventResourceDO.setCreateBy(emergenciesEventEditDTO.getUserId());
                    eventResourceDO.setUrl(commonEventEditDTO.getVideo());
                    eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
                    int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (videoAdd != 1) {
                        throw new ServiceException("添加视频失败");
                    }
                }
                //添加图片
                if (StringUtils.isNotEmpty(emergenciesEventEditDTO.getPics())) {
                    String[] pica = emergenciesEventEditDTO.getPics().split(",");
                if (StringUtils.isNotEmpty(commonEventEditDTO.getPics())) {
                    String[] pica = commonEventEditDTO.getPics().split(",");
                    for (int i = 0; i < pica.length; i++) {
                        EventResourceDO eventResourceDO = new EventResourceDO();
                        eventResourceDO.setClassification(1);
                        eventResourceDO.setType(1);
                        eventResourceDO.setRefId(eventDO.getId());
                        eventResourceDO.setUrl(pica[i]);
                        eventResourceDO.setCreateBy(emergenciesEventEditDTO.getUserId());
                        eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
                        int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                        if (picAdd != 1) {
                            throw new ServiceException("添加图片失败");
@@ -353,56 +353,56 @@
            return R.fail();
        }else{
            //编辑原来的
            EventDO eventDO = eventMapper.selectById(emergenciesEventEditDTO.getId());
            BeanUtils.copyProperties(emergenciesEventEditDTO, eventDO);
            eventDO.setGridMemberId(emergenciesEventEditDTO.getUserId());
            EventDO eventDO = eventMapper.selectById(commonEventEditDTO.getId());
            BeanUtils.copyProperties(commonEventEditDTO, eventDO);
            eventDO.setGridMemberId(commonEventEditDTO.getUserId());
            eventDO.setEventCategory(1l);//办件事件
            eventDO.setEventType(5);//突发事件分类
            eventDO.setEventStatus(1);//事件状态 2发布
            eventDO.setProcessType(1);//网格员处理
            eventDO.setCommunityProcess(0);//非 社区处理
            eventDO.setUpdateBy(emergenciesEventEditDTO.getUserId());
            eventDO.setUpdateBy(commonEventEditDTO.getUserId());
            if (eventMapper.updateById(eventDO) > 0) {
                int deleted = eventResourceService.getBaseMapper()
                        .delete(new LambdaQueryWrapper<EventResourceDO>()
                                .eq(EventResourceDO::getClassification,1)
                                .eq(EventResourceDO::getRefId, eventDO.getId()));
                //添加音频
                if (StringUtils.isNotEmpty(emergenciesEventEditDTO.getAudio())) {
                if (StringUtils.isNotEmpty(commonEventEditDTO.getAudio())) {
                    EventResourceDO eventResourceDO = new EventResourceDO();
                    eventResourceDO.setClassification(1);
                    eventResourceDO.setType(2);
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(emergenciesEventEditDTO.getAudio());
                    eventResourceDO.setCreateBy(emergenciesEventEditDTO.getUserId());
                    eventResourceDO.setUrl(commonEventEditDTO.getAudio());
                    eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
                    int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (audioAdd != 1) {
                        throw new ServiceException("添加音频失败");
                    }
                }
                //添加视频
                if (StringUtils.isNotEmpty(emergenciesEventEditDTO.getVideo())) {
                if (StringUtils.isNotEmpty(commonEventEditDTO.getVideo())) {
                    EventResourceDO eventResourceDO = new EventResourceDO();
                    eventResourceDO.setClassification(1);
                    eventResourceDO.setType(3);
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(emergenciesEventEditDTO.getVideo());
                    eventResourceDO.setCreateBy(emergenciesEventEditDTO.getUserId());
                    eventResourceDO.setUrl(commonEventEditDTO.getVideo());
                    eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
                    int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (videoAdd != 1) {
                        throw new ServiceException("添加视频失败");
                    }
                }
                //添加图片
                if (StringUtils.isNotEmpty(emergenciesEventEditDTO.getPics())) {
                    String[] pica = emergenciesEventEditDTO.getPics().split(",");
                if (StringUtils.isNotEmpty(commonEventEditDTO.getPics())) {
                    String[] pica = commonEventEditDTO.getPics().split(",");
                    for (int i = 0; i < pica.length; i++) {
                        EventResourceDO eventResourceDO = new EventResourceDO();
                        eventResourceDO.setClassification(1);
                        eventResourceDO.setType(1);
                        eventResourceDO.setRefId(eventDO.getId());
                        eventResourceDO.setUrl(pica[i]);
                        eventResourceDO.setCreateBy(emergenciesEventEditDTO.getUserId());
                        eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
                        int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                        if (picAdd != 1) {
                            throw new ServiceException("添加图片失败");
@@ -417,8 +417,8 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R emergenciesReport(EmergenciesEventReportDTO emergenciesEventReportDTO) {
        EventDO eventDO = this.getBaseMapper().selectById(emergenciesEventReportDTO.getEventId());
    public R report(CommonEventReportDTO commonEventReportDTO) {
        EventDO eventDO = this.getBaseMapper().selectById(commonEventReportDTO.getEventId());
        if(eventDO==null){
            return R.fail("事件不存在");
        }
@@ -428,20 +428,20 @@
        if(eventDO.getProcessType()==2){
            return R.fail("当前事件已交由社区处理");
        }
        eventDO.setCommunityProcess(1);
        eventDO.setProcessType(2);
        eventDO.setEventProcessStatus(1);
        eventDO.setUpdateBy(emergenciesEventReportDTO.getUserId());
        eventDO.setCommunityProcess(1);    //社区处理
        eventDO.setProcessType(2);    //当前处理对象： 社区处理
        eventDO.setEventProcessStatus(1);    //待处理
        eventDO.setUpdateBy(commonEventReportDTO.getUserId());
        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated!=1){
            throw new ServiceException("更新突发事件状态更新失败");
        }
        EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO();
        BeanUtils.copyProperties(emergenciesEventReportDTO, eventTransferRecordDO);
        BeanUtils.copyProperties(commonEventReportDTO, eventTransferRecordDO);
        eventTransferRecordDO.setFromType(1);
        eventTransferRecordDO.setFromId(emergenciesEventReportDTO.getUserId());
        eventTransferRecordDO.setFromName(emergenciesEventReportDTO.getUserName());
        eventTransferRecordDO.setToType(2);
        eventTransferRecordDO.setFromId(commonEventReportDTO.getUserId());
        eventTransferRecordDO.setFromName(commonEventReportDTO.getUserName());
        eventTransferRecordDO.setToType(2);//转交类型:2、社区
        eventTransferRecordDO.setProcessDate(new Date());
        int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO);
        return inserted==1?R.ok():R.fail();
@@ -453,20 +453,25 @@
        if(eventDO==null){
            return R.fail("事件不存在");
        }
        boolean canRevoke = eventDO.getEventStatus()==2 && eventDO.getCommunityProcess()==0;
        boolean canRevoke = eventDO.getEventStatus()==2 //发布状态
                && eventDO.getEventProcessStatus()==1   //待处理
                ;
        if(!canRevoke){
            return R.fail("当前事件不允许撤销");
        }
        eventDO.setEventStatus(4);
        eventDO.setUpdateBy(eventRevokeDTO.getUserId());
        eventDO.setEventType(5);//突发事件分类
        eventDO.setProcessType(1);//网格员处理
        eventDO.setCommunityProcess(0);//非 社区处理
        int updated = this.getBaseMapper().updateById(eventDO);
        return updated==1?R.ok():R.fail();
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R dealEvent(EventDealDTO eventDealDTO) {
        EventDO eventDO = this.getBaseMapper().selectById(eventDealDTO.getId());
    public R dealEvent(CommonEventDealDTO commonEventDealDTO) {
        EventDO eventDO = this.getBaseMapper().selectById(commonEventDealDTO.getId());
        boolean canDealByUser = eventDO.getEventStatus()==2 && eventDO.getEventProcessStatus()==1;
        if(!canDealByUser){
            if(eventDO.getEventStatus()!=2){
@@ -479,59 +484,66 @@
        }

        eventDO.setEventProcessStatus(2);//2已解决
        eventDO.setUpdateBy(eventDealDTO.getUserId());
        eventDO.setUpdateBy(commonEventDealDTO.getUserId());

        //更新出利润信息
        eventDO.setProcessUserId(commonEventDealDTO.getUserId());
        eventDO.setProcessUserName(commonEventDealDTO.getUserName());
        eventDO.setProcessDate(new Date());
        eventDO.setProcessDesc(commonEventDealDTO.getProcessResult());

        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated!=1){
            return R.fail("更新事件状态失败");
        }

        EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO();
        BeanUtils.copyProperties(eventDealDTO, eventTransferRecordDO);
        BeanUtils.copyProperties(commonEventDealDTO, eventTransferRecordDO);
        eventTransferRecordDO.setFromType(1);
        eventTransferRecordDO.setFromId(eventDealDTO.getUserId());
        eventTransferRecordDO.setFromName(eventDealDTO.getUserName());
        eventTransferRecordDO.setFromId(commonEventDealDTO.getUserId());
        eventTransferRecordDO.setFromName(commonEventDealDTO.getUserName());
        eventTransferRecordDO.setToType(1);
        eventTransferRecordDO.setToId(eventDealDTO.getUserId());
        eventTransferRecordDO.setToId(commonEventDealDTO.getUserId());
        eventTransferRecordDO.setProcessDate(new Date());
        eventTransferRecordDO.setEventId(eventDO.getId());
        int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO);
        if(inserted==1){
            //添加音频
            if(StringUtils.isNotEmpty(eventDealDTO.getAudio())){
            if(StringUtils.isNotEmpty(commonEventDealDTO.getAudio())){
                EventResourceDO eventResourceDO = new EventResourceDO();
                eventResourceDO.setClassification(3);
                eventResourceDO.setType(2);
                eventResourceDO.setUrl(eventDealDTO.getAudio());
                eventResourceDO.setUrl(commonEventDealDTO.getAudio());
                eventResourceDO.setRefId(eventTransferRecordDO.getId());
                eventResourceDO.setCreateBy(eventDealDTO.getUserId());
                eventResourceDO.setCreateBy(commonEventDealDTO.getUserId());
                int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if(audioAdd!=1){
                    throw new ServiceException("添加音频失败");
                }
            }
            //添加视频
            if(StringUtils.isNotEmpty(eventDealDTO.getVideo())){
            if(StringUtils.isNotEmpty(commonEventDealDTO.getVideo())){
                EventResourceDO eventResourceDO = new EventResourceDO();
                eventResourceDO.setClassification(3);
                eventResourceDO.setType(3);
                eventResourceDO.setUrl(eventDealDTO.getVideo());
                eventResourceDO.setUrl(commonEventDealDTO.getVideo());
                eventResourceDO.setRefId(eventTransferRecordDO.getId());
                eventResourceDO.setCreateBy(eventDealDTO.getUserId());
                eventResourceDO.setCreateBy(commonEventDealDTO.getUserId());
                int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if(videoAdd!=1){
                    throw new ServiceException("添加视频失败");
                }
            }
            //添加图片
            if(StringUtils.isNotEmpty(eventDealDTO.getPics())){
                String[] pica = eventDealDTO.getPics().split(",");
            if(StringUtils.isNotEmpty(commonEventDealDTO.getPics())){
                String[] pica = commonEventDealDTO.getPics().split(",");
                for (int i = 0; i < pica.length; i++) {
                    EventResourceDO eventResourceDO = new EventResourceDO();
                    eventResourceDO.setClassification(3);
                    eventResourceDO.setType(1);
                    eventResourceDO.setUrl(pica[i]);
                    eventResourceDO.setRefId(eventTransferRecordDO.getId());
                    eventResourceDO.setCreateBy(eventDealDTO.getUserId());
                    eventResourceDO.setCreateBy(commonEventDealDTO.getUserId());
                    int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if(picAdd!=1){
                        throw new ServiceException("添加图片失败");
@@ -545,8 +557,8 @@
    }

    @Override
    public R verifyEvent(EventVerifyDTO eventVerifyDTO) {
        EventDO eventDO = this.getBaseMapper().selectById(eventVerifyDTO.getId());
    public R verifyEvent(CommonEventVerifyDTO commonEventVerifyDTO) {
        EventDO eventDO = this.getBaseMapper().selectById(commonEventVerifyDTO.getId());
        boolean canVerifyByUser = eventDO.getEventProcessStatus()==3;
        if(!canVerifyByUser){
            return R.fail("当前不是待验证状态");
@@ -557,19 +569,19 @@
        }

        eventDO.setEventProcessStatus(2);//2已解决
        eventDO.setUpdateBy(eventVerifyDTO.getUserId());
        eventDO.setUpdateBy(commonEventVerifyDTO.getUserId());
        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated!=1){
            return R.fail("更新事件状态失败");
        }
        EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO();
        eventTransferRecordDO.setFromType(1);
        eventTransferRecordDO.setFromId(eventVerifyDTO.getUserId());
        eventTransferRecordDO.setFromName(eventVerifyDTO.getUserName());
        eventTransferRecordDO.setFromId(commonEventVerifyDTO.getUserId());
        eventTransferRecordDO.setFromName(commonEventVerifyDTO.getUserName());
        eventTransferRecordDO.setToType(1);
        eventTransferRecordDO.setToId(eventVerifyDTO.getUserId());
        eventTransferRecordDO.setToId(commonEventVerifyDTO.getUserId());
        eventTransferRecordDO.setProcessDate(new Date());
        eventTransferRecordDO.setToName(eventVerifyDTO.getUserName());
        eventTransferRecordDO.setToName(commonEventVerifyDTO.getUserName());
        eventTransferRecordDO.setEventId(eventDO.getId());
        int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO);
        if(inserted==1){
@@ -580,25 +592,59 @@
    }

    @Override
    public R republishEvent(EventRepublicDTO eventRepublicDTO) {
        EventDO eventDO = this.getBaseMapper().selectById(eventRepublicDTO.getId());
    public R republishEvent(CommonEventRepublicDTO commonEventRepublicDTO) {
        EventDO eventDO = this.getBaseMapper().selectById(commonEventRepublicDTO.getId());
        boolean canRepublishByUser = eventDO.getEventStatus()==4;
        if(!canRepublishByUser){
            return R.fail("当前不是撤销状态");
        }

        eventDO.setEventStatus(2);//2已解决
        eventDO.setUpdateBy(eventRepublicDTO.getUserId());
        eventDO.setUpdateBy(commonEventRepublicDTO.getUserId());
        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated!=1){
            return R.fail("更新事件状态失败");
        }
        EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO();
        eventTransferRecordDO.setFromType(1);
        eventTransferRecordDO.setFromId(eventRepublicDTO.getUserId());
        eventTransferRecordDO.setFromName(eventRepublicDTO.getUserName());
        eventTransferRecordDO.setFromId(commonEventRepublicDTO.getUserId());
        eventTransferRecordDO.setFromName(commonEventRepublicDTO.getUserName());
        eventTransferRecordDO.setToType(1);
        eventTransferRecordDO.setToId(eventRepublicDTO.getUserId());
        eventTransferRecordDO.setToId(commonEventRepublicDTO.getUserId());
        eventTransferRecordDO.setProcessDate(new Date());
        eventTransferRecordDO.setEventId(eventDO.getId());
        int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO);
        if(inserted==1){
            return R.ok();
        }else{
            throw new ServiceException("事件处理添加出错");
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R draftRelease(CommonEventPublicDTO commonEventPublicDTO) {
        EventDO eventDO = this.getBaseMapper().selectById(commonEventPublicDTO.getId());
        boolean draftCanRelease = eventDO.getEventStatus()==1;
        if(!draftCanRelease){
            return R.fail("当前不是草稿状态");
        }

        eventDO.setEventStatus(2);//事件状态 2发布
        eventDO.setProcessType(1);//当前处理对象类型:网格员处理
        eventDO.setCommunityProcess(0);//非 社区处理
        eventDO.setEventProcessStatus(1);//待处理
        eventDO.setUpdateBy(commonEventPublicDTO.getUserId());
        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated!=1){
            return R.fail("更新事件状态失败");
        }
        EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO();
        eventTransferRecordDO.setFromType(1);//来源类型 1、网格员
        eventTransferRecordDO.setFromId(commonEventPublicDTO.getUserId());
        eventTransferRecordDO.setFromName(commonEventPublicDTO.getUserName());
        eventTransferRecordDO.setToType(1);//转交类型 1、网格员
        eventTransferRecordDO.setToId(commonEventPublicDTO.getUserId());
        eventTransferRecordDO.setProcessDate(new Date());
        eventTransferRecordDO.setEventId(eventDO.getId());
        int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO);

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoMapper.xml

@@ -59,13 +59,13 @@
                AND handler_id = #{pageComActEasyPhotoDTO.handlerId}
            </if>
           <if test="pageComActEasyPhotoDTO.createAtBegin!=null">
                AND create_at >= #{pageComActEasyPhotoDTO.createAtBegin}
                AND create_at &gt;= #{pageComActEasyPhotoDTO.createAtBegin}
           </if>
           <if test="pageComActEasyPhotoDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageComActEasyPhotoDTO.createAtEnd}
           </if>
           <if test="pageComActEasyPhotoDTO.examineAtBegin!=null">
                AND examine_at >= #{pageComActEasyPhotoDTO.examineAtBegin}
                AND examine_at &gt;= #{pageComActEasyPhotoDTO.examineAtBegin}
           </if>
           <if test="pageComActEasyPhotoDTO.examineAtEnd!=null">
                AND examine_at &lt;= #{pageComActEasyPhotoDTO.examineAtEnd}
@@ -92,7 +92,7 @@
                AND is_need_feed_back = #{pageComActEasyPhotoDTO.isNeedFeedBack}
            </if>
           <if test="pageComActEasyPhotoDTO.feedbackAtBegin!=null">
                AND feedback_at >= #{pageComActEasyPhotoDTO.feedbackAtBegin}
                AND feedback_at &gt;= #{pageComActEasyPhotoDTO.feedbackAtBegin}
           </if>
           <if test="pageComActEasyPhotoDTO.feedbackAtEnd!=null">
                AND feedback_at &lt;= #{pageComActEasyPhotoDTO.feedbackAtEnd}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoTypeMapper.xml

@@ -29,7 +29,7 @@
                AND name = #{pageComActEasyPhotoTypeDTO.name}
            </if>
           <if test="pageComActEasyPhotoTypeDTO.createAtBegin!=null">
                AND create_at >= #{pageComActEasyPhotoTypeDTO.createAtBegin}
                AND create_at &gt;= #{pageComActEasyPhotoTypeDTO.createAtBegin}
           </if>
           <if test="pageComActEasyPhotoTypeDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageComActEasyPhotoTypeDTO.createAtEnd}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventApplicationAppReleaseMapper.xml

@@ -46,7 +46,7 @@
                AND url = #{pageEventApplicationAppReleaseDTO.url}
            </if>
           <if test="pageEventApplicationAppReleaseDTO.createAtBegin!=null">
                AND create_at >= #{pageEventApplicationAppReleaseDTO.createAtBegin}
                AND create_at &gt;= #{pageEventApplicationAppReleaseDTO.createAtBegin}
           </if>
           <if test="pageEventApplicationAppReleaseDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageEventApplicationAppReleaseDTO.createAtEnd}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventApplicationUserNoticeMapper.xml

@@ -42,7 +42,7 @@
                AND content = #{pageEventApplicationUserNoticeDTO.content}
            </if>
           <if test="pageEventApplicationUserNoticeDTO.createAtBegin!=null">
                AND create_at >= #{pageEventApplicationUserNoticeDTO.createAtBegin}
                AND create_at &gt;= #{pageEventApplicationUserNoticeDTO.createAtBegin}
           </if>
           <if test="pageEventApplicationUserNoticeDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageEventApplicationUserNoticeDTO.createAtEnd}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml

@@ -79,7 +79,7 @@
                AND create_by = #{pageEventGridDataDTO.createBy}
            </if>
           <if test="pageEventGridDataDTO.createAtBegin!=null">
                AND create_at >= #{pageEventGridDataDTO.createAtBegin}
                AND create_at &gt;= #{pageEventGridDataDTO.createAtBegin}
           </if>
           <if test="pageEventGridDataDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageEventGridDataDTO.createAtEnd}
@@ -88,7 +88,7 @@
                AND update_by = #{pageEventGridDataDTO.updateBy}
            </if>
           <if test="pageEventGridDataDTO.updateAtBegin!=null">
                AND update_at >= #{pageEventGridDataDTO.updateAtBegin}
                AND update_at &gt;= #{pageEventGridDataDTO.updateAtBegin}
           </if>
           <if test="pageEventGridDataDTO.updateAtEnd!=null">
                AND update_at &lt;= #{pageEventGridDataDTO.updateAtEnd}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberGpsLogMapper.xml

@@ -57,7 +57,7 @@
                AND create_by = #{pageEventGridMemberGpsLogDTO.createBy}
            </if>
           <if test="pageEventGridMemberGpsLogDTO.createAtBegin!=null">
                AND create_at >= #{pageEventGridMemberGpsLogDTO.createAtBegin}
                AND create_at &gt;= #{pageEventGridMemberGpsLogDTO.createAtBegin}
           </if>
           <if test="pageEventGridMemberGpsLogDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageEventGridMemberGpsLogDTO.createAtEnd}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberRelationMapper.xml

@@ -49,7 +49,7 @@
                AND create_by = #{pageEventGridMemberRelationDTO.createBy}
            </if>
           <if test="pageEventGridMemberRelationDTO.createAtBegin!=null">
                AND create_at >= #{pageEventGridMemberRelationDTO.createAtBegin}
                AND create_at &gt;= #{pageEventGridMemberRelationDTO.createAtBegin}
           </if>
           <if test="pageEventGridMemberRelationDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageEventGridMemberRelationDTO.createAtEnd}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberWarnLogMapper.xml

@@ -57,7 +57,7 @@
                AND create_by = #{pageEventGridMemberWarnLogDTO.createBy}
            </if>
           <if test="pageEventGridMemberWarnLogDTO.createAtBegin!=null">
                AND create_at >= #{pageEventGridMemberWarnLogDTO.createAtBegin}
                AND create_at &gt;= #{pageEventGridMemberWarnLogDTO.createAtBegin}
           </if>
           <if test="pageEventGridMemberWarnLogDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageEventGridMemberWarnLogDTO.createAtEnd}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMainMemberMapper.xml

@@ -107,7 +107,7 @@
                AND dell_user_name = #{pageEventMainMemberDTO.dellUserName}
            </if>
           <if test="pageEventMainMemberDTO.dellDateBegin!=null">
                AND dell_date >= #{pageEventMainMemberDTO.dellDateBegin}
                AND dell_date &gt;= #{pageEventMainMemberDTO.dellDateBegin}
           </if>
           <if test="pageEventMainMemberDTO.dellDateEnd!=null">
                AND dell_date &lt;= #{pageEventMainMemberDTO.dellDateEnd}
@@ -125,7 +125,7 @@
                AND urgent_dell = #{pageEventMainMemberDTO.urgentDell}
            </if>
           <if test="pageEventMainMemberDTO.submitDateBegin!=null">
                AND submit_date >= #{pageEventMainMemberDTO.submitDateBegin}
                AND submit_date &gt;= #{pageEventMainMemberDTO.submitDateBegin}
           </if>
           <if test="pageEventMainMemberDTO.submitDateEnd!=null">
                AND submit_date &lt;= #{pageEventMainMemberDTO.submitDateEnd}
@@ -137,7 +137,7 @@
                AND create_by = #{pageEventMainMemberDTO.createBy}
            </if>
           <if test="pageEventMainMemberDTO.createAtBegin!=null">
                AND create_at >= #{pageEventMainMemberDTO.createAtBegin}
                AND create_at &gt;= #{pageEventMainMemberDTO.createAtBegin}
           </if>
           <if test="pageEventMainMemberDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageEventMainMemberDTO.createAtEnd}
@@ -146,7 +146,7 @@
                AND update_by = #{pageEventMainMemberDTO.updateBy}
            </if>
           <if test="pageEventMainMemberDTO.updateAtBegin!=null">
                AND update_at >= #{pageEventMainMemberDTO.updateAtBegin}
                AND update_at &gt;= #{pageEventMainMemberDTO.updateAtBegin}
           </if>
           <if test="pageEventMainMemberDTO.updateAtEnd!=null">
                AND update_at &lt;= #{pageEventMainMemberDTO.updateAtEnd}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml

@@ -62,6 +62,31 @@
        SELECT <include refid="columns" />
        FROM event
        <where>
            <if test="pageEventDTO.eventDealStatus!=null">
            <choose>
                <!-- 待处理、待验证、已上报、已解决、草稿箱、已撤销 -->
                <when test="pageEventDTO.eventDealStatus==1">   <!--待处理-->
                    AND event_status = 1 AND community_process = 0
                </when>
                <when test="pageEventDTO.eventDealStatus==2">   <!--待验证-->
                    AND event_process_status = 3
                </when>
                <when test="pageEventDTO.eventDealStatus==3">   <!--已上报-->
                    AND event_status = 1 AND community_process = 1
                </when>
                <when test="pageEventDTO.eventDealStatus==4">   <!--已解决-->
                    AND event_process_status = 2
                </when>
                <when test="pageEventDTO.eventDealStatus==5">   <!--草稿箱-->
                    AND event_status = 1
                </when>
                <when test="pageEventDTO.eventDealStatus==6">   <!--已撤销-->
                    AND event_status = 4
                </when>
                <otherwise>
                </otherwise>
            </choose>
            </if>
           <if test="pageEventDTO.id!=null">
                AND id = #{pageEventDTO.id}
            </if>
@@ -96,10 +121,10 @@
                AND propaganda_type = #{pageEventDTO.propagandaType}
            </if>
           <if test="pageEventDTO.propagandaTimeBegin!=null">
                AND propaganda_time >= #{pageEventDTO.propagandaTimeBegin}
                AND propaganda_time <![CDATA[>=]]> #{pageEventDTO.propagandaTimeBegin}
           </if>
           <if test="pageEventDTO.propagandaTimeEnd!=null">
                AND propaganda_time &lt;= #{pageEventDTO.propagandaTimeEnd}
                AND propaganda_time <![CDATA[<=]]> #{pageEventDTO.propagandaTimeEnd}
           </if>
           <if test="pageEventDTO.eventType!=null">
                AND event_type = #{pageEventDTO.eventType}
@@ -117,10 +142,10 @@
                AND community_process = #{pageEventDTO.communityProcess}
            </if>
           <if test="pageEventDTO.happenTimeBegin!=null">
                AND happen_time >= #{pageEventDTO.happenTimeBegin}
                AND happen_time <![CDATA[>=]]> #{pageEventDTO.happenTimeBegin}
           </if>
           <if test="pageEventDTO.happenTimeEnd!=null">
                AND happen_time &lt;= #{pageEventDTO.happenTimeEnd}
                AND happen_time <![CDATA[<=]]> #{pageEventDTO.happenTimeEnd}
           </if>
           <if test="pageEventDTO.happentAddress!=null">
                AND happent_address = #{pageEventDTO.happentAddress}
@@ -144,10 +169,10 @@
                AND process_user_name = #{pageEventDTO.processUserName}
            </if>
           <if test="pageEventDTO.processDateBegin!=null">
                AND process_date >= #{pageEventDTO.processDateBegin}
                AND process_date <![CDATA[>=]]> #{pageEventDTO.processDateBegin}
           </if>
           <if test="pageEventDTO.processDateEnd!=null">
                AND process_date &lt;= #{pageEventDTO.processDateEnd}
                AND process_date <![CDATA[<=]]> #{pageEventDTO.processDateEnd}
           </if>
           <if test="pageEventDTO.processDesc!=null">
                AND process_desc = #{pageEventDTO.processDesc}
@@ -186,28 +211,28 @@
                AND urgent_dell = #{pageEventDTO.urgentDell}
            </if>
           <if test="pageEventDTO.submitDateBegin!=null">
                AND submit_date >= #{pageEventDTO.submitDateBegin}
                AND submit_date <![CDATA[>=]]> #{pageEventDTO.submitDateBegin}
           </if>
           <if test="pageEventDTO.submitDateEnd!=null">
                AND submit_date &lt;= #{pageEventDTO.submitDateEnd}
                AND submit_date <![CDATA[<=]]> #{pageEventDTO.submitDateEnd}
           </if>
           <if test="pageEventDTO.createBy!=null">
                AND create_by = #{pageEventDTO.createBy}
            </if>
           <if test="pageEventDTO.createAtBegin!=null">
                AND create_at >= #{pageEventDTO.createAtBegin}
                AND create_at  <![CDATA[>=]]> #{pageEventDTO.createAtBegin}
           </if>
           <if test="pageEventDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageEventDTO.createAtEnd}
                AND create_at <![CDATA[<=]]> #{pageEventDTO.createAtEnd}
           </if>
           <if test="pageEventDTO.updateBy!=null">
                AND update_by = #{pageEventDTO.updateBy}
            </if>
           <if test="pageEventDTO.updateAtBegin!=null">
                AND update_at >= #{pageEventDTO.updateAtBegin}
                AND update_at <![CDATA[>=]]> #{pageEventDTO.updateAtBegin}
           </if>
           <if test="pageEventDTO.updateAtEnd!=null">
                AND update_at &lt;= #{pageEventDTO.updateAtEnd}
                AND update_at <![CDATA[<=]]> #{pageEventDTO.updateAtEnd}
           </if>
        </where>
        <if test="pageEventDTO.sortColumns!=null">

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventResourceMapper.xml

@@ -53,7 +53,7 @@
                AND create_by = #{pageEventResourceDTO.createBy}
            </if>
           <if test="pageEventResourceDTO.createAtBegin!=null">
                AND create_at >= #{pageEventResourceDTO.createAtBegin}
                AND create_at &gt;= #{pageEventResourceDTO.createAtBegin}
           </if>
           <if test="pageEventResourceDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageEventResourceDTO.createAtEnd}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventTransferRecordMapper.xml

@@ -58,13 +58,13 @@
                AND process_result = #{pageEventTransferRecordDTO.processResult}
            </if>
           <if test="pageEventTransferRecordDTO.processDateBegin!=null">
                AND process_date >= #{pageEventTransferRecordDTO.processDateBegin}
                AND process_date &gt;= #{pageEventTransferRecordDTO.processDateBegin}
           </if>
           <if test="pageEventTransferRecordDTO.processDateEnd!=null">
                AND process_date &lt;= #{pageEventTransferRecordDTO.processDateEnd}
           </if>
           <if test="pageEventTransferRecordDTO.createAtBegin!=null">
                AND create_at >= #{pageEventTransferRecordDTO.createAtBegin}
                AND create_at &gt;= #{pageEventTransferRecordDTO.createAtBegin}
           </if>
           <if test="pageEventTransferRecordDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageEventTransferRecordDTO.createAtEnd}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventVisitingTasksMapper.xml

@@ -104,7 +104,7 @@
                AND act_opara = #{pageEventVisitingTasksDTO.actOpara}
            </if>
           <if test="pageEventVisitingTasksDTO.happenTimeBegin!=null">
                AND happen_time >= #{pageEventVisitingTasksDTO.happenTimeBegin}
                AND happen_time &gt;= #{pageEventVisitingTasksDTO.happenTimeBegin}
           </if>
           <if test="pageEventVisitingTasksDTO.happenTimeEnd!=null">
                AND happen_time &lt;= #{pageEventVisitingTasksDTO.happenTimeEnd}
@@ -131,7 +131,7 @@
                AND dell_user_name = #{pageEventVisitingTasksDTO.dellUserName}
            </if>
           <if test="pageEventVisitingTasksDTO.dellDateBegin!=null">
                AND dell_date >= #{pageEventVisitingTasksDTO.dellDateBegin}
                AND dell_date &gt;= #{pageEventVisitingTasksDTO.dellDateBegin}
           </if>
           <if test="pageEventVisitingTasksDTO.dellDateEnd!=null">
                AND dell_date &lt;= #{pageEventVisitingTasksDTO.dellDateEnd}
@@ -149,7 +149,7 @@
                AND urgent_dell = #{pageEventVisitingTasksDTO.urgentDell}
            </if>
           <if test="pageEventVisitingTasksDTO.submitDateBegin!=null">
                AND submit_date >= #{pageEventVisitingTasksDTO.submitDateBegin}
                AND submit_date &gt;= #{pageEventVisitingTasksDTO.submitDateBegin}
           </if>
           <if test="pageEventVisitingTasksDTO.submitDateEnd!=null">
                AND submit_date &lt;= #{pageEventVisitingTasksDTO.submitDateEnd}
@@ -164,7 +164,7 @@
                AND create_by = #{pageEventVisitingTasksDTO.createBy}
            </if>
           <if test="pageEventVisitingTasksDTO.createAtBegin!=null">
                AND create_at >= #{pageEventVisitingTasksDTO.createAtBegin}
                AND create_at &gt;= #{pageEventVisitingTasksDTO.createAtBegin}
           </if>
           <if test="pageEventVisitingTasksDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageEventVisitingTasksDTO.createAtEnd}
@@ -173,7 +173,7 @@
                AND update_by = #{pageEventVisitingTasksDTO.updateBy}
            </if>
           <if test="pageEventVisitingTasksDTO.updateAtBegin!=null">
                AND update_at >= #{pageEventVisitingTasksDTO.updateAtBegin}
                AND update_at &gt;= #{pageEventVisitingTasksDTO.updateAtBegin}
           </if>
           <if test="pageEventVisitingTasksDTO.updateAtEnd!=null">
                AND update_at &lt;= #{pageEventVisitingTasksDTO.updateAtEnd}