Merge branch 'test_future_wangge' into test

CeDo

2021-05-31 ebea64fcbd2b7881863755ec38e5cf37cdb60658

Merge branch 'test_future_wangge' into test

 .gitignore

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


.idea

 .idea/modules.xml

File was deleted

 .idea/workspace.xml

File was deleted

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java

@@ -143,4 +143,32 @@
        return R.ok(loginReturnVO);
    }


    /**
     * 网格综治APP登录
     *
     * @param account  账户
     * @param password 密码
     * @return 登录结果
     */
    @PostMapping("/loginGridApp")
    public R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginGridApp(account, password);
        return R.ok(loginReturnVO);
    }


    /**
     * 网格综治后台登录
     *
     * @param account  账户
     * @param password 密码
     * @return 登录结果
     */
    @PostMapping("/loginGridBackstage")
    public R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginGridBackstage(account, password);
        return R.ok(loginReturnVO);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java

@@ -56,4 +56,20 @@
     * @date 2021-5-13 10:56
     */
    LoginReturnVO loginBigDataBackStage(String account, String password);

    /**
     * 网格综治APP登录
     * @param account 账户
     * @param password 密码
     * @return 登录结果
     */
    LoginReturnVO loginGridApp(String account, String password);

    /**
     * 网格综治后台登录
     * @param account 账户
     * @param password 密码
     * @return 登录结果
     */
    LoginReturnVO loginGridBackstage(String account, String password);
}

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java

@@ -147,4 +147,45 @@
        return loginReturnVO;
    }

    /**
     * 商家后台登录
     *
     * @param account  账户
     * @param password 密码
     * @return 登录结果
     */
    @Override
    public LoginReturnVO loginGridApp(String account, String password) {
        Authentication authentication = null;
        authentication = authenticationManager
                .authenticate(new UsernamePasswordAuthenticationToken(account+"_6", password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO) authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
        LoginReturnVO loginReturnVO=new LoginReturnVO();
        loginReturnVO.setToken(token);
        loginReturnVO.setRefreshToken(refeshToken);
        return loginReturnVO;
    }

    /**
     * 商家后台登录
     *
     * @param account  账户
     * @param password 密码
     * @return 登录结果
     */
    @Override
    public LoginReturnVO loginGridBackstage(String account, String password) {
        Authentication authentication = null;
        authentication = authenticationManager
                .authenticate(new UsernamePasswordAuthenticationToken(account+"_7", password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO) authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
        LoginReturnVO loginReturnVO=new LoginReturnVO();
        loginReturnVO.setToken(token);
        loginReturnVO.setRefreshToken(refeshToken);
        return loginReturnVO;
    }
}

 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/ComActEasyPhotoAddDTO.java

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

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

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonFormat;



/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("创建社区活动 》随手拍请求参数")
public class ComActEasyPhotoAddDTO {

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "发起人id", hidden = false, example = "1")
    private Long sponsorId;

    @NotBlank() @Length(max=100)
    @ApiModelProperty(value = "发生地址", hidden = false, example = "")
    private String happenAddr;

    @NotBlank() @Length(max=100)
    @ApiModelProperty(value = "地址备注", hidden = false, example = "")
    private String addrRemark;

    @NotNull() @Max(127)
    @ApiModelProperty(value = "状态 1待处理 2已处理", hidden = false, example = "1")
    private Integer status;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "处理人id", hidden = false, example = "1")
    private Long handlerId;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "审核时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date examineAt;

    @Length(max=65535)
    @ApiModelProperty(value = "详情", hidden = false, example = "")
    private String detail;

    @Length(max=65535)
    @ApiModelProperty(value = "图片路径列表，逗号分隔", hidden = false, example = "")
    private String photoPathList;

    @Length(max=65535)
    @ApiModelProperty(value = "处理结果", hidden = false, example = "")
    private String handleResult;

    @Length(max=65535)
    @ApiModelProperty(value = "处理结果，图片路径列表，逗号分隔", hidden = false, example = "")
    private String handlePhotoList;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "社区id", hidden = false, example = "1")
    private Long communityId;

    @Max(127)
    @ApiModelProperty(value = "是否匿名发布 0 否 1 是", hidden = false, example = "1")
    private Integer isHide;

    @Max(127)
    @ApiModelProperty(value = "是否需要反馈 0 不需要 1 需要", hidden = false, example = "1")
    private Integer isNeedFeedBack;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "反馈时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date feedbackAt;

    @Length(max=500)
    @ApiModelProperty(value = "驳回原因", hidden = false, example = "")
    private String rejectReason;

    @Length(max=65535)
    @ApiModelProperty(value = "封面图片", hidden = false, example = "")
    private String cover;

    @Max(127)
    @ApiModelProperty(value = "是否删除 0 否 1 是", hidden = false, example = "1")
    private Integer delTag;

    @Max(127)
    @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)", hidden = false, example = "1")
    private Integer isReport;

    @Max(127)
    @ApiModelProperty(value = "是否公示(0.否 1.是)", hidden = false, example = "1")
    private Integer isPublicity;


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

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoDeleteDTO.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 ComActEasyPhotoDeleteDTO {

    @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/ComActEasyPhotoEditDTO.java

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

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

import org.hibernate.validator.constraints.Length;

import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;

/**
 * 编辑表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("编辑社区活动 》随手拍请求参数")
public class ComActEasyPhotoEditDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "自增id", hidden = false, example = "1")
    private Long id;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "发起人id", hidden = false, example = "1")
    private Long sponsorId;

    @NotBlank() @Length(max=100)
    @ApiModelProperty(value = "发生地址", hidden = false, example = "")
    private String happenAddr;

    @NotBlank() @Length(max=100)
    @ApiModelProperty(value = "地址备注", hidden = false, example = "")
    private String addrRemark;

    @NotNull() @Max(127)
    @ApiModelProperty(value = "状态 1待处理 2已处理", hidden = false, example = "1")
    private Integer status;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "处理人id", hidden = false, example = "1")
    private Long handlerId;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "审核时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date examineAt;

    @Length(max=65535)
    @ApiModelProperty(value = "详情", hidden = false, example = "")
    private String detail;

    @Length(max=65535)
    @ApiModelProperty(value = "图片路径列表，逗号分隔", hidden = false, example = "")
    private String photoPathList;

    @Length(max=65535)
    @ApiModelProperty(value = "处理结果", hidden = false, example = "")
    private String handleResult;

    @Length(max=65535)
    @ApiModelProperty(value = "处理结果，图片路径列表，逗号分隔", hidden = false, example = "")
    private String handlePhotoList;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "社区id", hidden = false, example = "1")
    private Long communityId;

    @Max(127)
    @ApiModelProperty(value = "是否匿名发布 0 否 1 是", hidden = false, example = "1")
    private Integer isHide;

    @Max(127)
    @ApiModelProperty(value = "是否需要反馈 0 不需要 1 需要", hidden = false, example = "1")
    private Integer isNeedFeedBack;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "反馈时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date feedbackAt;

    @Length(max=500)
    @ApiModelProperty(value = "驳回原因", hidden = false, example = "")
    private String rejectReason;

    @Length(max=65535)
    @ApiModelProperty(value = "封面图片", hidden = false, example = "")
    private String cover;

    @Max(127)
    @ApiModelProperty(value = "是否删除 0 否 1 是", hidden = false, example = "1")
    private Integer delTag;

    @Max(127)
    @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)", hidden = false, example = "1")
    private Integer isReport;

    @Max(127)
    @ApiModelProperty(value = "是否公示(0.否 1.是)", hidden = false, example = "1")
    private Integer isPublicity;


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

}

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

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

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 java.util.List;

/**
 * 随手拍处理请求参数
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("随手拍处理请求参数")
public class ComActEasyPhotoHandleDTO {

    @ApiModelProperty(value = "随手拍id")
    private Long id;

    @Length(max=65535)
    @ApiModelProperty(value = "处理结果", hidden = false, example = "")
    private String handleResult;

    @Length(max=65535)
    @ApiModelProperty(value = "处理结果，图片路径列表，逗号分隔", hidden = false, example = "")
    private String handlePhotoList;

    @Max(127)
    @ApiModelProperty(value = "是否公示(0.否 1.是)", hidden = false, example = "1")
    private Integer isPublicity;

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

    @ApiModelProperty(value = "随手拍类型id集合")
    private List<Long> easyTypeIds;

}

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

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

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

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonFormat;



/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("创建随手拍类型请求参数")
public class ComActEasyPhotoTypeAddDTO {

    @Length(max=50)
    @ApiModelProperty(value = "随手拍类型名称", hidden = false, example = "")
    private String name;


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

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeDeleteDTO.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 ComActEasyPhotoTypeDeleteDTO {

    @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/ComActEasyPhotoTypeEditDTO.java

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

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

import org.hibernate.validator.constraints.Length;

import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;

/**
 * 编辑表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("编辑随手拍类型请求参数")
public class ComActEasyPhotoTypeEditDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "主键id", hidden = false, example = "1")
    private Long id;

    @Length(max=50)
    @ApiModelProperty(value = "随手拍类型名称", hidden = false, example = "")
    private String name;


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

}

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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

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


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

    @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(message = "发生时间不能为空")
    private Date happenTime;

    @Length(max=255)
    @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "41.40338,2.17403", required = true)
    @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(message = "发生区域-网格ID不能为空")
    private Long gridId;

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

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

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

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

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

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

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

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

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

    @ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
            example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
    private String pics;

    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;
    @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
    private String userName;
    @ApiModelProperty(value = "(当前操作)用户电话", hidden = true, example = "18888888888")
    @Length(max = 11)
    private String phone;

}

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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

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


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

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

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

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

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

    @ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
            example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
    private String pics;

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

    @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
    private String userName;
}

 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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

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


/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@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")
    private Long id;

    @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(message = "发生时间不能为空")
    private Date happenTime;

    @Length(max=255)
    @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "41.40338,2.17403", required = true)
    @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(message = "发生区域-网格ID不能为空")
    private Long gridId;

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

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

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

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

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

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

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

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

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

    @ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
            example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
    private String pics;

    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;
    @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
    private String userName;
    @ApiModelProperty(value = "(当前操作)用户电话", hidden = true, example = "18888888888")
    @Length(max = 11)
    private String phone;

}

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

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

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

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;


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

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

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

    @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
    private String userName;
}

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

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

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;

/**
 * 上报社区表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("上报社区请求参数")
public class CommonEventReportDTO {

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

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

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

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

    @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
    private String userName;

}

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

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

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;


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

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

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

    @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
    private String userName;
}

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

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

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import org.hibernate.validator.constraints.URL;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;


/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("突发事件处理请求参数")
public class CommonEventVerifyDTO {

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

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

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

    @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
    private String userName;
}

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

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

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

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonFormat;



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

    @Length(max=20)
    @ApiModelProperty(value = "服务单号", hidden = false, example = "")
    private String orderSn;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "1、办件事件2是宣传事件3是阅读事件", hidden = false, example = "1")
    private Long eventCategory;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员所处的街道", hidden = false, example = "1")
    private Long gridMemberStreet;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员所处社区", hidden = false, example = "1")
    private Long gridMemberCommunity;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
    private Long gridId;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员", hidden = false, example = "1")
    private Long gridMemberId;

    @Length(max=100)
    @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
    private String gridMemberName;

    @Length(max=20)
    @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
    private String gridMemberTelephone;

    @Length(max=255)
    @ApiModelProperty(value = "事件标题", hidden = false, example = "")
    private String eventTitle;

    @Length(max=255)
    @ApiModelProperty(value = "宣传类型", hidden = false, example = "1")
    private String propagandaType;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "宣传时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date propagandaTime;

    @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 = "邻里纠纷,土地承包租赁", required = true)
    @NotNull
    private String eventClazz;

    @Length(max=255)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "")
    private String eventDes;

    @Length(max=50)
    @ApiModelProperty(value = "宣传对象", hidden = false, example = "")
    private String propagandaObject;

    @Length(max=10)
    @ApiModelProperty(value = "宣传人数", hidden = false, example = "")
    private String propagandaNum;

    @Max(127)
    @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)", hidden = false, example = "1")
    private Integer communityProcess;

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

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

    @Length(max=255)
    @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "")
    private String happentLatLng;

    @Max(127)
    @ApiModelProperty(value = "事件状态（1草稿箱2发布3逻辑删除4、撤销）", hidden = false, example = "1")
    private Integer eventStatus;

    @Max(127)
    @ApiModelProperty(value = "1待处理2已解决3待验证", hidden = false, example = "1")
    private Integer eventProcessStatus;

    @Max(127)
    @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
    private Integer processType;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "处理人ID", hidden = false, example = "1")
    private Long processUserId;

    @Length(max=100)
    @ApiModelProperty(value = "处理人名称", hidden = false, example = "")
    private String processUserName;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "处理时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date processDate;

    @Length(max=255)
    @ApiModelProperty(value = "解决人针对解决事件的处理描述", hidden = false, example = "")
    private String processDesc;

    @Length(max=255)
    @ApiModelProperty(value = "事件来源", hidden = false, example = "")
    private String eventResource;

    @Max(127)
    @ApiModelProperty(value = "危险级别", hidden = false, example = "1")
    private Integer dangerLevel;

    
    @ApiModelProperty(value = "红牌", hidden = false, example = "true")
    private Boolean redCard;

    
    @ApiModelProperty(value = "黄牌", hidden = false, example = "true")
    private Boolean yellowCard;

    
    @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
    private Boolean invalid;

    
    @ApiModelProperty(value = "是否重大", hidden = false, example = "true")
    private Boolean major;

    @Max(9999999999L)
    @ApiModelProperty(value = "死亡人数", hidden = false, example = "1")
    private Integer deathsNumber;

    @Max(9999999999L)
    @ApiModelProperty(value = "受伤人数", hidden = false, example = "1")
    private Integer injuriesNumber;

    
    @ApiModelProperty(value = "是否疑难事件", hidden = false, example = "true")
    private Boolean difficult;

    
    @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
    private Boolean urgent;

    
    @ApiModelProperty(value = "是否催办", hidden = false, example = "true")
    private Boolean urgentDell;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "上报提交时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date submitDate;


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

}

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

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

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

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonFormat;



/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("创建APP应用版本信息请求参数")
public class EventApplicationAppReleaseAddDTO {

    @Max(32767)
    @ApiModelProperty(value = "应用ID", hidden = false, example = "1")
    private Integer productId;

    @Length(max=50)
    @ApiModelProperty(value = "应用名称", hidden = false, example = "")
    private String productName;

    @Length(max=255)
    @ApiModelProperty(value = "版本编号", hidden = false, example = "")
    private String releaseNumber;

    @Max(32767)
    @ApiModelProperty(value = "通知行为(1、强制更新2、提示更新)", hidden = false, example = "1")
    private Integer action;

    @Length(max=255)
    @ApiModelProperty(value = "版本地址", hidden = false, example = "")
    private String url;


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

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationAppReleaseDeleteDTO.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("删除APP应用版本信息请求参数")
public class EventApplicationAppReleaseDeleteDTO {

    @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/EventApplicationAppReleaseEditDTO.java

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

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

import org.hibernate.validator.constraints.Length;

import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;

/**
 * 编辑表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("编辑APP应用版本信息请求参数")
public class EventApplicationAppReleaseEditDTO {

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

    @Max(32767)
    @ApiModelProperty(value = "应用ID", hidden = false, example = "1")
    private Integer productId;

    @Length(max=50)
    @ApiModelProperty(value = "应用名称", hidden = false, example = "")
    private String productName;

    @Length(max=255)
    @ApiModelProperty(value = "版本编号", hidden = false, example = "")
    private String releaseNumber;

    @Max(32767)
    @ApiModelProperty(value = "通知行为(1、强制更新2、提示更新)", hidden = false, example = "1")
    private Integer action;

    @Length(max=255)
    @ApiModelProperty(value = "版本地址", hidden = false, example = "")
    private String url;


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

}

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

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

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

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonFormat;



/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("创建用户协议和隐私政策信息请求参数")
public class EventApplicationUserNoticeAddDTO {

    @Max(32767)
    @ApiModelProperty(value = "应用ID", hidden = false, example = "1")
    private Integer productId;

    @Length(max=50)
    @ApiModelProperty(value = "应用名称", hidden = false, example = "")
    private String productName;

    @Max(32767)
    @ApiModelProperty(value = "通知行为(1、强制通知必须手段确定2、提示更新，自动消退)", hidden = false, example = "1")
    private Integer action;

    @Length(max=1000)
    @ApiModelProperty(value = "内容", hidden = false, example = "")
    private String content;


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

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationUserNoticeDeleteDTO.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 EventApplicationUserNoticeDeleteDTO {

    @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/EventApplicationUserNoticeEditDTO.java

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

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

import org.hibernate.validator.constraints.Length;

import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;

/**
 * 编辑表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("编辑用户协议和隐私政策信息请求参数")
public class EventApplicationUserNoticeEditDTO {

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

    @Max(32767)
    @ApiModelProperty(value = "应用ID", hidden = false, example = "1")
    private Integer productId;

    @Length(max=50)
    @ApiModelProperty(value = "应用名称", hidden = false, example = "")
    private String productName;

    @Max(32767)
    @ApiModelProperty(value = "通知行为(1、强制通知必须手段确定2、提示更新，自动消退)", hidden = false, example = "1")
    private Integer action;

    @Length(max=1000)
    @ApiModelProperty(value = "内容", hidden = false, example = "")
    private String content;


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

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventDeleteDTO.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-28
 * */
@Data
@ApiModel("删除事件请求参数")
public class EventDeleteDTO {

    @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/EventEditDTO.java

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

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

import org.hibernate.validator.constraints.Length;

import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;

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

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

    @Length(max=20)
    @ApiModelProperty(value = "服务单号", hidden = false, example = "")
    private String orderSn;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "1、办件事件2是宣传事件3是阅读事件", hidden = false, example = "1")
    private Long eventCategory;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员所处的街道", hidden = false, example = "1")
    private Long gridMemberStreet;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员所处社区", hidden = false, example = "1")
    private Long gridMemberCommunity;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
    private Long gridId;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员", hidden = false, example = "1")
    private Long gridMemberId;

    @Length(max=100)
    @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
    private String gridMemberName;

    @Length(max=20)
    @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
    private String gridMemberTelephone;

    @Length(max=255)
    @ApiModelProperty(value = "事件标题", hidden = false, example = "")
    private String eventTitle;

    @Length(max=255)
    @ApiModelProperty(value = "宣传类型", hidden = false, example = "1")
    private String propagandaType;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "宣传时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date propagandaTime;

    @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 = "")
    private String eventDes;

    @Length(max=50)
    @ApiModelProperty(value = "宣传对象", hidden = false, example = "")
    private String propagandaObject;

    @Length(max=10)
    @ApiModelProperty(value = "宣传人数", hidden = false, example = "")
    private String propagandaNum;

    @Max(127)
    @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)", hidden = false, example = "1")
    private Integer communityProcess;

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

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

    @Length(max=255)
    @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "")
    private String happentLatLng;

    @Max(127)
    @ApiModelProperty(value = "事件状态（1草稿箱2发布3逻辑删除4、撤销）", hidden = false, example = "1")
    private Integer eventStatus;

    @Max(127)
    @ApiModelProperty(value = "1待处理2已解决3待验证", hidden = false, example = "1")
    private Integer eventProcessStatus;

    @Max(127)
    @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
    private Integer processType;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "处理人ID", hidden = false, example = "1")
    private Long processUserId;

    @Length(max=100)
    @ApiModelProperty(value = "处理人名称", hidden = false, example = "")
    private String processUserName;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "处理时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date processDate;

    @Length(max=255)
    @ApiModelProperty(value = "解决人针对解决事件的处理描述", hidden = false, example = "")
    private String processDesc;

    @Length(max=255)
    @ApiModelProperty(value = "事件来源", hidden = false, example = "")
    private String eventResource;

    @Max(127)
    @ApiModelProperty(value = "危险级别", hidden = false, example = "1")
    private Integer dangerLevel;

    
    @ApiModelProperty(value = "红牌", hidden = false, example = "true")
    private Boolean redCard;

    
    @ApiModelProperty(value = "黄牌", hidden = false, example = "true")
    private Boolean yellowCard;

    
    @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
    private Boolean invalid;

    
    @ApiModelProperty(value = "是否重大", hidden = false, example = "true")
    private Boolean major;

    @Max(9999999999L)
    @ApiModelProperty(value = "死亡人数", hidden = false, example = "1")
    private Integer deathsNumber;

    @Max(9999999999L)
    @ApiModelProperty(value = "受伤人数", hidden = false, example = "1")
    private Integer injuriesNumber;

    
    @ApiModelProperty(value = "是否疑难事件", hidden = false, example = "true")
    private Boolean difficult;

    
    @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
    private Boolean urgent;

    
    @ApiModelProperty(value = "是否催办", hidden = false, example = "true")
    private Boolean urgentDell;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "上报提交时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date submitDate;


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

}

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

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

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

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonFormat;



/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("创建区县/街道/社区/网格员网格数据管理请求参数")
public class EventGridDataAddDTO {

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "类型，1、区县网格2街道网格3社区网格", hidden = false, example = "1")
    private Long type;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "区/县ID", hidden = false, example = "1")
    private Long zoneId;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
    private Long gridStreetId;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
    private Long gridCommunityId;

    @NotBlank() @Length(max=100)
    @ApiModelProperty(value = "网格名称", hidden = false, example = "")
    private String gridName;

    @Max(32767)
    @ApiModelProperty(value = "所属图层", hidden = false, example = "1")
    private Integer mapLevel;

    @Length(max=100)
    @ApiModelProperty(value = "面积", hidden = false, example = "")
    private String area;

    @Length(max=100)
    @ApiModelProperty(value = "线条颜色", hidden = false, example = "")
    private String lineColor;

    @Length(max=100)
    @ApiModelProperty(value = "线条宽度", hidden = false, example = "")
    private String lineBroadband;

    @Length(max=100)
    @ApiModelProperty(value = "填充颜色", hidden = false, example = "")
    private String fillColor;

    @Length(max=255)
    @ApiModelProperty(value = "备注", hidden = false, example = "")
    private String remarks;

    @Length(max=2147483647)
    @ApiModelProperty(value = "围栏数据", hidden = false, example = "")
    private String data;


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

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataDeleteDTO.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 EventGridDataDeleteDTO {

    @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/EventGridDataEditDTO.java

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

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

import org.hibernate.validator.constraints.Length;

import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;

/**
 * 编辑表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("编辑区县/街道/社区/网格员网格数据管理请求参数")
public class EventGridDataEditDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "主键ID", hidden = false, example = "1")
    private Long id;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "类型，1、区县网格2街道网格3社区网格", hidden = false, example = "1")
    private Long type;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "区/县ID", hidden = false, example = "1")
    private Long zoneId;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
    private Long gridStreetId;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
    private Long gridCommunityId;

    @NotBlank() @Length(max=100)
    @ApiModelProperty(value = "网格名称", hidden = false, example = "")
    private String gridName;

    @Max(32767)
    @ApiModelProperty(value = "所属图层", hidden = false, example = "1")
    private Integer mapLevel;

    @Length(max=100)
    @ApiModelProperty(value = "面积", hidden = false, example = "")
    private String area;

    @Length(max=100)
    @ApiModelProperty(value = "线条颜色", hidden = false, example = "")
    private String lineColor;

    @Length(max=100)
    @ApiModelProperty(value = "线条宽度", hidden = false, example = "")
    private String lineBroadband;

    @Length(max=100)
    @ApiModelProperty(value = "填充颜色", hidden = false, example = "")
    private String fillColor;

    @Length(max=255)
    @ApiModelProperty(value = "备注", hidden = false, example = "")
    private String remarks;

    @Length(max=2147483647)
    @ApiModelProperty(value = "围栏数据", hidden = false, example = "")
    private String data;


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

}

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

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

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

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonFormat;



/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("创建网格员定时上报地理信息请求参数")
public class EventGridMemberGpsLogAddDTO {

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
    private Long gridStreetId;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
    private Long gridCommunityId;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
    private Long gridId;

    @NotBlank() @Length(max=100)
    @ApiModelProperty(value = "网格名称", hidden = false, example = "")
    private String gridName;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员ID", hidden = false, example = "1")
    private Long gridMemberId;

    @Length(max=255)
    @ApiModelProperty(value = "精度维度信息，逗号分割", hidden = false, example = "")
    private String lngLat;

    @Max(127)
    @ApiModelProperty(value = "位置信息状态（1、为判定2、正常3、是不正常）", hidden = false, example = "1")
    private Integer positionStation;


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

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberGpsLogDeleteDTO.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 EventGridMemberGpsLogDeleteDTO {

    @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/EventGridMemberGpsLogEditDTO.java

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

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

import org.hibernate.validator.constraints.Length;

import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;

/**
 * 编辑表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("编辑网格员定时上报地理信息请求参数")
public class EventGridMemberGpsLogEditDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "主键ID", hidden = false, example = "1")
    private Long id;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
    private Long gridStreetId;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
    private Long gridCommunityId;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
    private Long gridId;

    @NotBlank() @Length(max=100)
    @ApiModelProperty(value = "网格名称", hidden = false, example = "")
    private String gridName;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员ID", hidden = false, example = "1")
    private Long gridMemberId;

    @Length(max=255)
    @ApiModelProperty(value = "精度维度信息，逗号分割", hidden = false, example = "")
    private String lngLat;

    @Max(127)
    @ApiModelProperty(value = "位置信息状态（1、为判定2、正常3、是不正常）", hidden = false, example = "1")
    private Integer positionStation;


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

}

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

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

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

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonFormat;



/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("创建网格和网格员的关联关系请求参数")
public class EventGridMemberRelationAddDTO {

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
    private Long gridStreetId;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
    private Long gridCommunityId;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
    private Long gridId;

    @NotBlank() @Length(max=100)
    @ApiModelProperty(value = "网格名称", hidden = false, example = "")
    private String gridName;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员ID", hidden = false, example = "1")
    private Long gridMemberId;


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

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberRelationDeleteDTO.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 EventGridMemberRelationDeleteDTO {

    @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/EventGridMemberRelationEditDTO.java

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

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

import org.hibernate.validator.constraints.Length;

import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;

/**
 * 编辑表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("编辑网格和网格员的关联关系请求参数")
public class EventGridMemberRelationEditDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "主键ID", hidden = false, example = "1")
    private Long id;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
    private Long gridStreetId;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
    private Long gridCommunityId;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
    private Long gridId;

    @NotBlank() @Length(max=100)
    @ApiModelProperty(value = "网格名称", hidden = false, example = "")
    private String gridName;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员ID", hidden = false, example = "1")
    private Long gridMemberId;


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

}

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

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

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

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonFormat;



/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("创建网格员定时上报地理预警记录请求参数")
public class EventGridMemberWarnLogAddDTO {

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
    private Long gridStreetId;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
    private Long gridCommunityId;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
    private Long gridId;

    @NotBlank() @Length(max=100)
    @ApiModelProperty(value = "网格名称", hidden = false, example = "")
    private String gridName;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员ID", hidden = false, example = "1")
    private Long gridMemberId;

    @Length(max=255)
    @ApiModelProperty(value = "精度维度信息，逗号分割", hidden = false, example = "")
    private String lngLat;

    @Length(max=50)
    @ApiModelProperty(value = "预警信息内容", hidden = false, example = "")
    private String content;


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

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberWarnLogDeleteDTO.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 EventGridMemberWarnLogDeleteDTO {

    @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/EventGridMemberWarnLogEditDTO.java

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

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

import org.hibernate.validator.constraints.Length;

import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;

/**
 * 编辑表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("编辑网格员定时上报地理预警记录请求参数")
public class EventGridMemberWarnLogEditDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "主键ID", hidden = false, example = "1")
    private Long id;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
    private Long gridStreetId;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
    private Long gridCommunityId;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
    private Long gridId;

    @NotBlank() @Length(max=100)
    @ApiModelProperty(value = "网格名称", hidden = false, example = "")
    private String gridName;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员ID", hidden = false, example = "1")
    private Long gridMemberId;

    @Length(max=255)
    @ApiModelProperty(value = "精度维度信息，逗号分割", hidden = false, example = "")
    private String lngLat;

    @Length(max=50)
    @ApiModelProperty(value = "预警信息内容", hidden = false, example = "")
    private String content;


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

}

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

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

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

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonFormat;



/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("创建重点人群记录请求参数")
public class EventMainMemberAddDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员所处的街道", hidden = false, example = "1")
    private Long gridMemberStreet;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员所处社区", hidden = false, example = "1")
    private Long gridMemberCommunity;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员", hidden = false, example = "1")
    private Long gridMember;

    @Length(max=255)
    @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
    private String gridMemberName;

    @Length(max=255)
    @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
    private String gridMemberTele;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "需走访人ID", hidden = false, example = "1")
    private Long visiterId;

    @Length(max=255)
    @ApiModelProperty(value = "需走访人名字", hidden = false, example = "")
    private String visiterName;

    @Max(32767)
    @ApiModelProperty(value = "需走访人员性别", hidden = false, example = "1")
    private Integer visiterSex;

    @Length(max=255)
    @ApiModelProperty(value = "需走访人电话", hidden = false, example = "")
    private String visiterTele;

    @Length(max=255)
    @ApiModelProperty(value = "需走访人居住地址", hidden = false, example = "")
    private String visiterAddress;

    @Length(max=255)
    @ApiModelProperty(value = "需走访人地址精度纬度信息（逗号隔开）", hidden = false, example = "")
    private String visiterAddressLatLng;

    @Max(9999999999L)
    @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员", hidden = false, example = "1")
    private Integer visiterType;

    @Max(127)
    @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)", hidden = false, example = "1")
    private Integer actOpara;

    @Max(9999999999L)
    @ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）", hidden = false, example = "1")
    private Integer eventStatus;

    @Max(32767)
    @ApiModelProperty(value = "上报状态", hidden = false, example = "1")
    private Integer reporting;

    @Max(32767)
    @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
    private Integer dellType;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "处理人ID", hidden = false, example = "1")
    private Long dellUserId;

    @Length(max=255)
    @ApiModelProperty(value = "处理人名称", hidden = false, example = "")
    private String dellUserName;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "处理时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date dellDate;

    @Length(max=255)
    @ApiModelProperty(value = "解决人针对解决事件的处理描述", hidden = false, example = "")
    private String dellDesc;

    
    @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
    private Boolean invalid;

    
    @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
    private Boolean urgent;

    
    @ApiModelProperty(value = "是否催办", hidden = false, example = "true")
    private Boolean urgentDell;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "上报提交时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date submitDate;

    @Length(max=255)
    @ApiModelProperty(value = "走访频率配置，一个月几次", hidden = false, example = "")
    private String visiterConfig;


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

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventMainMemberDeleteDTO.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 EventMainMemberDeleteDTO {

    @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/EventMainMemberEditDTO.java

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

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

import org.hibernate.validator.constraints.Length;

import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;

/**
 * 编辑表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("编辑重点人群记录请求参数")
public class EventMainMemberEditDTO {

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

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员所处的街道", hidden = false, example = "1")
    private Long gridMemberStreet;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员所处社区", hidden = false, example = "1")
    private Long gridMemberCommunity;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员", hidden = false, example = "1")
    private Long gridMember;

    @Length(max=255)
    @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
    private String gridMemberName;

    @Length(max=255)
    @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
    private String gridMemberTele;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "需走访人ID", hidden = false, example = "1")
    private Long visiterId;

    @Length(max=255)
    @ApiModelProperty(value = "需走访人名字", hidden = false, example = "")
    private String visiterName;

    @Max(32767)
    @ApiModelProperty(value = "需走访人员性别", hidden = false, example = "1")
    private Integer visiterSex;

    @Length(max=255)
    @ApiModelProperty(value = "需走访人电话", hidden = false, example = "")
    private String visiterTele;

    @Length(max=255)
    @ApiModelProperty(value = "需走访人居住地址", hidden = false, example = "")
    private String visiterAddress;

    @Length(max=255)
    @ApiModelProperty(value = "需走访人地址精度纬度信息（逗号隔开）", hidden = false, example = "")
    private String visiterAddressLatLng;

    @Max(9999999999L)
    @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员", hidden = false, example = "1")
    private Integer visiterType;

    @Max(127)
    @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)", hidden = false, example = "1")
    private Integer actOpara;

    @Max(9999999999L)
    @ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）", hidden = false, example = "1")
    private Integer eventStatus;

    @Max(32767)
    @ApiModelProperty(value = "上报状态", hidden = false, example = "1")
    private Integer reporting;

    @Max(32767)
    @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
    private Integer dellType;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "处理人ID", hidden = false, example = "1")
    private Long dellUserId;

    @Length(max=255)
    @ApiModelProperty(value = "处理人名称", hidden = false, example = "")
    private String dellUserName;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "处理时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date dellDate;

    @Length(max=255)
    @ApiModelProperty(value = "解决人针对解决事件的处理描述", hidden = false, example = "")
    private String dellDesc;

    
    @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
    private Boolean invalid;

    
    @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
    private Boolean urgent;

    
    @ApiModelProperty(value = "是否催办", hidden = false, example = "true")
    private Boolean urgentDell;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "上报提交时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date submitDate;

    @Length(max=255)
    @ApiModelProperty(value = "走访频率配置，一个月几次", hidden = false, example = "")
    private String visiterConfig;


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

}

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

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

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

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonFormat;



/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("创建事件或者走访中关联的图片音频和视频文件请求参数")
public class EventResourceAddDTO {

    @Max(127)
    @ApiModelProperty(value = "事件上传的资源类型(1是图片2是音频3是是视频)", hidden = false, example = "1")
    private Integer type;

    @Length(max=255)
    @ApiModelProperty(value = "资源名称", hidden = false, example = "")
    private String resourceName;

    @Length(max=255)
    @ApiModelProperty(value = "资源大小", hidden = false, example = "")
    private String resourceSize;

    @Length(max=255)
    @ApiModelProperty(value = "事件上传的资源URL地址", hidden = false, example = "")
    private String url;


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

}

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

New file
@@ -0,0 +1,30 @@
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 EventResourceDeleteDTO {

    @ApiModelProperty(value = "分类（1、事件 2、走访）", hidden = false, example = "1")
    private Integer classification;
    @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/EventResourceEditDTO.java

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

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

import org.hibernate.validator.constraints.Length;

import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;

/**
 * 编辑表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("编辑事件或者走访中关联的图片音频和视频文件请求参数")
public class EventResourceEditDTO {

    @Max(127)
    @ApiModelProperty(value = "分类（1、事件 2、走访）", hidden = false, example = "1")
    private Integer classification;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "事件或者走访任务关联ID", hidden = false, example = "1")
    private Long id;

    @Max(127)
    @ApiModelProperty(value = "事件上传的资源类型(1是图片2是音频3是是视频)", hidden = false, example = "1")
    private Integer type;

    @Length(max=255)
    @ApiModelProperty(value = "资源名称", hidden = false, example = "")
    private String resourceName;

    @Length(max=255)
    @ApiModelProperty(value = "资源大小", hidden = false, example = "")
    private String resourceSize;

    @Length(max=255)
    @ApiModelProperty(value = "事件上传的资源URL地址", hidden = false, example = "")
    private String url;


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

}

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

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

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

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;

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

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "id", hidden = false, example = "1", required = true)
    @NotNull
    private Long id;

    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;
    @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "李四")
    private String userName;

}

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

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

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

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonFormat;



/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("创建事件处理流转记录请求参数")
public class EventTransferRecordAddDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "事件ID", hidden = false, example = "1")
    private Long eventId;

    @Max(127)
    @ApiModelProperty(value = "来源类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
    private Integer fromType;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "事件来源机构或网格员", hidden = false, example = "1")
    private Long from;

    @Length(max=255)
    @ApiModelProperty(value = "转交办理人路径名称", hidden = false, example = "")
    private String fromName;

    @Max(127)
    @ApiModelProperty(value = "转交类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
    private Integer toType;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "事件下游机构或网格员", hidden = false, example = "1")
    private Long to;

    @Length(max=255)
    @ApiModelProperty(value = "需要办理人路径名称", hidden = false, example = "")
    private String toName;

    @Length(max=255)
    @ApiModelProperty(value = "处理结果", hidden = false, example = "")
    private String processResult;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "处理时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date processDate;


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

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventTransferRecordDeleteDTO.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 EventTransferRecordDeleteDTO {

    @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/EventTransferRecordEditDTO.java

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

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

import org.hibernate.validator.constraints.Length;

import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;

/**
 * 编辑表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("编辑事件处理流转记录请求参数")
public class EventTransferRecordEditDTO {

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

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "事件ID", hidden = false, example = "1")
    private Long eventId;

    @Max(127)
    @ApiModelProperty(value = "来源类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
    private Integer fromType;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "事件来源机构或网格员", hidden = false, example = "1")
    private Long from;

    @Length(max=255)
    @ApiModelProperty(value = "转交办理人路径名称", hidden = false, example = "")
    private String fromName;

    @Max(127)
    @ApiModelProperty(value = "转交类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
    private Integer toType;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "事件下游机构或网格员", hidden = false, example = "1")
    private Long to;

    @Length(max=255)
    @ApiModelProperty(value = "需要办理人路径名称", hidden = false, example = "")
    private String toName;

    @Length(max=255)
    @ApiModelProperty(value = "处理结果", hidden = false, example = "")
    private String processResult;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "处理时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date processDate;


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

}

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

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

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

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonFormat;



/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("创建重点人群走访记录请求参数")
public class EventVisitingTasksAddDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员所处的街道", hidden = false, example = "1")
    private Long gridMemberStreet;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员所处社区", hidden = false, example = "1")
    private Long gridMemberCommunity;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员", hidden = false, example = "1")
    private Long gridMember;

    @Length(max=255)
    @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
    private String gridMemberName;

    @Length(max=255)
    @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
    private String gridMenberTele;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "需走访人ID", hidden = false, example = "1")
    private Long visiterId;

    @Length(max=255)
    @ApiModelProperty(value = "需走访人名字", hidden = false, example = "")
    private String visiterName;

    @Max(32767)
    @ApiModelProperty(value = "需走访人员性别", hidden = false, example = "1")
    private Integer visiterSex;

    @Length(max=255)
    @ApiModelProperty(value = "需走访人电话", hidden = false, example = "")
    private String visiterTele;

    @Length(max=255)
    @ApiModelProperty(value = "需走访人居住地址", hidden = false, example = "")
    private String visiterAddress;

    @Max(9999999999L)
    @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员", hidden = false, example = "1")
    private Integer visiterType;

    @Length(max=255)
    @ApiModelProperty(value = "事件标题", hidden = false, example = "")
    private String eventTitle;

    @Max(127)
    @ApiModelProperty(value = "事件类型", hidden = false, example = "1")
    private Integer eventType;

    @Length(max=255)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "")
    private String eventDes;

    @Max(127)
    @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)", hidden = false, example = "1")
    private Integer actOpara;

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

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

    @Length(max=255)
    @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "")
    private String happentLatLng;

    @Max(127)
    @ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）", hidden = false, example = "1")
    private Integer eventStatus;

    @Max(32767)
    @ApiModelProperty(value = "上报状态", hidden = false, example = "1")
    private Integer reporting;

    @Max(32767)
    @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
    private Integer dellType;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "处理人ID", hidden = false, example = "1")
    private Long dellUserId;

    @Length(max=255)
    @ApiModelProperty(value = "处理人名称", hidden = false, example = "")
    private String dellUserName;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "处理时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date dellDate;

    @Length(max=255)
    @ApiModelProperty(value = "解决人针对解决事件的处理描述", hidden = false, example = "")
    private String dellDesc;

    
    @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
    private Boolean invalid;

    
    @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
    private Boolean urgent;

    
    @ApiModelProperty(value = "是否催办", hidden = false, example = "true")
    private Boolean urgentDell;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "上报提交时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date submitDate;

    
    @ApiModelProperty(value = "是否异常行为", hidden = false, example = "true")
    private Boolean exception;

    @Length(max=255)
    @ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据", hidden = false, example = "")
    private String tableContentJson;


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

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksDeleteDTO.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 EventVisitingTasksDeleteDTO {

    @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/EventVisitingTasksEditDTO.java

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

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

import org.hibernate.validator.constraints.Length;

import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;

/**
 * 编辑表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("编辑重点人群走访记录请求参数")
public class EventVisitingTasksEditDTO {

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

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员所处的街道", hidden = false, example = "1")
    private Long gridMemberStreet;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员所处社区", hidden = false, example = "1")
    private Long gridMemberCommunity;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员", hidden = false, example = "1")
    private Long gridMember;

    @Length(max=255)
    @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
    private String gridMemberName;

    @Length(max=255)
    @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
    private String gridMenberTele;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "需走访人ID", hidden = false, example = "1")
    private Long visiterId;

    @Length(max=255)
    @ApiModelProperty(value = "需走访人名字", hidden = false, example = "")
    private String visiterName;

    @Max(32767)
    @ApiModelProperty(value = "需走访人员性别", hidden = false, example = "1")
    private Integer visiterSex;

    @Length(max=255)
    @ApiModelProperty(value = "需走访人电话", hidden = false, example = "")
    private String visiterTele;

    @Length(max=255)
    @ApiModelProperty(value = "需走访人居住地址", hidden = false, example = "")
    private String visiterAddress;

    @Max(9999999999L)
    @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员", hidden = false, example = "1")
    private Integer visiterType;

    @Length(max=255)
    @ApiModelProperty(value = "事件标题", hidden = false, example = "")
    private String eventTitle;

    @Max(127)
    @ApiModelProperty(value = "事件类型", hidden = false, example = "1")
    private Integer eventType;

    @Length(max=255)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "")
    private String eventDes;

    @Max(127)
    @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)", hidden = false, example = "1")
    private Integer actOpara;

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

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

    @Length(max=255)
    @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "")
    private String happentLatLng;

    @Max(127)
    @ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）", hidden = false, example = "1")
    private Integer eventStatus;

    @Max(32767)
    @ApiModelProperty(value = "上报状态", hidden = false, example = "1")
    private Integer reporting;

    @Max(32767)
    @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
    private Integer dellType;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "处理人ID", hidden = false, example = "1")
    private Long dellUserId;

    @Length(max=255)
    @ApiModelProperty(value = "处理人名称", hidden = false, example = "")
    private String dellUserName;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "处理时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date dellDate;

    @Length(max=255)
    @ApiModelProperty(value = "解决人针对解决事件的处理描述", hidden = false, example = "")
    private String dellDesc;

    
    @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
    private Boolean invalid;

    
    @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
    private Boolean urgent;

    
    @ApiModelProperty(value = "是否催办", hidden = false, example = "true")
    private Boolean urgentDell;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "上报提交时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date submitDate;

    
    @ApiModelProperty(value = "是否异常行为", hidden = false, example = "true")
    private Boolean exception;

    @Length(max=255)
    @ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据", hidden = false, example = "")
    private String tableContentJson;


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

}

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

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

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

import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("查询社区活动 》随手拍请求参数")
public class PageComActEasyPhotoDTO {

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
    private String sortAttr="createAt";

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

    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "自增id", hidden = false, example = "1")
    private Long id;


    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "发起人id", hidden = false, example = "1")
    private Long sponsorId;


    @NotBlank() @Length(max=100)
    @ApiModelProperty(value = "发生地址", hidden = false, example = "")
    private String happenAddr;


    @NotBlank() @Length(max=100)
    @ApiModelProperty(value = "地址备注", hidden = false, example = "")
    private String addrRemark;


    @NotNull() @Max(127)
    @ApiModelProperty(value = "状态 1待处理 2已处理", hidden = false, example = "1")
    private Integer status;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "处理人id", hidden = false, example = "1")
    private Long handlerId;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAtBegin;
    @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtEnd;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "审核时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date examineAtBegin;
    @ApiModelProperty(value = "审核时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date examineAtEnd;


    @Length(max=65535)
    @ApiModelProperty(value = "详情", hidden = false, example = "")
    private String detail;


    @Length(max=65535)
    @ApiModelProperty(value = "图片路径列表，逗号分隔", hidden = false, example = "")
    private String photoPathList;


    @Length(max=65535)
    @ApiModelProperty(value = "处理结果", hidden = false, example = "")
    private String handleResult;


    @Length(max=65535)
    @ApiModelProperty(value = "处理结果，图片路径列表，逗号分隔", hidden = false, example = "")
    private String handlePhotoList;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "社区id", hidden = false, example = "1")
    private Long communityId;


    @Max(127)
    @ApiModelProperty(value = "是否匿名发布 0 否 1 是", hidden = false, example = "1")
    private Integer isHide;


    @Max(127)
    @ApiModelProperty(value = "是否需要反馈 0 不需要 1 需要", hidden = false, example = "1")
    private Integer isNeedFeedBack;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "反馈时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date feedbackAtBegin;
    @ApiModelProperty(value = "反馈时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date feedbackAtEnd;


    @Length(max=500)
    @ApiModelProperty(value = "驳回原因", hidden = false, example = "")
    private String rejectReason;


    @Length(max=65535)
    @ApiModelProperty(value = "封面图片", hidden = false, example = "")
    private String cover;


    @Max(127)
    @ApiModelProperty(value = "是否删除 0 否 1 是", hidden = false, example = "1")
    private Integer delTag;


    @Max(127)
    @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)", hidden = false, example = "1")
    private Integer isReport;


    @Max(127)
    @ApiModelProperty(value = "是否公示(0.否 1.是)", hidden = false, example = "1")
    private Integer isPublicity;


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

}

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

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

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

import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("查询随手拍类型请求参数")
public class PageComActEasyPhotoTypeDTO {

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
    private String sortAttr="createAt";

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

    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "主键id", hidden = false, example = "1")
    private Long id;


    @Length(max=50)
    @ApiModelProperty(value = "随手拍类型名称", hidden = false, example = "")
    private String name;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAtBegin;
    @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtEnd;


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

}

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

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

import com.google.common.base.CaseFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.Pattern;

/**
 * 随手拍列表请求参数
 *
 * @author lyq
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("随手拍列表请求参数")
public class PageEasyAppDTO {

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt",hidden = true)
    private String sortAttr="createAt";

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

    @ApiModelProperty(value = "状态 1.待处理 2.已上报 3.已公示  4.未公示")
    private Integer status;

    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;

    @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)",hidden = true)
    private Integer isReport;

    @ApiModelProperty(value = "是否公示(0.否 1.是)",hidden = true)
    private Integer isPublicity;

    @ApiModelProperty(value = "处理状态（1.待处理 2.已处理）",hidden = true)
    private Integer handleStatus;

    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }

}

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

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

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

import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("查询APP应用版本信息请求参数")
public class PageEventApplicationAppReleaseDTO {

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
    private String sortAttr="createAt";

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

    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }


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


    @Max(32767)
    @ApiModelProperty(value = "应用ID", hidden = false, example = "1")
    private Integer productId;


    @Length(max=50)
    @ApiModelProperty(value = "应用名称", hidden = false, example = "")
    private String productName;


    @Length(max=255)
    @ApiModelProperty(value = "版本编号", hidden = false, example = "")
    private String releaseNumber;


    @Max(32767)
    @ApiModelProperty(value = "通知行为(1、强制更新2、提示更新)", hidden = false, example = "1")
    private Integer action;


    @Length(max=255)
    @ApiModelProperty(value = "版本地址", hidden = false, example = "")
    private String url;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAtBegin;
    @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtEnd;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "创建人", hidden = false, example = "1")
    private Long createBy;


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

}

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

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

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

import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("查询用户协议和隐私政策信息请求参数")
public class PageEventApplicationUserNoticeDTO {

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
    private String sortAttr="createAt";

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

    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }


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


    @Max(32767)
    @ApiModelProperty(value = "应用ID", hidden = false, example = "1")
    private Integer productId;


    @Length(max=50)
    @ApiModelProperty(value = "应用名称", hidden = false, example = "")
    private String productName;


    @Max(32767)
    @ApiModelProperty(value = "通知行为(1、强制通知必须手段确定2、提示更新，自动消退)", hidden = false, example = "1")
    private Integer action;


    @Length(max=1000)
    @ApiModelProperty(value = "内容", hidden = false, example = "")
    private String content;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAtBegin;
    @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtEnd;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "创建人", hidden = false, example = "1")
    private Long createBy;


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

}

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

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

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

import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;

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

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格ID", hidden = false, example = "1", required = true)
    @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;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
    private String sortAttr="createAt";

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

    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }


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


    @Length(max=20)
    @ApiModelProperty(value = "服务单号", hidden = false, example = "")
    private String orderSn;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "1、办件事件2是宣传事件3是阅读事件", hidden = false, example = "1")
    private Long eventCategory;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员所处的街道", hidden = false, example = "1")
    private Long gridMemberStreet;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员所处社区", hidden = false, example = "1")
    private Long gridMemberCommunity;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员", hidden = false, example = "1")
    private Long gridMemberId;


    @Length(max=100)
    @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
    private String gridMemberName;


    @Length(max=20)
    @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
    private String gridMemberTelephone;


    @Length(max=255)
    @ApiModelProperty(value = "事件标题", hidden = false, example = "")
    private String eventTitle;


    @Length(max=255)
    @ApiModelProperty(value = "宣传类型", hidden = false, example = "1")
    private String propagandaType;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "宣传时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date propagandaTimeBegin;
    @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;

    @Length(max=255)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "")
    private String eventDes;


    @Length(max=50)
    @ApiModelProperty(value = "宣传对象", hidden = false, example = "")
    private String propagandaObject;


    @Length(max=10)
    @ApiModelProperty(value = "宣传人数", hidden = false, example = "")
    private String propagandaNum;


    @Max(127)
    @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)", hidden = false, example = "1")
    private Integer communityProcess;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "发生时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date happenTimeBegin;
    @ApiModelProperty(value = "发生时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date happenTimeEnd;


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


    @Length(max=255)
    @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "")
    private String happentLatLng;


    @Max(127)
    @ApiModelProperty(value = "事件状态（1草稿箱2发布3逻辑删除4、撤销）", hidden = false, example = "1")
    private Integer eventStatus;


    @Max(127)
    @ApiModelProperty(value = "1待处理2已解决3待验证", hidden = false, example = "1")
    private Integer eventProcessStatus;


    @Max(127)
    @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
    private Integer processType;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "处理人ID", hidden = false, example = "1")
    private Long processUserId;


    @Length(max=100)
    @ApiModelProperty(value = "处理人名称", hidden = false, example = "")
    private String processUserName;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "处理时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date processDateBegin;
    @ApiModelProperty(value = "处理时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date processDateEnd;


    @Length(max=255)
    @ApiModelProperty(value = "解决人针对解决事件的处理描述", hidden = false, example = "")
    private String processDesc;


    @Length(max=255)
    @ApiModelProperty(value = "事件来源", hidden = false, example = "")
    private String eventResource;


    @Max(127)
    @ApiModelProperty(value = "危险级别", hidden = false, example = "1")
    private Integer dangerLevel;


    
    @ApiModelProperty(value = "红牌", hidden = false, example = "true")
    private Boolean redCard;


    
    @ApiModelProperty(value = "黄牌", hidden = false, example = "true")
    private Boolean yellowCard;


    
    @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
    private Boolean invalid;


    
    @ApiModelProperty(value = "是否重大", hidden = false, example = "true")
    private Boolean major;


    @Max(9999999999L)
    @ApiModelProperty(value = "死亡人数", hidden = false, example = "1")
    private Integer deathsNumber;


    @Max(9999999999L)
    @ApiModelProperty(value = "受伤人数", hidden = false, example = "1")
    private Integer injuriesNumber;


    
    @ApiModelProperty(value = "是否疑难事件", hidden = false, example = "true")
    private Boolean difficult;


    
    @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
    private Boolean urgent;


    
    @ApiModelProperty(value = "是否催办", hidden = false, example = "true")
    private Boolean urgentDell;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "上报提交时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date submitDateBegin;
    @ApiModelProperty(value = "上报提交时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date submitDateEnd;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "创建人", hidden = false, example = "1")
    private Long createBy;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAtBegin;
    @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtEnd;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "修改人", hidden = false, example = "1")
    private Long updateBy;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "修改时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date updateAtBegin;
    @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/PageEventGridDataDTO.java

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

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

import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("查询区县/街道/社区/网格员网格数据管理请求参数")
public class PageEventGridDataDTO {

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
    private String sortAttr="createAt";

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

    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "主键ID", hidden = false, example = "1")
    private Long id;


    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "类型，1、区县网格2街道网格3社区网格", hidden = false, example = "1")
    private Long type;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "区/县ID", hidden = false, example = "1")
    private Long zoneId;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
    private Long gridStreetId;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
    private Long gridCommunityId;


    @NotBlank() @Length(max=100)
    @ApiModelProperty(value = "网格名称", hidden = false, example = "")
    private String gridName;


    @Max(32767)
    @ApiModelProperty(value = "所属图层", hidden = false, example = "1")
    private Integer mapLevel;


    @Length(max=100)
    @ApiModelProperty(value = "面积", hidden = false, example = "")
    private String area;


    @Length(max=100)
    @ApiModelProperty(value = "线条颜色", hidden = false, example = "")
    private String lineColor;


    @Length(max=100)
    @ApiModelProperty(value = "线条宽度", hidden = false, example = "")
    private String lineBroadband;


    @Length(max=100)
    @ApiModelProperty(value = "填充颜色", hidden = false, example = "")
    private String fillColor;


    @Length(max=255)
    @ApiModelProperty(value = "备注", hidden = false, example = "")
    private String remarks;


    @Length(max=2147483647)
    @ApiModelProperty(value = "围栏数据", hidden = false, example = "")
    private String data;


    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "创建人", hidden = false, example = "1")
    private Long createBy;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAtBegin;
    @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtEnd;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "修改人", hidden = false, example = "1")
    private Long updateBy;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "修改时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date updateAtBegin;
    @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/PageEventGridMemberGpsLogDTO.java

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

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

import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("查询网格员定时上报地理信息请求参数")
public class PageEventGridMemberGpsLogDTO {

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
    private String sortAttr="createAt";

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

    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "主键ID", hidden = false, example = "1")
    private Long id;


    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
    private Long gridStreetId;


    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
    private Long gridCommunityId;


    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
    private Long gridId;


    @NotBlank() @Length(max=100)
    @ApiModelProperty(value = "网格名称", hidden = false, example = "")
    private String gridName;


    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员ID", hidden = false, example = "1")
    private Long gridMemberId;


    @Length(max=255)
    @ApiModelProperty(value = "精度维度信息，逗号分割", hidden = false, example = "")
    private String lngLat;


    @Max(127)
    @ApiModelProperty(value = "位置信息状态（1、为判定2、正常3、是不正常）", hidden = false, example = "1")
    private Integer positionStation;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "创建人", hidden = false, example = "1")
    private Long createBy;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAtBegin;
    @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtEnd;


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

}

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

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

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

import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("查询网格和网格员的关联关系请求参数")
public class PageEventGridMemberRelationDTO {

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
    private String sortAttr="createAt";

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

    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "主键ID", hidden = false, example = "1")
    private Long id;


    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
    private Long gridStreetId;


    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
    private Long gridCommunityId;


    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
    private Long gridId;


    @NotBlank() @Length(max=100)
    @ApiModelProperty(value = "网格名称", hidden = false, example = "")
    private String gridName;


    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员ID", hidden = false, example = "1")
    private Long gridMemberId;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "创建人", hidden = false, example = "1")
    private Long createBy;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAtBegin;
    @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtEnd;


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

}

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

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

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

import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("查询网格员定时上报地理预警记录请求参数")
public class PageEventGridMemberWarnLogDTO {

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
    private String sortAttr="createAt";

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

    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "主键ID", hidden = false, example = "1")
    private Long id;


    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
    private Long gridStreetId;


    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
    private Long gridCommunityId;


    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
    private Long gridId;


    @NotBlank() @Length(max=100)
    @ApiModelProperty(value = "网格名称", hidden = false, example = "")
    private String gridName;


    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员ID", hidden = false, example = "1")
    private Long gridMemberId;


    @Length(max=255)
    @ApiModelProperty(value = "精度维度信息，逗号分割", hidden = false, example = "")
    private String lngLat;


    @Length(max=50)
    @ApiModelProperty(value = "预警信息内容", hidden = false, example = "")
    private String content;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "创建人", hidden = false, example = "1")
    private Long createBy;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAtBegin;
    @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtEnd;


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

}

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

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

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

import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("查询重点人群记录请求参数")
public class PageEventMainMemberDTO {

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
    private String sortAttr="createAt";

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

    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }


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


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员所处的街道", hidden = false, example = "1")
    private Long gridMemberStreet;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员所处社区", hidden = false, example = "1")
    private Long gridMemberCommunity;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员", hidden = false, example = "1")
    private Long gridMember;


    @Length(max=255)
    @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
    private String gridMemberName;


    @Length(max=255)
    @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
    private String gridMemberTele;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "需走访人ID", hidden = false, example = "1")
    private Long visiterId;


    @Length(max=255)
    @ApiModelProperty(value = "需走访人名字", hidden = false, example = "")
    private String visiterName;


    @Max(32767)
    @ApiModelProperty(value = "需走访人员性别", hidden = false, example = "1")
    private Integer visiterSex;


    @Length(max=255)
    @ApiModelProperty(value = "需走访人电话", hidden = false, example = "")
    private String visiterTele;


    @Length(max=255)
    @ApiModelProperty(value = "需走访人居住地址", hidden = false, example = "")
    private String visiterAddress;


    @Length(max=255)
    @ApiModelProperty(value = "需走访人地址精度纬度信息（逗号隔开）", hidden = false, example = "")
    private String visiterAddressLatLng;


    @Max(9999999999L)
    @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员", hidden = false, example = "1")
    private Integer visiterType;


    @Max(127)
    @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)", hidden = false, example = "1")
    private Integer actOpara;


    @Max(9999999999L)
    @ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）", hidden = false, example = "1")
    private Integer eventStatus;


    @Max(32767)
    @ApiModelProperty(value = "上报状态", hidden = false, example = "1")
    private Integer reporting;


    @Max(32767)
    @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
    private Integer dellType;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "处理人ID", hidden = false, example = "1")
    private Long dellUserId;


    @Length(max=255)
    @ApiModelProperty(value = "处理人名称", hidden = false, example = "")
    private String dellUserName;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "处理时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date dellDateBegin;
    @ApiModelProperty(value = "处理时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date dellDateEnd;


    @Length(max=255)
    @ApiModelProperty(value = "解决人针对解决事件的处理描述", hidden = false, example = "")
    private String dellDesc;


    
    @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
    private Boolean invalid;


    
    @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
    private Boolean urgent;


    
    @ApiModelProperty(value = "是否催办", hidden = false, example = "true")
    private Boolean urgentDell;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "上报提交时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date submitDateBegin;
    @ApiModelProperty(value = "上报提交时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date submitDateEnd;


    @Length(max=255)
    @ApiModelProperty(value = "走访频率配置，一个月几次", hidden = false, example = "")
    private String visiterConfig;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "创建人", hidden = false, example = "1")
    private Long createBy;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建事件-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAtBegin;
    @ApiModelProperty(value = "创建事件-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtEnd;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "修改人", hidden = false, example = "1")
    private Long updateBy;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "修改时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date updateAtBegin;
    @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/PageEventResourceDTO.java

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

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

import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("查询事件或者走访中关联的图片音频和视频文件请求参数")
public class PageEventResourceDTO {

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
    private String sortAttr="createAt";

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

    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }


    @Max(127)
    @ApiModelProperty(value = "分类（1、事件 2、走访）", hidden = false, example = "1")
    private Integer classification;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "事件或者走访任务关联ID", hidden = false, example = "1")
    private Long id;


    @Max(127)
    @ApiModelProperty(value = "事件上传的资源类型(1是图片2是音频3是是视频)", hidden = false, example = "1")
    private Integer type;


    @Length(max=255)
    @ApiModelProperty(value = "资源名称", hidden = false, example = "")
    private String resourceName;


    @Length(max=255)
    @ApiModelProperty(value = "资源大小", hidden = false, example = "")
    private String resourceSize;


    @Length(max=255)
    @ApiModelProperty(value = "事件上传的资源URL地址", hidden = false, example = "")
    private String url;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "创建人", hidden = false, example = "1")
    private Long createBy;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAtBegin;
    @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtEnd;


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

}

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

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

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

import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("查询事件处理流转记录请求参数")
public class PageEventTransferRecordDTO {

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
    private String sortAttr="createAt";

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

    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }


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


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "事件ID", hidden = false, example = "1")
    private Long eventId;


    @Max(127)
    @ApiModelProperty(value = "来源类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
    private Integer fromType;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "事件来源机构或网格员", hidden = false, example = "1")
    private Long from;


    @Length(max=255)
    @ApiModelProperty(value = "转交办理人路径名称", hidden = false, example = "")
    private String fromName;


    @Max(127)
    @ApiModelProperty(value = "转交类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
    private Integer toType;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "事件下游机构或网格员", hidden = false, example = "1")
    private Long to;


    @Length(max=255)
    @ApiModelProperty(value = "需要办理人路径名称", hidden = false, example = "")
    private String toName;


    @Length(max=255)
    @ApiModelProperty(value = "处理结果", hidden = false, example = "")
    private String processResult;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "处理时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date processDateBegin;
    @ApiModelProperty(value = "处理时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date processDateEnd;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAtBegin;
    @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtEnd;


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

}

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

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

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

import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("查询重点人群走访记录请求参数")
public class PageEventVisitingTasksDTO {

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
    private String sortAttr="createAt";

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

    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }


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


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员所处的街道", hidden = false, example = "1")
    private Long gridMemberStreet;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员所处社区", hidden = false, example = "1")
    private Long gridMemberCommunity;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员", hidden = false, example = "1")
    private Long gridMember;


    @Length(max=255)
    @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
    private String gridMemberName;


    @Length(max=255)
    @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
    private String gridMenberTele;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "需走访人ID", hidden = false, example = "1")
    private Long visiterId;


    @Length(max=255)
    @ApiModelProperty(value = "需走访人名字", hidden = false, example = "")
    private String visiterName;


    @Max(32767)
    @ApiModelProperty(value = "需走访人员性别", hidden = false, example = "1")
    private Integer visiterSex;


    @Length(max=255)
    @ApiModelProperty(value = "需走访人电话", hidden = false, example = "")
    private String visiterTele;


    @Length(max=255)
    @ApiModelProperty(value = "需走访人居住地址", hidden = false, example = "")
    private String visiterAddress;


    @Max(9999999999L)
    @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员", hidden = false, example = "1")
    private Integer visiterType;


    @Length(max=255)
    @ApiModelProperty(value = "事件标题", hidden = false, example = "")
    private String eventTitle;


    @Max(127)
    @ApiModelProperty(value = "事件类型", hidden = false, example = "1")
    private Integer eventType;


    @Length(max=255)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "")
    private String eventDes;


    @Max(127)
    @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)", hidden = false, example = "1")
    private Integer actOpara;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "发生时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date happenTimeBegin;
    @ApiModelProperty(value = "发生时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date happenTimeEnd;


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


    @Length(max=255)
    @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "")
    private String happentLatLng;


    @Max(127)
    @ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）", hidden = false, example = "1")
    private Integer eventStatus;


    @Max(32767)
    @ApiModelProperty(value = "上报状态", hidden = false, example = "1")
    private Integer reporting;


    @Max(32767)
    @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
    private Integer dellType;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "处理人ID", hidden = false, example = "1")
    private Long dellUserId;


    @Length(max=255)
    @ApiModelProperty(value = "处理人名称", hidden = false, example = "")
    private String dellUserName;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "处理时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date dellDateBegin;
    @ApiModelProperty(value = "处理时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date dellDateEnd;


    @Length(max=255)
    @ApiModelProperty(value = "解决人针对解决事件的处理描述", hidden = false, example = "")
    private String dellDesc;


    
    @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
    private Boolean invalid;


    
    @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
    private Boolean urgent;


    
    @ApiModelProperty(value = "是否催办", hidden = false, example = "true")
    private Boolean urgentDell;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "上报提交时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date submitDateBegin;
    @ApiModelProperty(value = "上报提交时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date submitDateEnd;


    
    @ApiModelProperty(value = "是否异常行为", hidden = false, example = "true")
    private Boolean exception;


    @Length(max=255)
    @ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据", hidden = false, example = "")
    private String tableContentJson;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "创建人", hidden = false, example = "1")
    private Long createBy;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建事件-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAtBegin;
    @ApiModelProperty(value = "创建事件-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtEnd;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "修改人", hidden = false, example = "1")
    private Long updateBy;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "修改时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date updateAtBegin;
    @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/PagePublicityEventDTO.java

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

import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

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

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("查询宣传教育事件请求参数")
public class PagePublicityEventDTO {

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

    @Max(value = 6, message = "事件处理状态参数错误")
    @ApiModelProperty(value = "事件处理状态（为空时查询全部）：1 已发布、5 草稿箱、6已撤销", hidden = false, example = "1")
    private Integer eventDealStatus;

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
    private String sortAttr="createAt";

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

    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }


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


    @Length(max=20)
    @ApiModelProperty(value = "服务单号", hidden = false, example = "")
    private String orderSn;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "1、办件事件2是宣传事件3是阅读事件", hidden = false, example = "1")
    private Long eventCategory;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员所处的街道", hidden = false, example = "1")
    private Long gridMemberStreet;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员所处社区", hidden = false, example = "1")
    private Long gridMemberCommunity;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "网格员", hidden = false, example = "1")
    private Long gridMemberId;


    @Length(max=100)
    @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
    private String gridMemberName;


    @Length(max=20)
    @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
    private String gridMemberTelephone;


    @Length(max=255)
    @ApiModelProperty(value = "事件标题", hidden = false, example = "")
    private String eventTitle;


    @Length(max=255)
    @ApiModelProperty(value = "宣传类型", hidden = false, example = "1")
    private String propagandaType;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "宣传时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date propagandaTimeBegin;
    @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;

    @Length(max=255)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "")
    private String eventDes;


    @Length(max=50)
    @ApiModelProperty(value = "宣传对象", hidden = false, example = "")
    private String propagandaObject;


    @Length(max=10)
    @ApiModelProperty(value = "宣传人数", hidden = false, example = "")
    private String propagandaNum;


    @Max(127)
    @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)", hidden = false, example = "1")
    private Integer communityProcess;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "发生时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date happenTimeBegin;
    @ApiModelProperty(value = "发生时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date happenTimeEnd;


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


    @Length(max=255)
    @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "")
    private String happentLatLng;


    @Max(127)
    @ApiModelProperty(value = "事件状态（1草稿箱2发布3逻辑删除4、撤销）", hidden = false, example = "1")
    private Integer eventStatus;


    @Max(127)
    @ApiModelProperty(value = "1待处理2已解决3待验证", hidden = false, example = "1")
    private Integer eventProcessStatus;


    @Max(127)
    @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
    private Integer processType;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "处理人ID", hidden = false, example = "1")
    private Long processUserId;


    @Length(max=100)
    @ApiModelProperty(value = "处理人名称", hidden = false, example = "")
    private String processUserName;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "处理时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date processDateBegin;
    @ApiModelProperty(value = "处理时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date processDateEnd;


    @Length(max=255)
    @ApiModelProperty(value = "解决人针对解决事件的处理描述", hidden = false, example = "")
    private String processDesc;


    @Length(max=255)
    @ApiModelProperty(value = "事件来源", hidden = false, example = "")
    private String eventResource;


    @Max(127)
    @ApiModelProperty(value = "危险级别", hidden = false, example = "1")
    private Integer dangerLevel;


    
    @ApiModelProperty(value = "红牌", hidden = false, example = "true")
    private Boolean redCard;


    
    @ApiModelProperty(value = "黄牌", hidden = false, example = "true")
    private Boolean yellowCard;


    
    @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
    private Boolean invalid;


    
    @ApiModelProperty(value = "是否重大", hidden = false, example = "true")
    private Boolean major;


    @Max(9999999999L)
    @ApiModelProperty(value = "死亡人数", hidden = false, example = "1")
    private Integer deathsNumber;


    @Max(9999999999L)
    @ApiModelProperty(value = "受伤人数", hidden = false, example = "1")
    private Integer injuriesNumber;


    
    @ApiModelProperty(value = "是否疑难事件", hidden = false, example = "true")
    private Boolean difficult;


    
    @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
    private Boolean urgent;


    
    @ApiModelProperty(value = "是否催办", hidden = false, example = "true")
    private Boolean urgentDell;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "上报提交时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date submitDateBegin;
    @ApiModelProperty(value = "上报提交时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date submitDateEnd;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "创建人", hidden = false, example = "1")
    private Long createBy;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAtBegin;
    @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtEnd;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "修改人", hidden = false, example = "1")
    private Long updateBy;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "修改时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date updateAtBegin;
    @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/PublicityEventAddDTO.java

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import org.hibernate.validator.constraints.URL;

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


/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("宣传教育事件请求参数")
public class PublicityEventAddDTO {


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

    @Length(max=255)
    @ApiModelProperty(value = "宣传地点-精度纬度信息（逗号隔开）", hidden = false, example = "41.40338,2.17403", required = true)
    @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(message = "宣传区域不能为空")
    private Long gridId;

    @Length(max=255)
    @ApiModelProperty(value = "宣传主题", hidden = false, example = "", required = true)
    @NotNull(message = "宣传主题不能为空")
    private String eventTitle;

    @Length(max=255)
    @ApiModelProperty(value = "宣传内容", hidden = false, example = "", required = true)
    @NotNull(message = "宣传内容不能为空")
    private String eventDes;

    @Length(max=255)
    @ApiModelProperty(value = "宣传类型", hidden = false, example = "1", required = true)
    @NotNull(message = "宣传类型不能为空")
    private String propagandaType;


    @Length(max=50)
    @ApiModelProperty(value = "宣传对象", hidden = false, example = "", required = true)
    @NotNull(message = "宣传对象不能为空")
    private String propagandaObject;

    @Length(max=10)
    @ApiModelProperty(value = "宣传人数", hidden = false, example = "", required = true)
    @NotNull(message = "宣传人数不能为空")
    private String propagandaNum;

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

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

    @ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
            example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
    private String pics;

    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;
    @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
    private String userName;
    @ApiModelProperty(value = "(当前操作)用户电话", hidden = true, example = "18888888888")
    @Length(max = 11)
    private String phone;

}

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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import org.hibernate.validator.constraints.URL;

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


/**
 * 编辑表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("宣传教育事件草稿请求参数")
public class PublicityEventEditDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "id,如果是新增则不填", hidden = false, example = "1")
    private Long id;

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

    @Length(max=255)
    @ApiModelProperty(value = "宣传地点-精度纬度信息（逗号隔开）", hidden = false, example = "41.40338,2.17403", required = true)
    @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(message = "宣传区域不能为空")
    private Long gridId;

    @Length(max=255)
    @ApiModelProperty(value = "宣传主题", hidden = false, example = "", required = true)
    @NotNull(message = "宣传主题不能为空")
    private String eventTitle;

    @Length(max=255)
    @ApiModelProperty(value = "宣传内容", hidden = false, example = "", required = true)
    @NotNull(message = "宣传内容不能为空")
    private String eventDes;

    @Length(max=255)
    @ApiModelProperty(value = "宣传类型", hidden = false, example = "1", required = true)
    @NotNull(message = "宣传类型不能为空")
    private String propagandaType;


    @Length(max=50)
    @ApiModelProperty(value = "宣传对象", hidden = false, example = "", required = true)
    @NotNull(message = "宣传对象不能为空")
    private String propagandaObject;

    @Length(max=10)
    @ApiModelProperty(value = "宣传人数", hidden = false, example = "", required = true)
    @NotNull(message = "宣传人数不能为空")
    private String propagandaNum;

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

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

    @ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
            example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
    private String pics;

    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;
    @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
    private String userName;
    @ApiModelProperty(value = "(当前操作)用户电话", hidden = true, example = "18888888888")
    @Length(max = 11)
    private String phone;

}

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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.enums.EventType;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

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


/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@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(message = "发生时间不能为空")
    private Date happenTime;

    @Length(max=255)
    @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "41.40338,2.17403", required = true)
    @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(message = "发生区域-网格ID不能为空")
    private Long gridId;

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

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

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

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

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

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

    @ApiModelProperty(value = "是否重大", hidden = false, example = "true", required = true)
    @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;

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

    @ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
            example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
    private String pics;

    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;
    @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
    private String userName;
    @ApiModelProperty(value = "(当前操作)用户电话", hidden = true, example = "18888888888")
    @Length(max = 11)
    private String phone;

}

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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

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


/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("特殊人群事件请求参数")
public class SpecialEventEditDTO {
    @Max(9223372036854775807L)
    @ApiModelProperty(value = "id,如果是新增则不填", hidden = false, example = "1")
    private Long id;

    @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(message = "发生时间不能为空")
    private Date happenTime;

    @Length(max=255)
    @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "41.40338,2.17403", required = true)
    @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(message = "发生区域-网格ID不能为空")
    private Long gridId;

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

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

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

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

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

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

    @ApiModelProperty(value = "是否重大", hidden = false, example = "true", required = true)
    @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;

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

    @ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
            example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
    private String pics;

    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;
    @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
    private String userName;
    @ApiModelProperty(value = "(当前操作)用户电话", hidden = true, example = "18888888888")
    @Length(max = 11)
    private String phone;

}

 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/IPageVO.java

@@ -28,14 +28,14 @@
 * @author
 * @since
 */
public interface IPageVO<T> extends Serializable {
public class IPageVO<T> implements Serializable {

    /**
     * 获取排序信息，排序的字段和正反序
     *
     * @return 排序信息
     */
    List<Object> orders();
    List<Object> orders(){return null;}

    /**
     * KEY/VALUE 条件
@@ -44,7 +44,7 @@
     * @deprecated 3.4.0 @2020-06-30
     */
    @Deprecated
    default Map<Object, Object> condition() {
     Map<Object, Object> condition() {
        return null;
    }

@@ -53,7 +53,7 @@
     *
     * @return true 是 / false 否
     */
    default boolean optimizeCountSql() {
     boolean optimizeCountSql() {
        return true;
    }

@@ -62,14 +62,14 @@
     *
     * @return true 是 / false 否
     */
    default boolean isSearchCount() {
     boolean isSearchCount() {
        return true;
    }

    /**
     * 计算当前分页偏移量
     */
    default long offset() {
     long offset() {
        long current = getCurrent();
        if (current <= 1L) {
            return 0L;
@@ -82,14 +82,14 @@
     *
     * @since 3.4.0 @2020-07-17
     */
    default Long maxLimit() {
     Long maxLimit() {
        return null;
    }

    /**
     * 当前分页总页数
     */
    default long getPages() {
     long getPages() {
        if (getSize() == 0) {
            return 0L;
        }
@@ -104,7 +104,7 @@
     * 内部什么也不干
     * <p>只是为了 json 反序列化时不报错</p>
     */
    default IPageVO<T> setPages(long pages) {
     IPageVO<T> setPages(long pages) {
        // to do nothing
        return this;
    }
@@ -117,7 +117,7 @@
     * @deprecated 3.4.0 @2020-06-30 缓存遵循mybatis的一或二缓
     */
    @Deprecated
    default void hitCount(boolean hit) {
     void hitCount(boolean hit) {

    }

@@ -129,7 +129,7 @@
     * @deprecated 3.4.0 @2020-06-30 缓存遵循mybatis的一或二缓
     */
    @Deprecated
    default boolean isHitCount() {
     boolean isHitCount() {
        return false;
    }

@@ -138,48 +138,48 @@
     *
     * @return 分页对象记录列表
     */
    List<T> getRecords();
    List<T> getRecords(){return null;}

    /**
     * 设置分页记录列表
     */
    IPageVO<T> setRecords(List<T> records);
    IPageVO<T> setRecords(List<T> records){return null;}

    /**
     * 当前满足条件总行数
     *
     * @return 总条数
     */
    long getTotal();
    long getTotal(){return 0l;}

    /**
     * 设置当前满足条件总行数
     */
    IPageVO<T> setTotal(long total);
    IPageVO<T> setTotal(long total){return null;}

    /**
     * 获取每页显示条数
     *
     * @return 每页显示条数
     */
    long getSize();
    long getSize(){return 0;}

    /**
     * 设置每页显示条数
     */
    IPageVO<T> setSize(long size);
    IPageVO<T> setSize(long size){return null;}

    /**
     * 当前页
     *
     * @return 当前页
     */
    long getCurrent();
    long getCurrent(){return 0l;}

    /**
     * 设置当前页
     */
    IPageVO<T> setCurrent(long current);
    IPageVO<T> setCurrent(long current){return null;}

    /**
     * IPageVO 的泛型转换
@@ -189,7 +189,7 @@
     * @return 转换泛型后的 IPageVO
     */
    @SuppressWarnings("unchecked")
    default <R> IPageVO<R> convert(Function<? super T, ? extends R> mapper) {
     <R> IPageVO<R> convert(Function<? super T, ? extends R> mapper) {
        List<R> collect = this.getRecords().stream().map(mapper).collect(toList());
        return ((IPageVO<R>) this).setRecords(collect);
    }
@@ -202,7 +202,7 @@
     * @return id
     * @since 3.4.0 @2020-06-19
     */
    default String countId() {
     String countId() {
        return null;
    }


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java

@@ -78,7 +78,7 @@
    @ApiModelProperty("头像")
    private String imageUrl;

    @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台")
    @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台")
    private Integer type;

    @ApiModelProperty("职业")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java

@@ -130,4 +130,9 @@
    @ApiModelProperty(value = "地址备注")
    private String addrRemark;

    @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)")
    private Integer isReport;

    @ApiModelProperty(value = "是否公示(0.否 1.是)")
    private Integer isPublicity;
}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("社区活动 》随手拍详细返回参数")
public class ComActEasyPhotoDetailsVO {

    @ApiModelProperty(value = "自增id")
    private Long id;

    @ApiModelProperty(value = "发起人id")
    private Long sponsorId;

    @ApiModelProperty(value = "发生地址")
    private String happenAddr;

    @ApiModelProperty(value = "地址备注")
    private String addrRemark;

    @ApiModelProperty(value = "状态 1待处理 2已处理")
    private Integer status;

    @ApiModelProperty(value = "处理人id")
    private Long handlerId;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "审核时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date examineAt;

    @ApiModelProperty(value = "详情")
    private String detail;

    @ApiModelProperty(value = "图片路径列表，逗号分隔")
    private String photoPathList;

    @ApiModelProperty(value = "处理结果")
    private String handleResult;

    @ApiModelProperty(value = "处理结果，图片路径列表，逗号分隔")
    private String handlePhotoList;

    @ApiModelProperty(value = "社区id")
    private Long communityId;

    @ApiModelProperty(value = "是否匿名发布 0 否 1 是")
    private Integer isHide;

    @ApiModelProperty(value = "是否需要反馈 0 不需要 1 需要")
    private Integer isNeedFeedBack;

    @ApiModelProperty(value = "反馈时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date feedbackAt;

    @ApiModelProperty(value = "驳回原因")
    private String rejectReason;

    @ApiModelProperty(value = "封面图片")
    private String cover;

    @ApiModelProperty(value = "是否删除 0 否 1 是")
    private Integer delTag;

    @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)")
    private Integer isReport;

    @ApiModelProperty(value = "是否公示(0.否 1.是)")
    private Integer isPublicity;


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("随手拍类型详细返回参数")
public class ComActEasyPhotoTypeDetailsVO {

    @ApiModelProperty(value = "主键id")
    private Long id;

    @ApiModelProperty(value = "随手拍类型名称")
    private String name;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("随手拍类型返回参数")
public class ComActEasyPhotoTypeVO {

    @ApiModelProperty(value = "主键id")
    private Long id;

    @ApiModelProperty(value = "随手拍类型名称")
    private String name;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("社区活动 》随手拍返回参数")
public class ComActEasyPhotoVO {

    @ApiModelProperty(value = "自增id")
    private Long id;

    @ApiModelProperty(value = "发起人id")
    private Long sponsorId;

    @ApiModelProperty(value = "发生地址")
    private String happenAddr;

    @ApiModelProperty(value = "地址备注")
    private String addrRemark;

//    @ApiModelProperty(value = "状态 1待处理 2已处理")
//    private Integer status;

    @ApiModelProperty(value = "处理人id")
    private Long handlerId;

    @ApiModelProperty(value = "处理人名字")
    private String handlerName;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "详情")
    private String detail;

    @ApiModelProperty(value = "图片路径列表，逗号分隔")
    private String photoPathList;

    @ApiModelProperty(value = "处理结果")
    private String handleResult;

    @ApiModelProperty(value = "处理结果，图片路径列表，逗号分隔")
    private String handlePhotoList;

    @ApiModelProperty(value = "社区id")
    private Long communityId;

    @ApiModelProperty(value = "是否匿名发布 0 否 1 是")
    private Integer isHide;

    @ApiModelProperty(value = "处理时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date feedbackAt;

//    @ApiModelProperty(value = "封面图片")
//    private String cover;

    @ApiModelProperty(value = "是否删除 0 否 1 是")
    private Integer delTag;

    @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)")
    private Integer isReport;

    @ApiModelProperty(value = "是否公示(0.否 1.是)")
    private Integer isPublicity;

    @ApiModelProperty(value = "发布人名称")
    private String nickName;

    @ApiModelProperty(value = "发布人头像")
    private String imageUrl;

    @ApiModelProperty(value = "随手拍类型列表")
    private List<String> easyPhotoList;

}

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

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

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

import java.util.List;

/**
 * 地图模块-网格详细信息
 */
@Data
@ApiModel("地图模块-网格详细信息")
public class ComMapGridDetailVO {

    @ApiModelProperty("网格id")
    private Long id;

    @ApiModelProperty("网格名称")
    private String gridName;

    @ApiModelProperty("网格面积")
    private String area;

    @ApiModelProperty("线条颜色")
    private String lineColor;

    @ApiModelProperty("线条宽度")
    private String lineBroadband;

    @ApiModelProperty("填充颜色")
    private String fillColor;

    @ApiModelProperty("备注")
    private String remarks;

    @ApiModelProperty("围栏数据")
    private String data;

    @ApiModelProperty("网格员待处理事件列表")
    private List<ComMapGridEventVO> gridEventList;
}

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

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

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

/**
 * 地图模块-事件信息
 */
@Data
@ApiModel("地图模块-事件信息")
public class ComMapGridEventVO {

    @ApiModelProperty("事件id")
    private Long id;

    @ApiModelProperty("事件类型(1.治安隐患 2.公共服务 3.矛盾纠纷 4.不稳定因素 5.突发事件 6.特殊人员上报 7.走访任务)")
    private String type;

    @ApiModelProperty("事件标题")
    private String eventTitle;

    @ApiModelProperty("发生地点")
    private String happentAddress;

    @ApiModelProperty("发生的精度纬度信息（逗号隔开）")
    private String happentLatLng;

}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("APP应用版本信息详细返回参数")
public class EventApplicationAppReleaseDetailsVO {

    @ApiModelProperty(value = "id")
    private Long id;

    @ApiModelProperty(value = "应用ID")
    private Integer productId;

    @ApiModelProperty(value = "应用名称")
    private String productName;

    @ApiModelProperty(value = "版本编号")
    private String releaseNumber;

    @ApiModelProperty(value = "通知行为(1、强制更新2、提示更新)")
    private Integer action;

    @ApiModelProperty(value = "版本地址")
    private String url;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "创建人")
    private Long createBy;


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("APP应用版本信息返回参数")
public class EventApplicationAppReleaseVO {

    @ApiModelProperty(value = "id")
    private Long id;

    @ApiModelProperty(value = "应用ID")
    private Integer productId;

    @ApiModelProperty(value = "应用名称")
    private String productName;

    @ApiModelProperty(value = "版本编号")
    private String releaseNumber;

    @ApiModelProperty(value = "通知行为(1、强制更新2、提示更新)")
    private Integer action;

    @ApiModelProperty(value = "版本地址")
    private String url;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "创建人")
    private Long createBy;


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("用户协议和隐私政策信息详细返回参数")
public class EventApplicationUserNoticeDetailsVO {

    @ApiModelProperty(value = "id")
    private Long id;

    @ApiModelProperty(value = "应用ID")
    private Integer productId;

    @ApiModelProperty(value = "应用名称")
    private String productName;

    @ApiModelProperty(value = "通知行为(1、强制通知必须手段确定2、提示更新，自动消退)")
    private Integer action;

    @ApiModelProperty(value = "内容")
    private String content;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "创建人")
    private Long createBy;


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("用户协议和隐私政策信息返回参数")
public class EventApplicationUserNoticeVO {

    @ApiModelProperty(value = "id")
    private Long id;

    @ApiModelProperty(value = "应用ID")
    private Integer productId;

    @ApiModelProperty(value = "应用名称")
    private String productName;

    @ApiModelProperty(value = "通知行为(1、强制通知必须手段确定2、提示更新，自动消退)")
    private Integer action;

    @ApiModelProperty(value = "内容")
    private String content;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "创建人")
    private Long createBy;


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("事件详细返回参数")
public class EventDetailsVO {

    @ApiModelProperty(value = "id")
    private Long id;

    @ApiModelProperty(value = "服务单号")
    private String orderSn;

    @ApiModelProperty(value = "1、办件事件2是宣传事件3是阅读事件")
    private Long eventCategory;

    @ApiModelProperty(value = "网格员所处的街道")
    private Long gridMemberStreet;

    @ApiModelProperty(value = "网格员所处社区")
    private Long gridMemberCommunity;

    @ApiModelProperty(value = "网格ID")
    private Long gridId;

    @ApiModelProperty(value = "网格员")
    private Long gridMemberId;

    @ApiModelProperty(value = "网格员名字")
    private String gridMemberName;

    @ApiModelProperty(value = "网格员联系方式")
    private String gridMemberTelephone;

    @ApiModelProperty(value = "事件标题")
    private String eventTitle;

    @ApiModelProperty(value = "宣传类型")
    private String propagandaType;

    @ApiModelProperty(value = "宣传时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date propagandaTime;

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

    @ApiModelProperty(value = "事件描述")
    private String eventDes;

    @ApiModelProperty(value = "宣传对象")
    private String propagandaObject;

    @ApiModelProperty(value = "宣传人数")
    private String propagandaNum;

    @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)")
    private Integer communityProcess;

    @ApiModelProperty(value = "发生时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date happenTime;

    @ApiModelProperty(value = "发生地点")
    private String happentAddress;

    @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）")
    private String happentLatLng;

    @ApiModelProperty(value = "事件状态（1草稿箱2发布3逻辑删除4、撤销）")
    private Integer eventStatus;

    @ApiModelProperty(value = "1待处理2已解决3待验证")
    private Integer eventProcessStatus;

    @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）")
    private Integer processType;

    @ApiModelProperty(value = "处理人ID")
    private Long processUserId;

    @ApiModelProperty(value = "处理人名称")
    private String processUserName;

    @ApiModelProperty(value = "处理时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date processDate;

    @ApiModelProperty(value = "解决人针对解决事件的处理描述")
    private String processDesc;

    @ApiModelProperty(value = "事件来源")
    private String eventResource;

    @ApiModelProperty(value = "危险级别")
    private Integer dangerLevel;

    @ApiModelProperty(value = "红牌")
    private Boolean redCard;

    @ApiModelProperty(value = "黄牌")
    private Boolean yellowCard;

    @ApiModelProperty(value = "是否有效")
    private Boolean invalid;

    @ApiModelProperty(value = "是否重大")
    private Boolean major;

    @ApiModelProperty(value = "死亡人数")
    private Integer deathsNumber;

    @ApiModelProperty(value = "受伤人数")
    private Integer injuriesNumber;

    @ApiModelProperty(value = "是否疑难事件")
    private Boolean difficult;

    @ApiModelProperty(value = "是否紧急")
    private Boolean urgent;

    @ApiModelProperty(value = "是否催办")
    private Boolean urgentDell;

    @ApiModelProperty(value = "上报提交时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date submitDate;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "修改人")
    private Long updateBy;

    @ApiModelProperty(value = "修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;


    @ApiModelProperty(value = "音频")
    private List<EventResourceVO> audios;

    @ApiModelProperty(value = "视频")
    private List<EventResourceVO> videos;

    @ApiModelProperty(value = "图片")
    private List<EventResourceVO> pics;


    @ApiModelProperty(value = "事件处理数据")
    private List<EventTransferRecordVO> trans;



}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("区县/街道/社区/网格员网格数据管理详细返回参数")
public class EventGridDataDetailsVO {

    @ApiModelProperty(value = "主键ID")
    private Long id;

    @ApiModelProperty(value = "类型，1、区县网格2街道网格3社区网格")
    private Long type;

    @ApiModelProperty(value = "区/县ID")
    private Long zoneId;

    @ApiModelProperty(value = "网格所属街道")
    private Long gridStreetId;

    @ApiModelProperty(value = "网格所属社区ID")
    private Long gridCommunityId;

    @ApiModelProperty(value = "网格名称")
    private String gridName;

    @ApiModelProperty(value = "所属图层")
    private Integer mapLevel;

    @ApiModelProperty(value = "面积")
    private String area;

    @ApiModelProperty(value = "线条颜色")
    private String lineColor;

    @ApiModelProperty(value = "线条宽度")
    private String lineBroadband;

    @ApiModelProperty(value = "填充颜色")
    private String fillColor;

    @ApiModelProperty(value = "备注")
    private String remarks;

    @ApiModelProperty(value = "围栏数据")
    private String data;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "修改人")
    private Long updateBy;

    @ApiModelProperty(value = "修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("区县/街道/社区/网格员网格数据管理返回参数")
public class EventGridDataVO {

    @ApiModelProperty(value = "主键ID")
    private Long id;

    @ApiModelProperty(value = "类型，1、区县网格2街道网格3社区网格")
    private Long type;

    @ApiModelProperty(value = "区/县ID")
    private Long zoneId;

    @ApiModelProperty(value = "网格所属街道")
    private Long gridStreetId;

    @ApiModelProperty(value = "网格所属社区ID")
    private Long gridCommunityId;

    @ApiModelProperty(value = "网格名称")
    private String gridName;

    @ApiModelProperty(value = "所属图层")
    private Integer mapLevel;

    @ApiModelProperty(value = "面积")
    private String area;

    @ApiModelProperty(value = "线条颜色")
    private String lineColor;

    @ApiModelProperty(value = "线条宽度")
    private String lineBroadband;

    @ApiModelProperty(value = "填充颜色")
    private String fillColor;

    @ApiModelProperty(value = "备注")
    private String remarks;

    @ApiModelProperty(value = "围栏数据")
    private String data;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "修改人")
    private Long updateBy;

    @ApiModelProperty(value = "修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("网格员定时上报地理信息详细返回参数")
public class EventGridMemberGpsLogDetailsVO {

    @ApiModelProperty(value = "主键ID")
    private Long id;

    @ApiModelProperty(value = "网格所属街道")
    private Long gridStreetId;

    @ApiModelProperty(value = "网格所属社区ID")
    private Long gridCommunityId;

    @ApiModelProperty(value = "网格ID")
    private Long gridId;

    @ApiModelProperty(value = "网格名称")
    private String gridName;

    @ApiModelProperty(value = "网格员ID")
    private Long gridMemberId;

    @ApiModelProperty(value = "精度维度信息，逗号分割")
    private String lngLat;

    @ApiModelProperty(value = "位置信息状态（1、为判定2、正常3、是不正常）")
    private Integer positionStation;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("网格员定时上报地理信息返回参数")
public class EventGridMemberGpsLogVO {

    @ApiModelProperty(value = "主键ID")
    private Long id;

    @ApiModelProperty(value = "网格所属街道")
    private Long gridStreetId;

    @ApiModelProperty(value = "网格所属社区ID")
    private Long gridCommunityId;

    @ApiModelProperty(value = "网格ID")
    private Long gridId;

    @ApiModelProperty(value = "网格名称")
    private String gridName;

    @ApiModelProperty(value = "网格员ID")
    private Long gridMemberId;

    @ApiModelProperty(value = "精度维度信息，逗号分割")
    private String lngLat;

    @ApiModelProperty(value = "位置信息状态（1、为判定2、正常3、是不正常）")
    private Integer positionStation;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("网格和网格员的关联关系详细返回参数")
public class EventGridMemberRelationDetailsVO {

    @ApiModelProperty(value = "主键ID")
    private Long id;

    @ApiModelProperty(value = "网格所属街道")
    private Long gridStreetId;

    @ApiModelProperty(value = "网格所属社区ID")
    private Long gridCommunityId;

    @ApiModelProperty(value = "网格ID")
    private Long gridId;

    @ApiModelProperty(value = "网格名称")
    private String gridName;

    @ApiModelProperty(value = "网格员ID")
    private Long gridMemberId;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("网格和网格员的关联关系返回参数")
public class EventGridMemberRelationVO {

    @ApiModelProperty(value = "主键ID")
    private Long id;

    @ApiModelProperty(value = "网格所属街道")
    private Long gridStreetId;

    @ApiModelProperty(value = "网格所属社区ID")
    private Long gridCommunityId;

    @ApiModelProperty(value = "网格ID")
    private Long gridId;

    @ApiModelProperty(value = "网格名称")
    private String gridName;

    @ApiModelProperty(value = "网格员ID")
    private Long gridMemberId;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("网格员定时上报地理预警记录详细返回参数")
public class EventGridMemberWarnLogDetailsVO {

    @ApiModelProperty(value = "主键ID")
    private Long id;

    @ApiModelProperty(value = "网格所属街道")
    private Long gridStreetId;

    @ApiModelProperty(value = "网格所属社区ID")
    private Long gridCommunityId;

    @ApiModelProperty(value = "网格ID")
    private Long gridId;

    @ApiModelProperty(value = "网格名称")
    private String gridName;

    @ApiModelProperty(value = "网格员ID")
    private Long gridMemberId;

    @ApiModelProperty(value = "精度维度信息，逗号分割")
    private String lngLat;

    @ApiModelProperty(value = "预警信息内容")
    private String content;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("网格员定时上报地理预警记录返回参数")
public class EventGridMemberWarnLogVO {

    @ApiModelProperty(value = "主键ID")
    private Long id;

    @ApiModelProperty(value = "网格所属街道")
    private Long gridStreetId;

    @ApiModelProperty(value = "网格所属社区ID")
    private Long gridCommunityId;

    @ApiModelProperty(value = "网格ID")
    private Long gridId;

    @ApiModelProperty(value = "网格名称")
    private String gridName;

    @ApiModelProperty(value = "网格员ID")
    private Long gridMemberId;

    @ApiModelProperty(value = "精度维度信息，逗号分割")
    private String lngLat;

    @ApiModelProperty(value = "预警信息内容")
    private String content;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("重点人群记录详细返回参数")
public class EventMainMemberDetailsVO {

    @ApiModelProperty(value = "id")
    private Long id;

    @ApiModelProperty(value = "网格员所处的街道")
    private Long gridMemberStreet;

    @ApiModelProperty(value = "网格员所处社区")
    private Long gridMemberCommunity;

    @ApiModelProperty(value = "网格员")
    private Long gridMember;

    @ApiModelProperty(value = "网格员名字")
    private String gridMemberName;

    @ApiModelProperty(value = "网格员联系方式")
    private String gridMemberTele;

    @ApiModelProperty(value = "需走访人ID")
    private Long visiterId;

    @ApiModelProperty(value = "需走访人名字")
    private String visiterName;

    @ApiModelProperty(value = "需走访人员性别")
    private Integer visiterSex;

    @ApiModelProperty(value = "需走访人电话")
    private String visiterTele;

    @ApiModelProperty(value = "需走访人居住地址")
    private String visiterAddress;

    @ApiModelProperty(value = "需走访人地址精度纬度信息（逗号隔开）")
    private String visiterAddressLatLng;

    @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员")
    private Integer visiterType;

    @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)")
    private Integer actOpara;

    @ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）")
    private Integer eventStatus;

    @ApiModelProperty(value = "上报状态")
    private Integer reporting;

    @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）")
    private Integer dellType;

    @ApiModelProperty(value = "处理人ID")
    private Long dellUserId;

    @ApiModelProperty(value = "处理人名称")
    private String dellUserName;

    @ApiModelProperty(value = "处理时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date dellDate;

    @ApiModelProperty(value = "解决人针对解决事件的处理描述")
    private String dellDesc;

    @ApiModelProperty(value = "是否有效")
    private Boolean invalid;

    @ApiModelProperty(value = "是否紧急")
    private Boolean urgent;

    @ApiModelProperty(value = "是否催办")
    private Boolean urgentDell;

    @ApiModelProperty(value = "上报提交时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date submitDate;

    @ApiModelProperty(value = "走访频率配置，一个月几次")
    private String visiterConfig;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建事件")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "修改人")
    private Long updateBy;

    @ApiModelProperty(value = "修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("重点人群记录返回参数")
public class EventMainMemberVO {

    @ApiModelProperty(value = "id")
    private Long id;

    @ApiModelProperty(value = "网格员所处的街道")
    private Long gridMemberStreet;

    @ApiModelProperty(value = "网格员所处社区")
    private Long gridMemberCommunity;

    @ApiModelProperty(value = "网格员")
    private Long gridMember;

    @ApiModelProperty(value = "网格员名字")
    private String gridMemberName;

    @ApiModelProperty(value = "网格员联系方式")
    private String gridMemberTele;

    @ApiModelProperty(value = "需走访人ID")
    private Long visiterId;

    @ApiModelProperty(value = "需走访人名字")
    private String visiterName;

    @ApiModelProperty(value = "需走访人员性别")
    private Integer visiterSex;

    @ApiModelProperty(value = "需走访人电话")
    private String visiterTele;

    @ApiModelProperty(value = "需走访人居住地址")
    private String visiterAddress;

    @ApiModelProperty(value = "需走访人地址精度纬度信息（逗号隔开）")
    private String visiterAddressLatLng;

    @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员")
    private Integer visiterType;

    @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)")
    private Integer actOpara;

    @ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）")
    private Integer eventStatus;

    @ApiModelProperty(value = "上报状态")
    private Integer reporting;

    @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）")
    private Integer dellType;

    @ApiModelProperty(value = "处理人ID")
    private Long dellUserId;

    @ApiModelProperty(value = "处理人名称")
    private String dellUserName;

    @ApiModelProperty(value = "处理时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date dellDate;

    @ApiModelProperty(value = "解决人针对解决事件的处理描述")
    private String dellDesc;

    @ApiModelProperty(value = "是否有效")
    private Boolean invalid;

    @ApiModelProperty(value = "是否紧急")
    private Boolean urgent;

    @ApiModelProperty(value = "是否催办")
    private Boolean urgentDell;

    @ApiModelProperty(value = "上报提交时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date submitDate;

    @ApiModelProperty(value = "走访频率配置，一个月几次")
    private String visiterConfig;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建事件")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "修改人")
    private Long updateBy;

    @ApiModelProperty(value = "修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;


}

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

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

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

/**
 * 地图模块-网格员绑定的网格信息
 */
@Data
@ApiModel("地图模块-网格员绑定的网格信息")
public class EventMapGridVO {

    @ApiModelProperty("网格id")
    private Long gridId;

    @ApiModelProperty("网格名字")
    private String gridName;

}

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

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

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

/**
 * 地图模块-网格员运动轨迹返回参数
 */
@Data
@ApiModel("地图模块-网格员运动轨迹返回参数")
public class EventMapTrajectoryVO {

    @ApiModelProperty("运动轨迹id")
    private Long id;

    @ApiModelProperty("运动轨迹经纬度")
    private String lngLat;

}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("事件或者走访中关联的图片音频和视频文件详细返回参数")
public class EventResourceDetailsVO {

    @ApiModelProperty(value = "分类（1、事件 2、走访）")
    private Integer classification;

    @ApiModelProperty(value = "事件或者走访任务关联ID")
    private Long id;

    @ApiModelProperty(value = "事件上传的资源类型(1是图片2是音频3是是视频)")
    private Integer type;

    @ApiModelProperty(value = "资源名称")
    private String resourceName;

    @ApiModelProperty(value = "资源大小")
    private String resourceSize;

    @ApiModelProperty(value = "事件上传的资源URL地址")
    private String url;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("事件或者走访中关联的图片音频和视频文件返回参数")
public class EventResourceVO {

    @ApiModelProperty(value = "分类（1、事件 2、走访 3、事件流转））")
    private Integer classification;

    @ApiModelProperty(value = "事件或者走访任务关联ID")
    private Long id;

    @ApiModelProperty(value = "事件上传的资源类型(1是图片2是音频3是是视频)")
    private Integer type;

    @ApiModelProperty(value = "资源名称")
    private String resourceName;

    @ApiModelProperty(value = "资源大小")
    private String resourceSize;

    @ApiModelProperty(value = "事件上传的资源URL地址")
    private String url;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("事件处理流转记录详细返回参数")
public class EventTransferRecordDetailsVO {

    @ApiModelProperty(value = "id")
    private Long id;

    @ApiModelProperty(value = "事件ID")
    private Long eventId;

    @ApiModelProperty(value = "来源类型（1、网格员2、社区3、是街道）")
    private Integer fromType;

    @ApiModelProperty(value = "事件来源机构或网格员")
    private Long from;

    @ApiModelProperty(value = "转交办理人路径名称")
    private String fromName;

    @ApiModelProperty(value = "转交类型（1、网格员2、社区3、是街道）")
    private Integer toType;

    @ApiModelProperty(value = "事件下游机构或网格员")
    private Long to;

    @ApiModelProperty(value = "需要办理人路径名称")
    private String toName;

    @ApiModelProperty(value = "处理结果")
    private String processResult;

    @ApiModelProperty(value = "处理时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date processDate;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("事件处理流转记录返回参数")
public class EventTransferRecordVO {

    @ApiModelProperty(value = "id")
    private Long id;

    @ApiModelProperty(value = "事件ID")
    private Long eventId;

    @ApiModelProperty(value = "来源类型（1、网格员2、社区3、是街道）")
    private Integer fromType;

    @ApiModelProperty(value = "事件来源机构或网格员")
    private Long from;

    @ApiModelProperty(value = "转交办理人路径名称")
    private String fromName;

    @ApiModelProperty(value = "转交类型（1、网格员2、社区3、是街道）")
    private Integer toType;

    @ApiModelProperty(value = "事件下游机构或网格员")
    private Long toId;

    @ApiModelProperty(value = "需要办理人路径名称")
    private String toName;

    @ApiModelProperty(value = "处理结果")
    private String processResult;

    @ApiModelProperty(value = "处理时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date processDate;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "音频")
    private List<EventResourceVO> audios;

    @ApiModelProperty(value = "视频")
    private List<EventResourceVO> videos;

    @ApiModelProperty(value = "图片")
    private List<EventResourceVO> pics;

}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("事件返回参数")
public class EventVO {

    @ApiModelProperty(value = "id")
    private Long id;

    @ApiModelProperty(value = "服务单号")
    private String orderSn;

    @ApiModelProperty(value = "1、办件事件2是宣传事件3是阅读事件")
    private Long eventCategory;

    @ApiModelProperty(value = "网格员所处的街道")
    private Long gridMemberStreet;

    @ApiModelProperty(value = "网格员所处社区")
    private Long gridMemberCommunity;

    @ApiModelProperty(value = "网格ID")
    private Long gridId;

    @ApiModelProperty(value = "网格员")
    private Long gridMemberId;

    @ApiModelProperty(value = "网格员名字")
    private String gridMemberName;

    @ApiModelProperty(value = "网格员联系方式")
    private String gridMemberTelephone;

    @ApiModelProperty(value = "事件标题")
    private String eventTitle;

    @ApiModelProperty(value = "宣传类型")
    private String propagandaType;

    @ApiModelProperty(value = "宣传时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date propagandaTime;

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

    @ApiModelProperty(value = "事件描述")
    private String eventDes;

    @ApiModelProperty(value = "宣传对象")
    private String propagandaObject;

    @ApiModelProperty(value = "宣传人数")
    private String propagandaNum;

    @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)")
    private Integer communityProcess;

    @ApiModelProperty(value = "发生时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date happenTime;

    @ApiModelProperty(value = "发生地点")
    private String happentAddress;

    @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）")
    private String happentLatLng;

    @ApiModelProperty(value = "事件状态（1草稿箱2发布3逻辑删除4、撤销）")
    private Integer eventStatus;

    @ApiModelProperty(value = "1待处理2已解决3待验证")
    private Integer eventProcessStatus;

    @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）")
    private Integer processType;

    @ApiModelProperty(value = "处理人ID")
    private Long processUserId;

    @ApiModelProperty(value = "处理人名称")
    private String processUserName;

    @ApiModelProperty(value = "处理时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date processDate;

    @ApiModelProperty(value = "解决人针对解决事件的处理描述")
    private String processDesc;

    @ApiModelProperty(value = "事件来源")
    private String eventResource;

    @ApiModelProperty(value = "危险级别")
    private Integer dangerLevel;

    @ApiModelProperty(value = "红牌")
    private Boolean redCard;

    @ApiModelProperty(value = "黄牌")
    private Boolean yellowCard;

    @ApiModelProperty(value = "是否有效")
    private Boolean invalid;

    @ApiModelProperty(value = "是否重大")
    private Boolean major;

    @ApiModelProperty(value = "死亡人数")
    private Integer deathsNumber;

    @ApiModelProperty(value = "受伤人数")
    private Integer injuriesNumber;

    @ApiModelProperty(value = "是否疑难事件")
    private Boolean difficult;

    @ApiModelProperty(value = "是否紧急")
    private Boolean urgent;

    @ApiModelProperty(value = "是否催办")
    private Boolean urgentDell;

    @ApiModelProperty(value = "上报提交时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date submitDate;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "修改人")
    private Long updateBy;

    @ApiModelProperty(value = "修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;

    @ApiModelProperty(value = "音频")
    private List<EventResourceVO> audios;

    @ApiModelProperty(value = "视频")
    private List<EventResourceVO> videos;

    @ApiModelProperty(value = "图片")
    private List<EventResourceVO> pics;


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("重点人群走访记录详细返回参数")
public class EventVisitingTasksDetailsVO {

    @ApiModelProperty(value = "id")
    private Long id;

    @ApiModelProperty(value = "网格员所处的街道")
    private Long gridMemberStreet;

    @ApiModelProperty(value = "网格员所处社区")
    private Long gridMemberCommunity;

    @ApiModelProperty(value = "网格员")
    private Long gridMember;

    @ApiModelProperty(value = "网格员名字")
    private String gridMemberName;

    @ApiModelProperty(value = "网格员联系方式")
    private String gridMenberTele;

    @ApiModelProperty(value = "需走访人ID")
    private Long visiterId;

    @ApiModelProperty(value = "需走访人名字")
    private String visiterName;

    @ApiModelProperty(value = "需走访人员性别")
    private Integer visiterSex;

    @ApiModelProperty(value = "需走访人电话")
    private String visiterTele;

    @ApiModelProperty(value = "需走访人居住地址")
    private String visiterAddress;

    @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员")
    private Integer visiterType;

    @ApiModelProperty(value = "事件标题")
    private String eventTitle;

    @ApiModelProperty(value = "事件类型")
    private Integer eventType;

    @ApiModelProperty(value = "事件描述")
    private String eventDes;

    @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)")
    private Integer actOpara;

    @ApiModelProperty(value = "发生时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date happenTime;

    @ApiModelProperty(value = "发生地点")
    private String happentAddress;

    @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）")
    private String happentLatLng;

    @ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）")
    private Integer eventStatus;

    @ApiModelProperty(value = "上报状态")
    private Integer reporting;

    @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）")
    private Integer dellType;

    @ApiModelProperty(value = "处理人ID")
    private Long dellUserId;

    @ApiModelProperty(value = "处理人名称")
    private String dellUserName;

    @ApiModelProperty(value = "处理时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date dellDate;

    @ApiModelProperty(value = "解决人针对解决事件的处理描述")
    private String dellDesc;

    @ApiModelProperty(value = "是否有效")
    private Boolean invalid;

    @ApiModelProperty(value = "是否紧急")
    private Boolean urgent;

    @ApiModelProperty(value = "是否催办")
    private Boolean urgentDell;

    @ApiModelProperty(value = "上报提交时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date submitDate;

    @ApiModelProperty(value = "是否异常行为")
    private Boolean exception;

    @ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据")
    private String tableContentJson;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建事件")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "修改人")
    private Long updateBy;

    @ApiModelProperty(value = "修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;


}

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

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("重点人群走访记录返回参数")
public class EventVisitingTasksVO {

    @ApiModelProperty(value = "id")
    private Long id;

    @ApiModelProperty(value = "网格员所处的街道")
    private Long gridMemberStreet;

    @ApiModelProperty(value = "网格员所处社区")
    private Long gridMemberCommunity;

    @ApiModelProperty(value = "网格员")
    private Long gridMember;

    @ApiModelProperty(value = "网格员名字")
    private String gridMemberName;

    @ApiModelProperty(value = "网格员联系方式")
    private String gridMenberTele;

    @ApiModelProperty(value = "需走访人ID")
    private Long visiterId;

    @ApiModelProperty(value = "需走访人名字")
    private String visiterName;

    @ApiModelProperty(value = "需走访人员性别")
    private Integer visiterSex;

    @ApiModelProperty(value = "需走访人电话")
    private String visiterTele;

    @ApiModelProperty(value = "需走访人居住地址")
    private String visiterAddress;

    @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员")
    private Integer visiterType;

    @ApiModelProperty(value = "事件标题")
    private String eventTitle;

    @ApiModelProperty(value = "事件类型")
    private Integer eventType;

    @ApiModelProperty(value = "事件描述")
    private String eventDes;

    @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)")
    private Integer actOpara;

    @ApiModelProperty(value = "发生时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date happenTime;

    @ApiModelProperty(value = "发生地点")
    private String happentAddress;

    @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）")
    private String happentLatLng;

    @ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）")
    private Integer eventStatus;

    @ApiModelProperty(value = "上报状态")
    private Integer reporting;

    @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）")
    private Integer dellType;

    @ApiModelProperty(value = "处理人ID")
    private Long dellUserId;

    @ApiModelProperty(value = "处理人名称")
    private String dellUserName;

    @ApiModelProperty(value = "处理时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date dellDate;

    @ApiModelProperty(value = "解决人针对解决事件的处理描述")
    private String dellDesc;

    @ApiModelProperty(value = "是否有效")
    private Boolean invalid;

    @ApiModelProperty(value = "是否紧急")
    private Boolean urgent;

    @ApiModelProperty(value = "是否催办")
    private Boolean urgentDell;

    @ApiModelProperty(value = "上报提交时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date submitDate;

    @ApiModelProperty(value = "是否异常行为")
    private Boolean exception;

    @ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据")
    private String tableContentJson;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建事件")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "修改人")
    private Long updateBy;

    @ApiModelProperty(value = "修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;


}

 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/auth/TokenService.java

@@ -63,4 +63,22 @@
     */
    @PostMapping("/loginShopBackStage")
    R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password")String password);

    /**
     * 网格综治APP登录
     * @param account 账户
     * @param password 密码
     * @return 登录结果
     */
    @PostMapping("/loginGridApp")
    R loginGridApp(@RequestParam("account") String account, @RequestParam("password")String password);

    /**
     * 网格综治后台登录
     * @param account 账户
     * @param password 密码
     * @return 登录结果
     */
    @PostMapping("/loginGridBackstage")
    R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password")String password);
}

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

New file
@@ -0,0 +1,670 @@
package com.panzhihua.common.service.grid;

import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.grid.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@FeignClient(name = "grid")
public interface GridService {

    /**
     * 新增事件
     * @param eventAddDTO
     * @return 新增结果
     */
    @PostMapping("/event/add")
    R add(@RequestBody EventAddDTO eventAddDTO);

    /**
     * 修改事件
     * @param eventEditDTO
     * @return 维护结果
     */
    @PostMapping("/event/edit")
    R edit(@RequestBody EventEditDTO eventEditDTO);

    /**
     * 分页查找事件
     * @param pageEventDTO
     * @return 维护结果
     */
    @PostMapping("/event/page")
    R query(@RequestBody PageEventDTO pageEventDTO);

    /**
     * 删除事件
     * @param eventDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/event/delete")
    R delete(@RequestBody EventDeleteDTO eventDeleteDTO);

    /**
     * 查询事件详细信息
     * @param id 事件 id
     * @return 查找结果
     */
    @PostMapping("/event/{id}")
    R<EventDetailsVO> eventDetails(@PathVariable("id") Long id);

    /**
     * 新增网格和网格员的关联关系
     * @param eventGridMemberRelationAddDTO
     * @return 新增结果
     */
    @PostMapping("/eventgridmemberrelation/add")
    R add(@RequestBody EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO);

    /**
     * 修改网格和网格员的关联关系
     * @param eventGridMemberRelationEditDTO
     * @return 维护结果
     */
    @PostMapping("/eventgridmemberrelation/edit")
    R edit(@RequestBody EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO);

    /**
     * 分页查找网格和网格员的关联关系
     * @param pageEventGridMemberRelationDTO
     * @return 维护结果
     */
    @PostMapping("/eventgridmemberrelation/page")
    R query(@RequestBody PageEventGridMemberRelationDTO pageEventGridMemberRelationDTO);

    /**
     * 删除网格和网格员的关联关系
     * @param eventGridMemberRelationDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/eventgridmemberrelation/delete")
    R delete(@RequestBody EventGridMemberRelationDeleteDTO eventGridMemberRelationDeleteDTO);

    /**
     * 查询网格和网格员的关联关系详细信息
     * @param id 网格和网格员的关联关系 id
     * @return 查找结果
     */
    @PostMapping("/eventgridmemberrelation/{id}")
    R<EventGridMemberRelationDetailsVO> eventGridMemberRelationDetails(@PathVariable("id") Long id);
	
	
    /**
     * 新增网格员定时上报地理预警记录
     * @param eventGridMemberWarnLogAddDTO
     * @return 新增结果
     */
    @PostMapping("/eventgridmemberwarnlog/add")
    R add(@RequestBody EventGridMemberWarnLogAddDTO eventGridMemberWarnLogAddDTO);

    /**
     * 修改网格员定时上报地理预警记录
     * @param eventGridMemberWarnLogEditDTO
     * @return 维护结果
     */
    @PostMapping("/eventgridmemberwarnlog/edit")
    R edit(@RequestBody EventGridMemberWarnLogEditDTO eventGridMemberWarnLogEditDTO);

    /**
     * 分页查找网格员定时上报地理预警记录
     * @param pageEventGridMemberWarnLogDTO
     * @return 维护结果
     */
    @PostMapping("/eventgridmemberwarnlog/page")
    R query(@RequestBody PageEventGridMemberWarnLogDTO pageEventGridMemberWarnLogDTO);

    /**
     * 删除网格员定时上报地理预警记录
     * @param eventGridMemberWarnLogDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/eventgridmemberwarnlog/delete")
    R delete(@RequestBody EventGridMemberWarnLogDeleteDTO eventGridMemberWarnLogDeleteDTO);

    /**
     * 查询网格员定时上报地理预警记录详细信息
     * @param id 网格员定时上报地理预警记录 id
     * @return 查找结果
     */
    @PostMapping("/eventgridmemberwarnlog/{id}")
    R<EventGridMemberWarnLogDetailsVO> eventGridMemberWarnLogDetails(@PathVariable("id") Long id);
	
	
    /**
     * 新增重点人群记录
     * @param eventMainMemberAddDTO
     * @return 新增结果
     */
    @PostMapping("/eventmainmember/add")
    R add(@RequestBody EventMainMemberAddDTO eventMainMemberAddDTO);

    /**
     * 修改重点人群记录
     * @param eventMainMemberEditDTO
     * @return 维护结果
     */
    @PostMapping("/eventmainmember/edit")
    R edit(@RequestBody EventMainMemberEditDTO eventMainMemberEditDTO);

    /**
     * 分页查找重点人群记录
     * @param pageEventMainMemberDTO
     * @return 维护结果
     */
    @PostMapping("/eventmainmember/page")
    R query(@RequestBody PageEventMainMemberDTO pageEventMainMemberDTO);

    /**
     * 删除重点人群记录
     * @param eventMainMemberDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/eventmainmember/delete")
    R delete(@RequestBody EventMainMemberDeleteDTO eventMainMemberDeleteDTO);

    /**
     * 查询重点人群记录详细信息
     * @param id 重点人群记录 id
     * @return 查找结果
     */
    @PostMapping("/eventmainmember/{id}")
    R<EventMainMemberDetailsVO> eventMainMemberDetails(@PathVariable("id") Long id);


    /**
     * 新增事件或者走访中关联的图片音频和视频文件
     * @param eventResourceAddDTO
     * @return 新增结果
     */
    @PostMapping("/eventresource/add")
    R add(@RequestBody EventResourceAddDTO eventResourceAddDTO);

    /**
     * 修改事件或者走访中关联的图片音频和视频文件
     * @param eventResourceEditDTO
     * @return 维护结果
     */
    @PostMapping("/eventresource/edit")
    R edit(@RequestBody EventResourceEditDTO eventResourceEditDTO);

    /**
     * 分页查找事件或者走访中关联的图片音频和视频文件
     * @param pageEventResourceDTO
     * @return 维护结果
     */
    @PostMapping("/eventresource/page")
    R query(@RequestBody PageEventResourceDTO pageEventResourceDTO);

    /**
     * 删除事件或者走访中关联的图片音频和视频文件
     * @param eventResourceDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/eventresource/delete")
    R delete(@RequestBody EventResourceDeleteDTO eventResourceDeleteDTO);

    /**
     * 查询事件或者走访中关联的图片音频和视频文件详细信息
     * @param id 事件或者走访中关联的图片音频和视频文件 id
     * @return 查找结果
     */
    @PostMapping("/eventresource/{id}")
    R<EventResourceDetailsVO> eventResourceDetails(@PathVariable("id") Long id);
	
	
    /**
     * 新增事件处理流转记录
     * @param eventTransferRecordAddDTO
     * @return 新增结果
     */
    @PostMapping("/eventtransferrecord/add")
    R add(@RequestBody EventTransferRecordAddDTO eventTransferRecordAddDTO);

    /**
     * 修改事件处理流转记录
     * @param eventTransferRecordEditDTO
     * @return 维护结果
     */
    @PostMapping("/eventtransferrecord/edit")
    R edit(@RequestBody EventTransferRecordEditDTO eventTransferRecordEditDTO);

    /**
     * 分页查找事件处理流转记录
     * @param pageEventTransferRecordDTO
     * @return 维护结果
     */
    @PostMapping("/eventtransferrecord/page")
    R query(@RequestBody PageEventTransferRecordDTO pageEventTransferRecordDTO);

    /**
     * 删除事件处理流转记录
     * @param eventTransferRecordDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/eventtransferrecord/delete")
    R delete(@RequestBody EventTransferRecordDeleteDTO eventTransferRecordDeleteDTO);

    /**
     * 查询事件处理流转记录详细信息
     * @param id 事件处理流转记录 id
     * @return 查找结果
     */
    @PostMapping("/eventtransferrecord/{id}")
    R<EventTransferRecordDetailsVO> eventTransferRecordDetails(@PathVariable("id") Long id);
	
	
    /**
     * 新增重点人群走访记录
     * @param eventVisitingTasksAddDTO
     * @return 新增结果
     */
    @PostMapping("/eventvisitingtasks/add")
    R add(@RequestBody EventVisitingTasksAddDTO eventVisitingTasksAddDTO);

    /**
     * 修改重点人群走访记录
     * @param eventVisitingTasksEditDTO
     * @return 维护结果
     */
    @PostMapping("/eventvisitingtasks/edit")
    R edit(@RequestBody EventVisitingTasksEditDTO eventVisitingTasksEditDTO);

    /**
     * 分页查找重点人群走访记录
     * @param pageEventVisitingTasksDTO
     * @return 维护结果
     */
    @PostMapping("/eventvisitingtasks/page")
    R query(@RequestBody PageEventVisitingTasksDTO pageEventVisitingTasksDTO);

    /**
     * 删除重点人群走访记录
     * @param eventVisitingTasksDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/eventvisitingtasks/delete")
    R delete(@RequestBody EventVisitingTasksDeleteDTO eventVisitingTasksDeleteDTO);

    /**
     * 查询重点人群走访记录详细信息
     * @param id 重点人群走访记录 id
     * @return 查找结果
     */
    @PostMapping("/eventvisitingtasks/{id}")
    R<EventVisitingTasksDetailsVO> eventVisitingTasksDetails(@PathVariable("id") Long id);

    /**
     * 新增APP应用版本信息
     * @param eventApplicationAppReleaseAddDTO
     * @return 新增结果
     */
    @PostMapping("/eventapplicationapprelease/add")
    R add(@RequestBody EventApplicationAppReleaseAddDTO eventApplicationAppReleaseAddDTO);

    /**
     * 修改APP应用版本信息
     * @param eventApplicationAppReleaseEditDTO
     * @return 维护结果
     */
    @PostMapping("/eventapplicationapprelease/edit")
    R edit(@RequestBody EventApplicationAppReleaseEditDTO eventApplicationAppReleaseEditDTO);

    /**
     * 分页查找APP应用版本信息
     * @param pageEventApplicationAppReleaseDTO
     * @return 维护结果
     */
    @PostMapping("/eventapplicationapprelease/page")
    R query(@RequestBody PageEventApplicationAppReleaseDTO pageEventApplicationAppReleaseDTO);

    /**
     * 删除APP应用版本信息
     * @param eventApplicationAppReleaseDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/eventapplicationapprelease/delete")
    R delete(@RequestBody EventApplicationAppReleaseDeleteDTO eventApplicationAppReleaseDeleteDTO);

    /**
     * 查询APP应用版本信息详细信息
     * @param id APP应用版本信息 id
     * @return 查找结果
     */
    @PostMapping("/eventapplicationapprelease/{id}")
    R<EventApplicationAppReleaseDetailsVO> eventApplicationAppReleaseDetails(@PathVariable("id") Long id);

    /**
     * 新增用户协议和隐私政策信息
     * @param eventApplicationUserNoticeAddDTO
     * @return 新增结果
     */
    @PostMapping("/eventapplicationusernotice/add")
    R add(@RequestBody EventApplicationUserNoticeAddDTO eventApplicationUserNoticeAddDTO);

    /**
     * 修改用户协议和隐私政策信息
     * @param eventApplicationUserNoticeEditDTO
     * @return 维护结果
     */
    @PostMapping("/eventapplicationusernotice/edit")
    R edit(@RequestBody EventApplicationUserNoticeEditDTO eventApplicationUserNoticeEditDTO);

    /**
     * 分页查找用户协议和隐私政策信息
     * @param pageEventApplicationUserNoticeDTO
     * @return 维护结果
     */
    @PostMapping("/eventapplicationusernotice/page")
    R query(@RequestBody PageEventApplicationUserNoticeDTO pageEventApplicationUserNoticeDTO);

    /**
     * 删除用户协议和隐私政策信息
     * @param eventApplicationUserNoticeDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/eventapplicationusernotice/delete")
    R delete(@RequestBody EventApplicationUserNoticeDeleteDTO eventApplicationUserNoticeDeleteDTO);

    /**
     * 查询用户协议和隐私政策信息详细信息
     * @param id 用户协议和隐私政策信息 id
     * @return 查找结果
     */
    @PostMapping("/eventapplicationusernotice/{id}")
    R<EventApplicationUserNoticeDetailsVO> eventApplicationUserNoticeDetails(@PathVariable("id") Long id);

    /**
     * 新增区县/街道/社区/网格员网格数据管理
     * @param eventGridDataAddDTO
     * @return 新增结果
     */
    @PostMapping("/eventgriddata/add")
    R add(@RequestBody EventGridDataAddDTO eventGridDataAddDTO);

    /**
     * 修改区县/街道/社区/网格员网格数据管理
     * @param eventGridDataEditDTO
     * @return 维护结果
     */
    @PostMapping("/eventgriddata/edit")
    R edit(@RequestBody EventGridDataEditDTO eventGridDataEditDTO);

    /**
     * 分页查找区县/街道/社区/网格员网格数据管理
     * @param pageEventGridDataDTO
     * @return 维护结果
     */
    @PostMapping("/eventgriddata/page")
    R query(@RequestBody PageEventGridDataDTO pageEventGridDataDTO);

    /**
     * 删除区县/街道/社区/网格员网格数据管理
     * @param eventGridDataDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/eventgriddata/delete")
    R delete(@RequestBody EventGridDataDeleteDTO eventGridDataDeleteDTO);

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

    /**
     * 新增网格员定时上报地理信息
     * @param eventGridMemberGpsLogAddDTO
     * @return 新增结果
     */
    @PostMapping("/eventgridmembergpslog/add")
    R add(@RequestBody EventGridMemberGpsLogAddDTO eventGridMemberGpsLogAddDTO);

    /**
     * 修改网格员定时上报地理信息
     * @param eventGridMemberGpsLogEditDTO
     * @return 维护结果
     */
    @PostMapping("/eventgridmembergpslog/edit")
    R edit(@RequestBody EventGridMemberGpsLogEditDTO eventGridMemberGpsLogEditDTO);

    /**
     * 分页查找网格员定时上报地理信息
     * @param pageEventGridMemberGpsLogDTO
     * @return 维护结果
     */
    @PostMapping("/eventgridmembergpslog/page")
    R query(@RequestBody PageEventGridMemberGpsLogDTO pageEventGridMemberGpsLogDTO);

    /**
     * 删除网格员定时上报地理信息
     * @param eventGridMemberGpsLogDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/eventgridmembergpslog/delete")
    R delete(@RequestBody EventGridMemberGpsLogDeleteDTO eventGridMemberGpsLogDeleteDTO);

    /**
     * 查询网格员定时上报地理信息详细信息
     * @param id 网格员定时上报地理信息 id
     * @return 查找结果
     */
    @PostMapping("/eventgridmembergpslog/{id}")
    R<EventGridMemberGpsLogDetailsVO> eventGridMemberGpsLogDetails(@PathVariable("id") Long id);

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

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

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

    /**
     * 突发事件撤销
     * @param eventRevokeDTO
     * @return
     */
    @PostMapping("/event/emergenciesRevoke")
    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
     */
    @PostMapping("/eventgriddata/userGrid")
    R userGrid(@RequestBody PageEventGridDataDTO pageEventGridDataDTO);

    /**
     * 特殊人员信息上报
     * @param specialEventAddDTO
     * @return
     */
    @PostMapping("/event/addSpecial")
    R addSpecial(@RequestBody SpecialEventAddDTO specialEventAddDTO);

    /**
     * 获取指定特殊人员信息
     * @param idCard
     * @return
     */
    @PostMapping("/event/getSpecialPopulation")
    R getSpecialPopulation(String idCard);

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

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

    /**
     * 查询随手拍列表
     * @param easyAppDTO    请求参数
     * @return  随手拍列表
     */
    @PostMapping("/easy/list")
    R easyList(@RequestBody PageEasyAppDTO easyAppDTO);

    /**
     * 查询随手拍详情
     * @param easyId    随手拍id
     * @return  随手拍详情
     */
    @PostMapping("/easy/detail")
    R easyDetailByApp(@RequestParam("easyId") Long easyId);

    /**
     * 查询随手拍类型列表
     * @return  类型列表
     */
    @PostMapping("/easy/type/list")
    R easyTypeListByApp();

    /**
     * 随手拍处理
     * @param photoHandleDTO    请求参数
     * @return  处理结果
     */
    @PostMapping("/easy/handle")
    R easyHandle(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO);

    /**
     * 随手拍公示状态切换
     * @param photoHandleDTO    请求参数
     * @return  切换结果
     */
    @PostMapping("/easy/publicity")
    R easyPublicity(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO);

    /**
     * 随手拍上报社区
     * @param photoHandleDTO    请求参数
     * @return  上报结果
     */
    @PostMapping("/easy/report")
    R easyReport(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO);

    /**
     * 添加发布宣传教育事件
     * @param publicityEventAddDTO   请求参数
     * @return  添加发布结果
     */
    @PostMapping("/event/addPublicity")
    R addPublicity(@RequestBody PublicityEventAddDTO publicityEventAddDTO);

    /**
     * 保存宣传教育事件草稿
     * @param publicityEventEditDTO   请求参数
     * @return  保存结果
     */
    @PostMapping("/event/savePublicityDraft")
    R savePublicityDraft(@RequestBody PublicityEventEditDTO publicityEventEditDTO);

    /**
     * 分页查询宣传教育事件
     * @param pagePublicityEventDTO   请求参数
     * @return  结果
     */
    @PostMapping("/event/queryPublicity")
    R queryPublicity(@RequestBody PagePublicityEventDTO pagePublicityEventDTO);

    /**
     * 分页查询社区列表
     * @return  结果
     */
    @PostMapping("/event/actList")
    R actList();

    /**
     * 地图模块-根据网格id查询网格详细信息
     * @param gridId    网格id
     * @return  网格详细信息
     */
    @PostMapping("/map/getGridDetail")
    R getGridDetail(@RequestParam("gridId") Long gridId);

    /**
     * 地图模块-根据网格员id查询今日运动轨迹
     * @param userId    网格员id
     * @return  运动轨迹
     */
    @PostMapping("/map/getTrajectoryByApp")
    R getTrajectoryByApp(@RequestParam("userId") Long userId);

    /**
     * 地图模块-根据网格员id查询关联网格列表
     * @param userId    网格员id
     * @return  网格列表
     */
    @PostMapping("/map/getMapGridListByApp")
    R getMapGridListByApp(@RequestParam("userId") Long userId);
}

 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/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java

@@ -303,7 +303,6 @@
        return communityService.listBuildType();
    }


    @ApiOperation(value = "分页查询其他建筑",response = ComMngStructOtherBuildVO.class)
    @PostMapping("pageotherbuild")
    public R pageOtherBuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO){
@@ -447,7 +446,6 @@
        return communityService.deleteVolunteerExamine(comMngVolunteerMngVO);
    }


    @ApiOperation(value = "导入居民")
    @PostMapping("importuser")
    public R importUser(MultipartFile multipartFile)throws IOException {
@@ -464,9 +462,6 @@
        EasyExcel.read(multipartFile.getInputStream(), EexcelUserDTO.class, new UploadEexcelUserDTOListener(userService,name)) .extraRead(CellExtraTypeEnum.MERGE).headRowNumber(1).sheet().doRead();
        return R.ok();
    }




    @ApiOperation(value = "社区人员详情",response = CommunityUserInfoVO.class)
    @GetMapping("detailuser")
@@ -579,7 +574,6 @@
            return r;
        }
    }


    @ApiOperation(value = "选择导入的小区",response =ComMngStructAreaVO.class )
    @GetMapping("listareas")

 springcloud_k8s_panzhihuazhihuishequ/grid_app/pom.xml

New file
@@ -0,0 +1,107 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.panzhihua</groupId>
        <artifactId>zhihuishequ</artifactId>
        <version>1.0-SNAPSHOT</version>
    </parent>
    <groupId>com.panzhihua</groupId>
    <artifactId>grid_app</artifactId>
    <version>0.0.1-SNAPSHOT</version>
    <name>grid_app</name>
    <description>网格治理-app</description>


    <dependencies>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-config</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-openfeign</artifactId>
        </dependency>
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>com.panzhihua</groupId>
            <artifactId>common</artifactId>
        </dependency>
        <dependency>
            <groupId>com.netflix.hystrix</groupId>
            <artifactId>hystrix-javanica</artifactId>
        </dependency>
        <dependency>
            <groupId>com.github.xiaoymin</groupId>
            <artifactId>swagger-bootstrap-ui</artifactId>
        </dependency>
    </dependencies>

    <build>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <mainClass>com.panzhihua.grid_app.GridAppApplication</mainClass>
                </configuration>
                <executions>
                    <execution>
                        <goals>
                            <goal>repackage</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>

            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>docker-maven-plugin</artifactId>
                <version>1.2.0</version>
                <configuration>
                    <imageName>registry.cn-chengdu.aliyuncs.com/panzhihua/community_backstage:v1</imageName>
                    <serverId></serverId>
                    <baseImage>java</baseImage>
                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
                    <resources>
                        <resource>
                            <targetPath>/</targetPath>
                            <directory>${project.build.directory}</directory>
                            <include>${project.build.finalName}.jar</include>
                        </resource>
                    </resources>
                </configuration>
            </plugin>
        </plugins>
    </build>

    <repositories>
        <repository>
            <id>spring-snapshots</id>
            <name>Spring Snapshots</name>
            <url>https://repo.spring.io/snapshot</url>
            <snapshots>
                <enabled>true</enabled>
            </snapshots>
        </repository>
        <repository>
            <id>spring-milestones</id>
            <name>Spring Milestones</name>
            <url>https://repo.spring.io/milestone</url>
        </repository>
    </repositories>

</project>

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/GridAppApplication.java

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

import org.springframework.boot.SpringApplication;
import org.springframework.cloud.client.SpringCloudApplication;
import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.ComponentScan;
import springfox.documentation.swagger2.annotations.EnableSwagger2;

@EnableSwagger2
@SpringCloudApplication
@EnableCircuitBreaker
@EnableEurekaClient
@EnableFeignClients(basePackages = {"com.panzhihua.common.service"})
@ComponentScan({"com.panzhihua.grid_app","com.panzhihua.common"})
public class GridAppApplication {

    public static void main(String[] args) {
        SpringApplication.run(GridAppApplication.class, args);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/aop/OperLogAspect.java

New file
@@ -0,0 +1,227 @@
package com.panzhihua.grid_app.aop;

import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.constants.TokenConstant;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.user.SysOperLogVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.AES;
import com.panzhihua.common.utlis.IPUtil;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.BufferedReader;
import java.io.IOException;
import java.lang.reflect.Method;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;

/**
 * 切面处理类，操作日志异常日志记录处理
 *
 * @author wu
 * @date 2019/03/21
 */
@Slf4j
@Aspect
@Component
public class OperLogAspect {

    @Resource
    private UserService userService;

    /**
     * 设置操作日志切入点 记录操作日志 在注解的位置切入代码
     */
    @Pointcut("@annotation(com.panzhihua.common.interfaces.OperLog)")
    public void operLogPoinCut() {
    }

//    /**
//     * 设置操作异常切入点记录异常日志 扫描所有controller包下操作
//     */
//    @Pointcut("execution(* com.hyd.zcar.cms.controller..*.*(..))")
//    public void operExceptionLogPoinCut() {
//    }

    /**
     * 正常返回通知，拦截用户操作日志，连接点正常执行完成后执行， 如果连接点抛出异常，则不会执行
     *
     * @param joinPoint 切入点
     * @param keys      返回结果
     */
    @AfterReturning(value = "operLogPoinCut()", returning = "keys")
    public void saveOperLog(JoinPoint joinPoint, Object keys) {
        log.info("进入切面");
        // 获取RequestAttributes
        RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
        // 从获取RequestAttributes中获取HttpServletRequest的信息
        HttpServletRequest request = (HttpServletRequest) requestAttributes
                .resolveReference(RequestAttributes.REFERENCE_REQUEST);
//        登录对象信息
        String userInfo = request.getHeader(TokenConstant.TOKEN_USERINFO);
        boolean empty = ObjectUtils.isEmpty(userInfo);
        if (empty) {
            log.error("操作日志获取登录用户信息失败【{}】",joinPoint);
            return;
        }
        byte[] bytes = AES.parseHexStr2Byte(userInfo);
        byte[] decrypt = AES.decrypt(bytes, Constants.AES_KEY);
        userInfo=new String(decrypt);
        LoginUserInfoVO loginUserInfoVO= JSONObject.parseObject(userInfo,LoginUserInfoVO.class);

        SysOperLogVO operlog = new SysOperLogVO();
        try {

            // 从切面织入点处通过反射机制获取织入点处的方法
            MethodSignature signature = (MethodSignature) joinPoint.getSignature();
            // 获取切入点所在的方法
            Method method = signature.getMethod();
            // 获取操作
            OperLog opLog = method.getAnnotation(OperLog.class);
            if (opLog != null) {
                String operModul = opLog.operModul();
                int operType = opLog.operType();
                operlog.setTitle(operModul); // 操作模块
                operlog.setBusinessType(operType); // 操作类型
            }
            // 获取请求的类名
            String className = joinPoint.getTarget().getClass().getName();
            // 获取请求的方法名
            String methodName = method.getName();
            methodName = className + "." + methodName;

            operlog.setMethod(methodName); // 请求方法

            if (joinPoint.getArgs().length > 0) {
                for (Object o : joinPoint.getArgs()) {
                    if (o instanceof HttpServletRequest || o instanceof HttpServletResponse) {
                        continue;
                    }
                    operlog.setOperParam(JSONObject.toJSONString(o)); // 请求参数
                }
            }

            operlog.setJsonResult(JSONObject.toJSONString(keys)); // 返回结果
            operlog.setAccount(loginUserInfoVO.getAccount());
            operlog.setOperName(loginUserInfoVO.getName()); // 请求用户名称
            operlog.setOperIp(IPUtil.getIpAddress(request)); // 请求IP
            operlog.setOperUrl(request.getRequestURI()); // 请求URI
            operlog.setRequestMethod(request.getMethod());
            operlog.setOperLocation(IPUtil.getIpBelongAddress(request));
            operlog.setOperTime(new Date()); // 创建时间
            operlog.setAccount(loginUserInfoVO.getAccount());
            Long communityId = loginUserInfoVO.getCommunityId();
            operlog.setCommunityId(null==communityId?0:communityId);
            userService.addOperLog(operlog);
        } catch (Exception e) {
            e.printStackTrace();
        }
    }

//    /**
//     * 异常返回通知，用于拦截异常日志信息 连接点抛出异常后执行
//     *
//     * @param joinPoint 切入点
//     * @param e         异常信息
//     */
//    @AfterThrowing(pointcut = "operExceptionLogPoinCut()", throwing = "e")
//    public void saveExceptionLog(JoinPoint joinPoint, Throwable e) {
//        // 获取RequestAttributes
//        RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
//        // 从获取RequestAttributes中获取HttpServletRequest的信息
//        HttpServletRequest request = (HttpServletRequest) requestAttributes
//                .resolveReference(RequestAttributes.REFERENCE_REQUEST);
//
//        ExceptionLog excepLog = new ExceptionLog();
//        try {
//            // 从切面织入点处通过反射机制获取织入点处的方法
//            MethodSignature signature = (MethodSignature) joinPoint.getSignature();
//            // 获取切入点所在的方法
//            Method method = signature.getMethod();
//            excepLog.setExcId(UuidUtil.get32UUID());
//            // 获取请求的类名
//            String className = joinPoint.getTarget().getClass().getName();
//            // 获取请求的方法名
//            String methodName = method.getName();
//            methodName = className + "." + methodName;
//            // 请求的参数
//            Map<String, String> rtnMap = converMap(request.getParameterMap());
//            // 将参数所在的数组转换成json
//            String params = JSON.toJSONString(rtnMap);
//            excepLog.setExcRequParam(params); // 请求参数
//            excepLog.setOperMethod(methodName); // 请求方法名
//            excepLog.setExcName(e.getClass().getName()); // 异常名称
//            excepLog.setExcMessage(stackTraceToString(e.getClass().getName(), e.getMessage(), e.getStackTrace())); // 异常信息
//            excepLog.setOperUserId(UserShiroUtil.getCurrentUserLoginName()); // 操作员ID
//            excepLog.setOperUserName(UserShiroUtil.getCurrentUserName()); // 操作员名称
//            excepLog.setOperUri(request.getRequestURI()); // 操作URI
//            excepLog.setOperIp(IPUtil.getRemortIP(request)); // 操作员IP
//            excepLog.setOperVer(operVer); // 操作版本号
//            excepLog.setOperCreateTime(new Date()); // 发生异常时间
//
//            exceptionLogService.insert(excepLog);
//
//        } catch (Exception e2) {
//            e2.printStackTrace();
//        }
//
//    }

    /**
     * 转换request 请求参数
     *
     * @param paramMap request获取的参数数组
     */
    public Map<String, String> converMap(Map<String, String[]> paramMap) {
        Map<String, String> rtnMap = new HashMap<String, String>();
        for (String key : paramMap.keySet()) {
            rtnMap.put(key, paramMap.get(key)[0]);
        }
        return rtnMap;
    }

    private  String getPostData(HttpServletRequest request) {
        StringBuffer data = new StringBuffer();
        String line = null;
        BufferedReader reader = null;
        try {
            reader = request.getReader();
            while (null != (line = reader.readLine()))
                data.append(line);
        } catch (IOException e) {
        } finally {
        }
        return data.toString();
    }

    /**
     * 转换异常信息为字符串
     *
     * @param exceptionName    异常名称
     * @param exceptionMessage 异常信息
     * @param elements         堆栈信息
     */
    public String stackTraceToString(String exceptionName, String exceptionMessage, StackTraceElement[] elements) {
        StringBuffer strbuff = new StringBuffer();
        for (StackTraceElement stet : elements) {
            strbuff.append(stet + "\n");
        }
        String message = exceptionName + ":" + exceptionMessage + "\n\t" + strbuff.toString();
        return message;
    }
}

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

New file
@@ -0,0 +1,150 @@
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.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.common.service.grid.GridService;
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 javax.annotation.Resource;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Slf4j
@RestController
@RequestMapping("/event/common")
@Api(tags = {"网格综治事件管理 @chendong"})
public class CommonEventApi extends BaseController {

    @Resource
    private GridService gridService;

    private boolean isCommonType(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(!isCommonType(pageEventDTO.getEventType())){
            return R.fail(400, "事件类型错误");
        }
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        pageEventDTO.setUserId(loginUserInfoVO.getUserId());
        return gridService.query(pageEventDTO);
    }

    /**
     * 新增并发布事件事件
     * @param commonEventAddDTO 添加事件传递对象
     * @return 新增结果
     */
    @PostMapping("/release")
    @ApiOperation(value = "新增并发布事件", response = R.class)
    R add(@Validated @RequestBody CommonEventAddDTO commonEventAddDTO){
        ClazzUtils.setIfStringIsEmpty(commonEventAddDTO);
        if(!isCommonType(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(!isCommonType(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 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);
    }




}

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

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

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoHandleDTO;
import com.panzhihua.common.model.dtos.grid.PageEasyAppDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.service.grid.GridService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * @author lyq
 */
@RestController
@RequestMapping("/easy/")
@Api(tags = {"网格综治APP随手拍模块"})
public class EasyPhotoApi extends BaseController {

    @Resource
    private GridService gridService;

    @ApiOperation(value = "随手拍列表-lyq",response = ComActEasyPhotoVO.class)
    @PostMapping("list")
    public R list(@RequestBody PageEasyAppDTO easyAppDTO){
        LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
        if(userInfoVO == null){
            return R.fail("请先登录");
        }
        easyAppDTO.setCommunityId(userInfoVO.getCommunityId());
        return gridService.easyList(easyAppDTO);
    }

    @ApiOperation(value = "随手拍详情-lyq",response = ComActEasyPhotoVO.class)
    @PostMapping("detail")
    public R detail(@RequestParam("easyId") Long easyId){
        return gridService.easyDetailByApp(easyId);
    }

    @ApiOperation(value = "随手拍类型列表-lyq",response = ComActEasyPhotoVO.class)
    @PostMapping("type/list")
    public R typeList(){
        return gridService.easyTypeListByApp();
    }

    @ApiOperation(value = "随手拍处理-lyq")
    @PostMapping("handle")
    public R handle(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){
        LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
        if(userInfoVO == null){
            return R.fail("请先登录");
        }
        photoHandleDTO.setHandlerId(userInfoVO.getUserId());
        return gridService.easyHandle(photoHandleDTO);
    }

    @ApiOperation(value = "随手拍切换公示状态-lyq")
    @PostMapping("publicity")
    public R publicity(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){
        return gridService.easyPublicity(photoHandleDTO);
    }

    @ApiOperation(value = "随手拍上报社区-lyq")
    @PostMapping("report")
    public R report(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){
        return gridService.easyReport(photoHandleDTO);
    }

}

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

New file
@@ -0,0 +1,117 @@
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.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
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 = {"网格综治事件管理 @chendong", "宣传教育 @chendong","特殊人群上报(开发中..) @chendong"})
public class EventApi extends BaseController {

    @Resource
    private GridService gridService;

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

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

    /**
     * 删除
     * @param eventDeleteDTO 删除事件传递对象
     * @return 删除结果
     */
    @DeleteMapping()
    @ApiOperation(value = "删除事件", response = R.class)
    R delete(@Validated @RequestBody EventDeleteDTO  eventDeleteDTO){
        ClazzUtils.setIfStringIsEmpty(eventDeleteDTO);
        return gridService.delete(eventDeleteDTO);
    }
    /**
     * 重新发布事件
     * @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 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);
    }

    /**
     * 查询社区列表
     * @return 查找结果
     */
    @GetMapping("/actList")
    @ApiOperation(value = "查询社区列表", response = ComActVO.class)
    R actList(){
        return gridService.actList();
    }
}

 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 = {"网格数据管理 @chendong"})
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_app/src/main/java/com/panzhihua/grid_app/api/LoginApi.java

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

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.LoginReturnVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.service.auth.TokenService;
import com.panzhihua.grid_app.model.vos.LoginBody;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * @author cedoo
 */
@RestController
@RequestMapping("/")
@Api(tags = {"登录 @chendong"})
public class LoginApi extends BaseController {
    @Resource
    private TokenService tokenService;

    @ApiOperation(value = "网格综治APP登录",response = LoginReturnVO.class)
    @PostMapping("login")
    public R login(@RequestBody LoginBody loginBody){
        String account = loginBody.getAccount();
        String password = loginBody.getPassword();
        boolean empty = ObjectUtils.isEmpty(account);
        boolean empty1 = ObjectUtils.isEmpty(password);
        if (empty||empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginGridApp(account, password);
        return r;
    }

    @ApiOperation(value = "刷新token",response =LoginReturnVO.class)
    @GetMapping("refreshToken")
    @ApiImplicitParam(name ="refreshToken",value = "登录返回的刷新token")
    public R refreshToken(@RequestParam("refreshToken")String refreshToken){
        return tokenService.refreshToken(refreshToken);
    }

    @ApiOperation(value = "用户登出")
    @PostMapping("logout")
    public R logout(){
        String token = this.getToken();
        boolean empty2 = ObjectUtils.isEmpty(token);
        if (empty2) {
            return R.ok();
        }
        return tokenService.logout(token);
    }


}

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

New file
@@ -0,0 +1,59 @@
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.ComMapGridDetailVO;
import com.panzhihua.common.model.vos.grid.EventMapGridVO;
import com.panzhihua.common.model.vos.grid.EventMapTrajectoryVO;
import com.panzhihua.common.service.grid.GridService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

/**
 * @author lyq
 */
@RestController
@RequestMapping("/map/")
@Api(tags = {"网格综治APP地图模块"})
public class MapApi extends BaseController {

    @Resource
    private GridService gridService;

    @ApiOperation(value = "根据网格id查询网格详细信息-lyq",response = ComMapGridDetailVO.class)
    @PostMapping("getGridDetail")
    public R getGridDetail(@RequestParam("gridId") Long gridId){
        if(gridId == null){
            return R.fail("参数错误");
        }
        return gridService.getGridDetail(gridId);
    }

    @ApiOperation(value = "查询网格员今日运动轨迹-lyq",response = EventMapTrajectoryVO.class)
    @PostMapping("getTrajectory")
    public R getTrajectory(){
        LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
        if(userInfoVO == null || userInfoVO.getUserId() == null){
            return R.fail("请先登录");
        }
        return gridService.getTrajectoryByApp(userInfoVO.getUserId());
    }

    @ApiOperation(value = "查询网格员关联网格列表-lyq",response = EventMapGridVO.class)
    @PostMapping("getGridList")
    public R getGridList(){
        LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
        if(userInfoVO == null || userInfoVO.getUserId() == null){
            return R.fail("请先登录");
        }
        return gridService.getMapGridListByApp(userInfoVO.getUserId());
    }

}

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

New file
@@ -0,0 +1,84 @@
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.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.common.service.grid.GridService;
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 javax.annotation.Resource;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Slf4j
@RestController
@RequestMapping("/event/publicity")
@Api(tags = {"宣传教育 @chendong"})
public class PublicityEventApi extends BaseController {


    @Resource
    private GridService gridService;

    /**
     * 事件列表
     * @param pagePublicityEventDTO 查找事件
     * @return 查找结果
     */
    @GetMapping("/usersList")
    @ApiOperation(value = "宣传教育事件列表", response= EventVO.class)
    R usersPublicityList(@Validated @ModelAttribute PagePublicityEventDTO pagePublicityEventDTO){
        ClazzUtils.setIfStringIsEmpty(pagePublicityEventDTO);
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        pagePublicityEventDTO.setUserId(loginUserInfoVO.getUserId());
        return gridService.queryPublicity(pagePublicityEventDTO);
    }
    /**
     * 添加宣传教育事件
     * @param publicityEventAddDTO 特殊人群信息
     * @return 查找结果
     */
    @PostMapping()
    @ApiOperation(value = "发布宣传教育事件", response = R.class)
    R addPublicity(@Validated @RequestBody PublicityEventAddDTO publicityEventAddDTO){
        ClazzUtils.setIfStringIsEmpty(publicityEventAddDTO);
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        publicityEventAddDTO.setUserId(loginUserInfoVO.getUserId());
        publicityEventAddDTO.setUserName(loginUserInfoVO.getName());
        publicityEventAddDTO.setPhone(loginUserInfoVO.getPhone());
        return gridService.addPublicity(publicityEventAddDTO);
    }

    /**
     * 保存宣传教育事件草稿
     * @param publicityEventEditDTO 保存草稿传递对象
     * @return 保存结果
     */
    @PostMapping("/draft")
    @ApiOperation(value = "保存宣传教育事件草稿", response = R.class)
    R savePublicityDraft(@Validated @RequestBody PublicityEventEditDTO publicityEventEditDTO){
        ClazzUtils.setIfStringIsEmpty(publicityEventEditDTO);
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        publicityEventEditDTO.setUserId(loginUserInfoVO.getUserId());
        publicityEventEditDTO.setUserName(loginUserInfoVO.getName());
        publicityEventEditDTO.setPhone(loginUserInfoVO.getPhone());
        return gridService.savePublicityDraft(publicityEventEditDTO);
    }

}

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

New file
@@ -0,0 +1,129 @@
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.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.common.service.grid.GridService;
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 javax.annotation.Resource;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Slf4j
@RestController
@RequestMapping("/event/special")
@Api(tags = {"特殊人群上报(开发中..) @chendong"})
public class SpecialPopulationEventApi extends BaseController {

    @Resource
    private GridService gridService;

    /**
     * 添加特殊人群
     * @param specialEventAddDTO 特殊人群信息
     * @return 查找结果
     */
    @PostMapping()
    @ApiOperation(value = "发布特殊人群事件", response = R.class)
    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("/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("/{idCard}")
    @ApiOperation(value = "查询特殊人群信息", response = ComMngPopulationVO.class)
    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();
    }

    /**
     * 上报社区
     * @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 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);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/config/SFTPConfig.java

New file
@@ -0,0 +1,30 @@
package com.panzhihua.grid_app.config;

import lombok.Data;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;

/**
 * @Author: llming
 * @Description:
 */
@Configuration
@Data
public class SFTPConfig {
    // FTP 登录用户名
    @Value("${ftp.username}")
    private String userName;
    // FTP 登录密码
    @Value("${ftp.password}")
    private String password;
    // FTP 服务器地址IP地址
    @Value("${ftp.host}")
    private String host;
    // FTP 端口
    @Value("${ftp.port}")
    private int port;
    @Value("${ftp.url}")
    private String url;
    @Value("${excel.userurl}")
    private String excelUrl;
}

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/config/SwaggerConfig.java

New file
@@ -0,0 +1,40 @@
package com.panzhihua.grid_app.config;

import io.swagger.annotations.ApiOperation;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.Contact;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: swagger3
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-19 16:08
 **/
@Configuration
public class SwaggerConfig {
    @Bean
    public Docket createRestApi() {
        return new Docket(DocumentationType.SWAGGER_2)
                .apiInfo(apiInfo())
                .select()
                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
                .paths(PathSelectors.any())
                .build();
    }

    private ApiInfo apiInfo() {
        return new ApiInfoBuilder()
                .title("网格app管理接口")
                .description("。")
                .contact(new Contact("Ray。", "http://www.ruiyeclub.cn", "ruiyeclub@foxmail.com"))
                .version("1.0")
                .build();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/model/vos/LoginBody.java

New file
@@ -0,0 +1,25 @@
package com.panzhihua.grid_app.model.vos;

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

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 登录
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-24 10:54
 **/
@Data
@ApiModel(value = "网格综治APP登录")
@AllArgsConstructor
@NoArgsConstructor
public class LoginBody {

    @ApiModelProperty(value = "登录账户")
    private String account;
    @ApiModelProperty(value = "登录密码")
    private String password;
}

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/resources/bootstrap.yml

New file
@@ -0,0 +1,22 @@
spring:
  application:
    name: gridapp
  cloud:
    config:
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: ${ENV:dev}  # 指定配置文件的环境
      uri: http://${CONFIG_URL:localhost}:8193/
  profiles:
    active: ${ENV:dev}
  servlet:
    multipart:
      max-file-size: 10MB
      max-request-size: 10MB

eureka:
  client:
    service-url:
      defaultZone: http://${EUREKA_URL:localhost}:8192/eureka


 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/resources/logback-spring.xml

New file
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false">
    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
    <springProfile name="dev">
        <property name="LOG_HOME" value="F:/log" />
    </springProfile>
       <springProfile name="test">
        <property name="LOG_HOME" value="/mnt/data/gocd/log" />
    </springProfile>
<property name="LOG_HOME" value="/mnt/data/gocd/log" />
    <!-- 控制台输出 -->
    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
        </encoder>
    </appender>
    <!-- 按照每天生成日志文件 -->
    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!--日志文件输出的文件名-->
            <FileNamePattern>${LOG_HOME}/community_backstage.log.%d{yyyy-MM-dd}.log</FileNamePattern>
            <!--日志文件保留天数-->
            <MaxHistory>30</MaxHistory>
        </rollingPolicy>
        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
        </encoder>
        <!--日志文件最大的大小-->
        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
            <MaxFileSize>10MB</MaxFileSize>
        </triggeringPolicy>
    </appender>

    <!--myibatis log configure-->
    <logger name="com.apache.ibatis" level="TRACE"/>
    <logger name="java.sql.Connection" level="DEBUG"/>
    <logger name="java.sql.Statement" level="DEBUG"/>
    <logger name="java.sql.PreparedStatement" level="DEBUG"/>
    <logger name="com.panzhihua.community_backstage" level="DEBUG"/>

    <!-- 日志输出级别 -->
    <root level="DEBUG">
        <appender-ref ref="STDOUT" />
    </root>
    <root level="INFO">
        <appender-ref ref="STDOUT" />
        <appender-ref ref="FILE" />
    </root>
</configuration>

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/pom.xml

New file
@@ -0,0 +1,107 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.panzhihua</groupId>
        <artifactId>zhihuishequ</artifactId>
        <version>1.0-SNAPSHOT</version>
    </parent>
    <groupId>com.panzhihua</groupId>
    <artifactId>grid_backstage</artifactId>
    <version>0.0.1-SNAPSHOT</version>
    <name>grid_backstage</name>
    <description>网格治理-后台</description>


    <dependencies>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-config</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-openfeign</artifactId>
        </dependency>
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>com.panzhihua</groupId>
            <artifactId>common</artifactId>
        </dependency>
        <dependency>
            <groupId>com.netflix.hystrix</groupId>
            <artifactId>hystrix-javanica</artifactId>
        </dependency>
        <dependency>
            <groupId>com.github.xiaoymin</groupId>
            <artifactId>swagger-bootstrap-ui</artifactId>
        </dependency>
    </dependencies>

    <build>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <mainClass>com.panzhihua.grid_backstage.GridBackstageApplication</mainClass>
                </configuration>
                <executions>
                    <execution>
                        <goals>
                            <goal>repackage</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>

            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>docker-maven-plugin</artifactId>
                <version>1.2.0</version>
                <configuration>
                    <imageName>registry.cn-chengdu.aliyuncs.com/panzhihua/community_backstage:v1</imageName>
                    <serverId></serverId>
                    <baseImage>java</baseImage>
                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
                    <resources>
                        <resource>
                            <targetPath>/</targetPath>
                            <directory>${project.build.directory}</directory>
                            <include>${project.build.finalName}.jar</include>
                        </resource>
                    </resources>
                </configuration>
            </plugin>
        </plugins>
    </build>

    <repositories>
        <repository>
            <id>spring-snapshots</id>
            <name>Spring Snapshots</name>
            <url>https://repo.spring.io/snapshot</url>
            <snapshots>
                <enabled>true</enabled>
            </snapshots>
        </repository>
        <repository>
            <id>spring-milestones</id>
            <name>Spring Milestones</name>
            <url>https://repo.spring.io/milestone</url>
        </repository>
    </repositories>

</project>

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/GridBackstageApplication.java

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

import org.springframework.boot.SpringApplication;
import org.springframework.cloud.client.SpringCloudApplication;
import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.ComponentScan;
import springfox.documentation.swagger2.annotations.EnableSwagger2;

@EnableSwagger2
@SpringCloudApplication
@EnableCircuitBreaker
@EnableEurekaClient
@EnableFeignClients(basePackages = {"com.panzhihua.common.service"})
@ComponentScan({"com.panzhihua.grid_backstage","com.panzhihua.common"})
public class GridBackstageApplication {

    public static void main(String[] args) {
        SpringApplication.run(GridBackstageApplication.class, args);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/aop/OperLogAspect.java

New file
@@ -0,0 +1,227 @@
package com.panzhihua.grid_backstage.aop;

import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.constants.TokenConstant;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.user.SysOperLogVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.AES;
import com.panzhihua.common.utlis.IPUtil;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.BufferedReader;
import java.io.IOException;
import java.lang.reflect.Method;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;

/**
 * 切面处理类，操作日志异常日志记录处理
 *
 * @author wu
 * @date 2019/03/21
 */
@Slf4j
@Aspect
@Component
public class OperLogAspect {

    @Resource
    private UserService userService;

    /**
     * 设置操作日志切入点 记录操作日志 在注解的位置切入代码
     */
    @Pointcut("@annotation(com.panzhihua.common.interfaces.OperLog)")
    public void operLogPoinCut() {
    }

//    /**
//     * 设置操作异常切入点记录异常日志 扫描所有controller包下操作
//     */
//    @Pointcut("execution(* com.hyd.zcar.cms.controller..*.*(..))")
//    public void operExceptionLogPoinCut() {
//    }

    /**
     * 正常返回通知，拦截用户操作日志，连接点正常执行完成后执行， 如果连接点抛出异常，则不会执行
     *
     * @param joinPoint 切入点
     * @param keys      返回结果
     */
    @AfterReturning(value = "operLogPoinCut()", returning = "keys")
    public void saveOperLog(JoinPoint joinPoint, Object keys) {
        log.info("进入切面");
        // 获取RequestAttributes
        RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
        // 从获取RequestAttributes中获取HttpServletRequest的信息
        HttpServletRequest request = (HttpServletRequest) requestAttributes
                .resolveReference(RequestAttributes.REFERENCE_REQUEST);
//        登录对象信息
        String userInfo = request.getHeader(TokenConstant.TOKEN_USERINFO);
        boolean empty = ObjectUtils.isEmpty(userInfo);
        if (empty) {
            log.error("操作日志获取登录用户信息失败【{}】",joinPoint);
            return;
        }
        byte[] bytes = AES.parseHexStr2Byte(userInfo);
        byte[] decrypt = AES.decrypt(bytes, Constants.AES_KEY);
        userInfo=new String(decrypt);
        LoginUserInfoVO loginUserInfoVO= JSONObject.parseObject(userInfo,LoginUserInfoVO.class);

        SysOperLogVO operlog = new SysOperLogVO();
        try {

            // 从切面织入点处通过反射机制获取织入点处的方法
            MethodSignature signature = (MethodSignature) joinPoint.getSignature();
            // 获取切入点所在的方法
            Method method = signature.getMethod();
            // 获取操作
            OperLog opLog = method.getAnnotation(OperLog.class);
            if (opLog != null) {
                String operModul = opLog.operModul();
                int operType = opLog.operType();
                operlog.setTitle(operModul); // 操作模块
                operlog.setBusinessType(operType); // 操作类型
            }
            // 获取请求的类名
            String className = joinPoint.getTarget().getClass().getName();
            // 获取请求的方法名
            String methodName = method.getName();
            methodName = className + "." + methodName;

            operlog.setMethod(methodName); // 请求方法

            if (joinPoint.getArgs().length > 0) {
                for (Object o : joinPoint.getArgs()) {
                    if (o instanceof HttpServletRequest || o instanceof HttpServletResponse) {
                        continue;
                    }
                    operlog.setOperParam(JSONObject.toJSONString(o)); // 请求参数
                }
            }

            operlog.setJsonResult(JSONObject.toJSONString(keys)); // 返回结果
            operlog.setAccount(loginUserInfoVO.getAccount());
            operlog.setOperName(loginUserInfoVO.getName()); // 请求用户名称
            operlog.setOperIp(IPUtil.getIpAddress(request)); // 请求IP
            operlog.setOperUrl(request.getRequestURI()); // 请求URI
            operlog.setRequestMethod(request.getMethod());
            operlog.setOperLocation(IPUtil.getIpBelongAddress(request));
            operlog.setOperTime(new Date()); // 创建时间
            operlog.setAccount(loginUserInfoVO.getAccount());
            Long communityId = loginUserInfoVO.getCommunityId();
            operlog.setCommunityId(null==communityId?0:communityId);
            userService.addOperLog(operlog);
        } catch (Exception e) {
            e.printStackTrace();
        }
    }

//    /**
//     * 异常返回通知，用于拦截异常日志信息 连接点抛出异常后执行
//     *
//     * @param joinPoint 切入点
//     * @param e         异常信息
//     */
//    @AfterThrowing(pointcut = "operExceptionLogPoinCut()", throwing = "e")
//    public void saveExceptionLog(JoinPoint joinPoint, Throwable e) {
//        // 获取RequestAttributes
//        RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
//        // 从获取RequestAttributes中获取HttpServletRequest的信息
//        HttpServletRequest request = (HttpServletRequest) requestAttributes
//                .resolveReference(RequestAttributes.REFERENCE_REQUEST);
//
//        ExceptionLog excepLog = new ExceptionLog();
//        try {
//            // 从切面织入点处通过反射机制获取织入点处的方法
//            MethodSignature signature = (MethodSignature) joinPoint.getSignature();
//            // 获取切入点所在的方法
//            Method method = signature.getMethod();
//            excepLog.setExcId(UuidUtil.get32UUID());
//            // 获取请求的类名
//            String className = joinPoint.getTarget().getClass().getName();
//            // 获取请求的方法名
//            String methodName = method.getName();
//            methodName = className + "." + methodName;
//            // 请求的参数
//            Map<String, String> rtnMap = converMap(request.getParameterMap());
//            // 将参数所在的数组转换成json
//            String params = JSON.toJSONString(rtnMap);
//            excepLog.setExcRequParam(params); // 请求参数
//            excepLog.setOperMethod(methodName); // 请求方法名
//            excepLog.setExcName(e.getClass().getName()); // 异常名称
//            excepLog.setExcMessage(stackTraceToString(e.getClass().getName(), e.getMessage(), e.getStackTrace())); // 异常信息
//            excepLog.setOperUserId(UserShiroUtil.getCurrentUserLoginName()); // 操作员ID
//            excepLog.setOperUserName(UserShiroUtil.getCurrentUserName()); // 操作员名称
//            excepLog.setOperUri(request.getRequestURI()); // 操作URI
//            excepLog.setOperIp(IPUtil.getRemortIP(request)); // 操作员IP
//            excepLog.setOperVer(operVer); // 操作版本号
//            excepLog.setOperCreateTime(new Date()); // 发生异常时间
//
//            exceptionLogService.insert(excepLog);
//
//        } catch (Exception e2) {
//            e2.printStackTrace();
//        }
//
//    }

    /**
     * 转换request 请求参数
     *
     * @param paramMap request获取的参数数组
     */
    public Map<String, String> converMap(Map<String, String[]> paramMap) {
        Map<String, String> rtnMap = new HashMap<String, String>();
        for (String key : paramMap.keySet()) {
            rtnMap.put(key, paramMap.get(key)[0]);
        }
        return rtnMap;
    }

    private  String getPostData(HttpServletRequest request) {
        StringBuffer data = new StringBuffer();
        String line = null;
        BufferedReader reader = null;
        try {
            reader = request.getReader();
            while (null != (line = reader.readLine()))
                data.append(line);
        } catch (IOException e) {
        } finally {
        }
        return data.toString();
    }

    /**
     * 转换异常信息为字符串
     *
     * @param exceptionName    异常名称
     * @param exceptionMessage 异常信息
     * @param elements         堆栈信息
     */
    public String stackTraceToString(String exceptionName, String exceptionMessage, StackTraceElement[] elements) {
        StringBuffer strbuff = new StringBuffer();
        for (StackTraceElement stet : elements) {
            strbuff.append(stet + "\n");
        }
        String message = exceptionName + ":" + exceptionMessage + "\n\t" + strbuff.toString();
        return message;
    }
}

 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/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/LoginApi.java

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

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.LoginReturnVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.service.auth.TokenService;
import com.panzhihua.grid_backstage.model.vos.LoginBody;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * @author cedoo
 */
@RestController
@RequestMapping("/")
@Api(tags = {"网格综治后台登录模块"})
public class LoginApi extends BaseController {
    @Resource
    private TokenService tokenService;

    @ApiOperation(value = "网格综治后台登录",response = LoginReturnVO.class)
    @PostMapping("login")
    public R login(@RequestBody LoginBody loginBody){
        String account = loginBody.getAccount();
        String password = loginBody.getPassword();
        boolean empty = ObjectUtils.isEmpty(account);
        boolean empty1 = ObjectUtils.isEmpty(password);
        if (empty||empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginGridBackstage(account, password);
        return r;
    }

    @ApiOperation(value = "刷新token",response =LoginReturnVO.class)
    @GetMapping("refreshToken")
    @ApiImplicitParam(name ="refreshToken",value = "登录返回的刷新token")
    public R refreshToken(@RequestParam("refreshToken")String refreshToken){
        return tokenService.refreshToken(refreshToken);
    }

    @ApiOperation(value = "用户登出")
    @PostMapping("logout")
    public R logout(){
        String token = this.getToken();
        boolean empty2 = ObjectUtils.isEmpty(token);
        if (empty2) {
            return R.ok();
        }
        return tokenService.logout(token);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/config/SFTPConfig.java

New file
@@ -0,0 +1,30 @@
package com.panzhihua.grid_backstage.config;

import lombok.Data;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;

/**
 * @Author: llming
 * @Description:
 */
@Configuration
@Data
public class SFTPConfig {
    // FTP 登录用户名
    @Value("${ftp.username}")
    private String userName;
    // FTP 登录密码
    @Value("${ftp.password}")
    private String password;
    // FTP 服务器地址IP地址
    @Value("${ftp.host}")
    private String host;
    // FTP 端口
    @Value("${ftp.port}")
    private int port;
    @Value("${ftp.url}")
    private String url;
    @Value("${excel.userurl}")
    private String excelUrl;
}

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/config/SwaggerConfig.java

New file
@@ -0,0 +1,40 @@
package com.panzhihua.grid_backstage.config;

import io.swagger.annotations.ApiOperation;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.Contact;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: swagger3
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-19 16:08
 **/
@Configuration
public class SwaggerConfig {
    @Bean
    public Docket createRestApi() {
        return new Docket(DocumentationType.SWAGGER_2)
                .apiInfo(apiInfo())
                .select()
                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
                .paths(PathSelectors.any())
                .build();
    }

    private ApiInfo apiInfo() {
        return new ApiInfoBuilder()
                .title("网格治理后台管理接口")
                .description("。")
                .contact(new Contact("Ray。", "http://www.ruiyeclub.cn", "ruiyeclub@foxmail.com"))
                .version("1.0")
                .build();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/model/vos/LoginBody.java

New file
@@ -0,0 +1,25 @@
package com.panzhihua.grid_backstage.model.vos;

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

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 登录
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-24 10:54
 **/
@Data
@ApiModel(value = "网格综治后台登录")
@AllArgsConstructor
@NoArgsConstructor
public class LoginBody {

    @ApiModelProperty(value = "登录账户")
    private String account;
    @ApiModelProperty(value = "登录密码")
    private String password;
}

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/resources/bootstrap.yml

New file
@@ -0,0 +1,22 @@
spring:
  application:
    name: gridbackstage
  cloud:
    config:
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: ${ENV:dev}  # 指定配置文件的环境
      uri: http://${CONFIG_URL:localhost}:8193/
  profiles:
    active: ${ENV:dev}
  servlet:
    multipart:
      max-file-size: 10MB
      max-request-size: 10MB

eureka:
  client:
    service-url:
      defaultZone: http://${EUREKA_URL:localhost}:8192/eureka


 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/resources/logback-spring.xml

New file
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false">
    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
    <springProfile name="dev">
        <property name="LOG_HOME" value="F:/log" />
    </springProfile>
       <springProfile name="test">
        <property name="LOG_HOME" value="/mnt/data/gocd/log" />
    </springProfile>
<property name="LOG_HOME" value="/mnt/data/gocd/log" />
    <!-- 控制台输出 -->
    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
        </encoder>
    </appender>
    <!-- 按照每天生成日志文件 -->
    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!--日志文件输出的文件名-->
            <FileNamePattern>${LOG_HOME}/community_backstage.log.%d{yyyy-MM-dd}.log</FileNamePattern>
            <!--日志文件保留天数-->
            <MaxHistory>30</MaxHistory>
        </rollingPolicy>
        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
        </encoder>
        <!--日志文件最大的大小-->
        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
            <MaxFileSize>10MB</MaxFileSize>
        </triggeringPolicy>
    </appender>

    <!--myibatis log configure-->
    <logger name="com.apache.ibatis" level="TRACE"/>
    <logger name="java.sql.Connection" level="DEBUG"/>
    <logger name="java.sql.Statement" level="DEBUG"/>
    <logger name="java.sql.PreparedStatement" level="DEBUG"/>
    <logger name="com.panzhihua.community_backstage" level="DEBUG"/>

    <!-- 日志输出级别 -->
    <root level="DEBUG">
        <appender-ref ref="STDOUT" />
    </root>
    <root level="INFO">
        <appender-ref ref="STDOUT" />
        <appender-ref ref="FILE" />
    </root>
</configuration>

 springcloud_k8s_panzhihuazhihuishequ/pom.xml

@@ -203,6 +203,12 @@
        <module>service_community</module>
        <module>service_user</module>
        <module>shop_backstage</module>
        <!--网格治理-app-->
        <module>grid_app</module>
        <!--网格治理-后台-->
        <module>grid_backstage</module>
        <!--网格治理-基础服务service-->
        <module>service_grid</module>
    </modules>
    <packaging>pom</packaging>


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java

@@ -36,6 +36,8 @@
            "p.`photo_path_list`,\n" +
            "p.create_at,\n" +
            "p.feedback_at,\n" +
            "p.is_report,\n" +
            "p.is_publicity,\n" +
            "p.examine_at \n" +
            "FROM\n" +
            "com_act_easy_photo p\n" +
@@ -91,6 +93,8 @@
            "p.`photo_path_list`,\n" +
            "p.create_at,\n" +
            "p.feedback_at,\n" +
            "p.is_report,\n" +
            "p.is_publicity,\n" +
            "p.examine_at \n" +
            "FROM\n" +
            "com_act_easy_photo p\n" +
@@ -179,7 +183,7 @@
            "SELECT\n" +
            "'1' type\n" +
            "FROM\n" +
            " p.del_tag = 0 and com_act_easy_photo p \n" +
            " com_act_easy_photo p \n" +
            "WHERE\n" +
            " p.del_tag = 0 and p.community_id = #{communityId} \n" +
            "AND p.`status` = 2 and p.is_need_feed_back=1 and p.handler_id=#{userId}\n"

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java

@@ -35,7 +35,7 @@
    private String happenAddr;

    /**
     * 状态 1待审核   2进行中 3已驳回 4已完成
     * 状态 1待处理 2已处理
     */
    private Integer status;

@@ -105,4 +105,14 @@
     * 是否删除 0 否 1 是
     */
    private Integer delTag;

    /**
     * 是否上报社区处理(0.否 1.是)
     */
    private Integer isReport;

    /**
     * 是否公示(0.否 1.是)
     */
    private Integer isPublicity;
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/pom.xml

New file
@@ -0,0 +1,125 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.panzhihua</groupId>
        <artifactId>zhihuishequ</artifactId>
        <version>1.0-SNAPSHOT</version>
    </parent>
    <groupId>com.panzhihua</groupId>
    <artifactId>service_grid</artifactId>
    <version>0.0.1-SNAPSHOT</version>
    <name>service_grid</name>
    <description>网格治理服务</description>


    <dependencies>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-config</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-openfeign</artifactId>
        </dependency>

        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-test</artifactId>
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>druid-spring-boot-starter</artifactId>
        </dependency>
        <dependency>
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
            <scope>runtime</scope>
        </dependency>
        <dependency>
            <groupId>com.netflix.hystrix</groupId>
            <artifactId>hystrix-javanica</artifactId>
        </dependency>

        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-boot-starter</artifactId>
        </dependency>
        <dependency>
            <groupId>com.panzhihua</groupId>
            <artifactId>common</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-redis</artifactId>
        </dependency>
        <dependency>
            <groupId>commons-lang</groupId>
            <artifactId>commons-lang</artifactId>
            <version>2.6</version>
        </dependency>
    </dependencies>


    <build>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <mainClass>com.panzhihua.service_grid.ServiceGridApplication</mainClass>
                </configuration>
                <executions>
                    <execution>
                        <goals>
                            <goal>repackage</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>

            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>docker-maven-plugin</artifactId>
                <version>1.2.0</version>
                <configuration>
                    <imageName>registry.cn-chengdu.aliyuncs.com/panzhihua/service_community:v1</imageName>
                    <serverId></serverId>
                    <baseImage>java</baseImage>
                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
                    <resources>
                        <resource>
                            <targetPath>/</targetPath>
                            <directory>${project.build.directory}</directory>
                            <include>${project.build.finalName}.jar</include>
                        </resource>
                    </resources>
                </configuration>
            </plugin>
        </plugins>
    </build>

    <repositories>
        <repository>
            <id>spring-milestones</id>
            <name>Spring Milestones</name>
            <url>https://repo.spring.io/milestone</url>
        </repository>
    </repositories>

</project>

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/ServiceGridApplication.java

New file
@@ -0,0 +1,21 @@
package com.panzhihua.service_grid;

import org.springframework.boot.SpringApplication;
import org.springframework.cloud.client.SpringCloudApplication;
import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.ComponentScan;

@SpringCloudApplication
@EnableFeignClients(basePackages = {"com.panzhihua.common.service"})
@EnableEurekaClient
@EnableCircuitBreaker
@ComponentScan({"com.panzhihua.service_grid","com.panzhihua.common"})
public class ServiceGridApplication {

    public static void main(String[] args) {
        SpringApplication.run(ServiceGridApplication.class, args);
    }

}

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

New file
@@ -0,0 +1,88 @@
package com.panzhihua.service_grid.api;

import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoHandleDTO;
import com.panzhihua.common.model.dtos.grid.PageEasyAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_grid.service.ComActEasyPhotoService;
import com.panzhihua.service_grid.service.ComActEasyPhotoTypeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 *
 * @author lyq
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Slf4j
@RestController
@RequestMapping("/easy")
public class EasyPhotoApi {

    @Resource
    private ComActEasyPhotoService comActEasyPhotoService;
    @Resource
    private ComActEasyPhotoTypeService comActEasyPhotoTypeService;

    /**
     * 分页查询随手拍
     * @param easyAppDTO    请求参数
     * @return 随手拍列表
     */
    @PostMapping("list")
    public R list(@RequestBody PageEasyAppDTO easyAppDTO){
        return comActEasyPhotoService.query(easyAppDTO);
    }

    /**
     * 根据随手拍id查询随手拍详情
     * @param easyId    随手拍id
     * @return  随手拍详情
     */
    @PostMapping("detail")
    public R detail(@RequestParam("easyId") Long easyId){
        return comActEasyPhotoService.detail(easyId);
    }

    /**
     * 查询随手拍类型列表
     * @return  类型列表
     */
    @PostMapping("type/list")
    public R typeList(){
        return comActEasyPhotoTypeService.typeList();
    }

    /**
     * 随手拍处理
     * @param photoHandleDTO    请求参数
     * @return  处理结果
     */
    @PostMapping("handle")
    public R easyHandle(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){
        return comActEasyPhotoService.easyHandle(photoHandleDTO);
    }

    /**
     * 随手拍公示状态切换
     * @param photoHandleDTO    请求参数
     * @return  切换结果
     */
    @PostMapping("publicity")
    public R easyPublicity(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){
        return comActEasyPhotoService.easyPublicity(photoHandleDTO);
    }

    /**
     * 随手拍上报社区
     * @param photoHandleDTO    请求参数
     * @return  上报结果
     */
    @PostMapping("report")
    public R easyReport(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){
        return comActEasyPhotoService.easyReport(photoHandleDTO);
    }
}

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

New file
@@ -0,0 +1,231 @@
package com.panzhihua.service_grid.api;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.service_grid.service.EventService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Slf4j
@RestController
@RequestMapping("/event")
public class EventApi{

    @Resource
    private EventService eventService;

    /**
     * 新增事件
     * @param eventAddDTO
     * @return 新增结果
     */
    @PostMapping("/add")
    R add(@RequestBody EventAddDTO eventAddDTO){
        return eventService.add(eventAddDTO);
    };

    /**
     * 修改事件
     * @param eventEditDTO
     * @return 维护结果
     */
    @PostMapping("/edit")
    R edit(@RequestBody EventEditDTO eventEditDTO){
        return eventService.edit(eventEditDTO);
    };

    /**
     * 分页查找事件
     * @param pageEventDTO
     * @return 维护结果
     */
    @PostMapping("/page")
    R<IPage<EventVO>> query(@RequestBody PageEventDTO pageEventDTO){
        return eventService.query(pageEventDTO);
    };

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

    /**
     * 查询事件详细信息
     * @param id 事件 id
     * @return 查找结果
     */
    @PostMapping("/{id}")
    R<EventDetailsVO> eventDetails(@PathVariable("id") Long id){
        return eventService.eventDetails(id);
    };

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


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


    /**
     * 突发事件撤销
     * @param eventRevokeDTO
     * @return
     */
    @PostMapping("/emergenciesRevoke")
    R emergenciesRevoke(@RequestBody EventRevokeDTO eventRevokeDTO){
        return eventService.emergenciesRevoke(eventRevokeDTO);
    }
    /**
     * 处理事件
     * @param commonEventDealDTO
     * @return
     */
    @PostMapping("/dealEvent")
    R dealEvent(@RequestBody CommonEventDealDTO commonEventDealDTO){
        return eventService.dealEvent(commonEventDealDTO);
    }

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

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

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

    /**
     * 保存殊人群事件上报草稿
     * @param specialEventEditDTO
     * @return
     */
    @PostMapping("/saveSpecialDraft")
    R saveSpecialDraft(@RequestBody SpecialEventEditDTO specialEventEditDTO){
        return eventService.saveSpecialDraft(specialEventEditDTO);
    }


    /**
     * 特殊人员信息上报
     * @param specialEventAddDTO
     * @return
     */
    @PostMapping("/addSpecial")
    R addSpecial(@RequestBody SpecialEventAddDTO specialEventAddDTO){
        return eventService.addSpecial(specialEventAddDTO);
    }

    /**
     * 获取指定特殊人员信息
     * @param idCard
     * @return
     */
    @PostMapping("/getSpecialPopulation")
    R getSpecialPopulation(@RequestBody String idCard){
        return eventService.getSpecialPopulation(idCard);
    }


    /**
     * 添加发布宣传教育事件
     * @param publicityEventAddDTO   请求参数
     * @return  上报结果
     */
    @PostMapping("/addPublicity")
    R addPublicity(@RequestBody PublicityEventAddDTO publicityEventAddDTO){
        return eventService.addPublicity(publicityEventAddDTO);
    }

    /**
     * 保存宣传教育事件草稿
     * @param publicityEventEditDTO   请求参数
     * @return  保存结果
     */
    @PostMapping("/savePublicityDraft")
    R savePublicityDraft(@RequestBody PublicityEventEditDTO publicityEventEditDTO) {
        return eventService.savePublicityDraft(publicityEventEditDTO);
    }
    /**
     * 分页查询宣传教育事件
     * @param pagePublicityEventDTO   请求参数
     * @return  结果
     */
    @PostMapping("/queryPublicity")
    R queryPublicity(@RequestBody PagePublicityEventDTO pagePublicityEventDTO){
        return eventService.selectPublicity(pagePublicityEventDTO);
    }

    /**
     * 分页查询宣传教育事件
     * @return  结果
     */
    @PostMapping("/actList")
    R<ComActVO> actList(){
        return eventService.actList();
    }

}

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

New file
@@ -0,0 +1,83 @@
package com.panzhihua.service_grid.api;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.grid.EventApplicationAppReleaseAddDTO;
import com.panzhihua.common.model.dtos.grid.EventApplicationAppReleaseDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventApplicationAppReleaseEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventApplicationAppReleaseDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventApplicationAppReleaseDetailsVO;
import com.panzhihua.common.model.vos.grid.EventApplicationAppReleaseVO;
import com.panzhihua.service_grid.service.EventApplicationAppReleaseService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Slf4j
@RestController
@RequestMapping("/eventapplicationapprelease")
public class EventApplicationAppReleaseApi{

    @Resource
    private EventApplicationAppReleaseService eventApplicationAppReleaseService;

    /**
     * 新增APP应用版本信息
     * @param eventApplicationAppReleaseAddDTO
     * @return 新增结果
     */
    @PostMapping("/add")
    R add(@RequestBody EventApplicationAppReleaseAddDTO eventApplicationAppReleaseAddDTO){
        return eventApplicationAppReleaseService.add(eventApplicationAppReleaseAddDTO);
    };

    /**
     * 修改APP应用版本信息
     * @param eventApplicationAppReleaseEditDTO
     * @return 维护结果
     */
    @PostMapping("/edit")
    R edit(@RequestBody EventApplicationAppReleaseEditDTO eventApplicationAppReleaseEditDTO){
        return eventApplicationAppReleaseService.edit(eventApplicationAppReleaseEditDTO);
    };

    /**
     * 分页查找APP应用版本信息
     * @param pageEventApplicationAppReleaseDTO
     * @return 维护结果
     */
    @PostMapping("/page")
    R<IPage<EventApplicationAppReleaseVO>> query(@RequestBody PageEventApplicationAppReleaseDTO pageEventApplicationAppReleaseDTO){
        return eventApplicationAppReleaseService.query(pageEventApplicationAppReleaseDTO);
    };

    /**
     * 删除APP应用版本信息
     * @param EventApplicationAppReleaseDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/delete")
    R delete(@RequestBody EventApplicationAppReleaseDeleteDTO EventApplicationAppReleaseDeleteDTO){
        return eventApplicationAppReleaseService.delete(EventApplicationAppReleaseDeleteDTO);
    };

    /**
     * 查询APP应用版本信息详细信息
     * @param id APP应用版本信息 id
     * @return 查找结果
     */
    @PostMapping("/{id}")
    R<EventApplicationAppReleaseDetailsVO> eventApplicationAppReleaseDetails(@PathVariable("id") Long id){
        return eventApplicationAppReleaseService.eventApplicationAppReleaseDetails(id);
    };

}

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

New file
@@ -0,0 +1,83 @@
package com.panzhihua.service_grid.api;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.grid.EventApplicationUserNoticeAddDTO;
import com.panzhihua.common.model.dtos.grid.EventApplicationUserNoticeDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventApplicationUserNoticeEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventApplicationUserNoticeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventApplicationUserNoticeDetailsVO;
import com.panzhihua.common.model.vos.grid.EventApplicationUserNoticeVO;
import com.panzhihua.service_grid.service.EventApplicationUserNoticeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Slf4j
@RestController
@RequestMapping("/eventapplicationusernotice")
public class EventApplicationUserNoticeApi{

    @Resource
    private EventApplicationUserNoticeService eventApplicationUserNoticeService;

    /**
     * 新增用户协议和隐私政策信息
     * @param eventApplicationUserNoticeAddDTO
     * @return 新增结果
     */
    @PostMapping("/add")
    R add(@RequestBody EventApplicationUserNoticeAddDTO eventApplicationUserNoticeAddDTO){
        return eventApplicationUserNoticeService.add(eventApplicationUserNoticeAddDTO);
    };

    /**
     * 修改用户协议和隐私政策信息
     * @param eventApplicationUserNoticeEditDTO
     * @return 维护结果
     */
    @PostMapping("/edit")
    R edit(@RequestBody EventApplicationUserNoticeEditDTO eventApplicationUserNoticeEditDTO){
        return eventApplicationUserNoticeService.edit(eventApplicationUserNoticeEditDTO);
    };

    /**
     * 分页查找用户协议和隐私政策信息
     * @param pageEventApplicationUserNoticeDTO
     * @return 维护结果
     */
    @PostMapping("/page")
    R<IPage<EventApplicationUserNoticeVO>> query(@RequestBody PageEventApplicationUserNoticeDTO pageEventApplicationUserNoticeDTO){
        return eventApplicationUserNoticeService.query(pageEventApplicationUserNoticeDTO);
    };

    /**
     * 删除用户协议和隐私政策信息
     * @param EventApplicationUserNoticeDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/delete")
    R delete(@RequestBody EventApplicationUserNoticeDeleteDTO EventApplicationUserNoticeDeleteDTO){
        return eventApplicationUserNoticeService.delete(EventApplicationUserNoticeDeleteDTO);
    };

    /**
     * 查询用户协议和隐私政策信息详细信息
     * @param id 用户协议和隐私政策信息 id
     * @return 查找结果
     */
    @PostMapping("/{id}")
    R<EventApplicationUserNoticeDetailsVO> eventApplicationUserNoticeDetails(@PathVariable("id") Long id){
        return eventApplicationUserNoticeService.eventApplicationUserNoticeDetails(id);
    };

}

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

New file
@@ -0,0 +1,94 @@
package com.panzhihua.service_grid.api;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.grid.EventGridDataAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridDataDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventGridDataEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
import com.panzhihua.service_grid.service.EventGridDataService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Slf4j
@RestController
@RequestMapping("/eventgriddata")
public class EventGridDataApi{

    @Resource
    private EventGridDataService eventGridDataService;


    /**
     * 查询用户网格
     * @param pageEventGridDataDTO
     * @return
     */
    @PostMapping("/userGrid")
    R userGrid(@RequestBody PageEventGridDataDTO pageEventGridDataDTO){
        return eventGridDataService.getUserGrid(pageEventGridDataDTO);
    }

    /**
     * 新增区县/街道/社区/网格员网格数据管理
     * @param eventGridDataAddDTO
     * @return 新增结果
     */
    @PostMapping("/add")
    R add(@RequestBody EventGridDataAddDTO eventGridDataAddDTO){
        return eventGridDataService.add(eventGridDataAddDTO);
    };

    /**
     * 修改区县/街道/社区/网格员网格数据管理
     * @param eventGridDataEditDTO
     * @return 维护结果
     */
    @PostMapping("/edit")
    R edit(@RequestBody EventGridDataEditDTO eventGridDataEditDTO){
        return eventGridDataService.edit(eventGridDataEditDTO);
    };

    /**
     * 分页查找区县/街道/社区/网格员网格数据管理
     * @param pageEventGridDataDTO
     * @return 维护结果
     */
    @PostMapping("/page")
    R<IPage<EventGridDataVO>> query(@RequestBody PageEventGridDataDTO pageEventGridDataDTO){
        return eventGridDataService.query(pageEventGridDataDTO);
    };

    /**
     * 删除区县/街道/社区/网格员网格数据管理
     * @param EventGridDataDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/delete")
    R delete(@RequestBody EventGridDataDeleteDTO EventGridDataDeleteDTO){
        return eventGridDataService.delete(EventGridDataDeleteDTO);
    };

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

}

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

New file
@@ -0,0 +1,83 @@
package com.panzhihua.service_grid.api;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.grid.EventGridMemberGpsLogAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberGpsLogDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberGpsLogEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberGpsLogDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogVO;
import com.panzhihua.service_grid.service.EventGridMemberGpsLogService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Slf4j
@RestController
@RequestMapping("/eventgridmembergpslog")
public class EventGridMemberGpsLogApi{

    @Resource
    private EventGridMemberGpsLogService eventGridMemberGpsLogService;

    /**
     * 新增网格员定时上报地理信息
     * @param eventGridMemberGpsLogAddDTO
     * @return 新增结果
     */
    @PostMapping("/add")
    R add(@RequestBody EventGridMemberGpsLogAddDTO eventGridMemberGpsLogAddDTO){
        return eventGridMemberGpsLogService.add(eventGridMemberGpsLogAddDTO);
    };

    /**
     * 修改网格员定时上报地理信息
     * @param eventGridMemberGpsLogEditDTO
     * @return 维护结果
     */
    @PostMapping("/edit")
    R edit(@RequestBody EventGridMemberGpsLogEditDTO eventGridMemberGpsLogEditDTO){
        return eventGridMemberGpsLogService.edit(eventGridMemberGpsLogEditDTO);
    };

    /**
     * 分页查找网格员定时上报地理信息
     * @param pageEventGridMemberGpsLogDTO
     * @return 维护结果
     */
    @PostMapping("/page")
    R<IPage<EventGridMemberGpsLogVO>> query(@RequestBody PageEventGridMemberGpsLogDTO pageEventGridMemberGpsLogDTO){
        return eventGridMemberGpsLogService.query(pageEventGridMemberGpsLogDTO);
    };

    /**
     * 删除网格员定时上报地理信息
     * @param EventGridMemberGpsLogDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/delete")
    R delete(@RequestBody EventGridMemberGpsLogDeleteDTO EventGridMemberGpsLogDeleteDTO){
        return eventGridMemberGpsLogService.delete(EventGridMemberGpsLogDeleteDTO);
    };

    /**
     * 查询网格员定时上报地理信息详细信息
     * @param id 网格员定时上报地理信息 id
     * @return 查找结果
     */
    @PostMapping("/{id}")
    R<EventGridMemberGpsLogDetailsVO> eventGridMemberGpsLogDetails(@PathVariable("id") Long id){
        return eventGridMemberGpsLogService.eventGridMemberGpsLogDetails(id);
    };

}

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

New file
@@ -0,0 +1,83 @@
package com.panzhihua.service_grid.api;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
import com.panzhihua.service_grid.service.EventGridMemberRelationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Slf4j
@RestController
@RequestMapping("/eventgridmemberrelation")
public class EventGridMemberRelationApi{

    @Resource
    private EventGridMemberRelationService eventGridMemberRelationService;

    /**
     * 新增网格和网格员的关联关系
     * @param eventGridMemberRelationAddDTO
     * @return 新增结果
     */
    @PostMapping("/add")
    R add(@RequestBody EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO){
        return eventGridMemberRelationService.add(eventGridMemberRelationAddDTO);
    };

    /**
     * 修改网格和网格员的关联关系
     * @param eventGridMemberRelationEditDTO
     * @return 维护结果
     */
    @PostMapping("/edit")
    R edit(@RequestBody EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO){
        return eventGridMemberRelationService.edit(eventGridMemberRelationEditDTO);
    };

    /**
     * 分页查找网格和网格员的关联关系
     * @param pageEventGridMemberRelationDTO
     * @return 维护结果
     */
    @PostMapping("/page")
    R<IPage<EventGridMemberRelationVO>> query(@RequestBody PageEventGridMemberRelationDTO pageEventGridMemberRelationDTO){
        return eventGridMemberRelationService.query(pageEventGridMemberRelationDTO);
    };

    /**
     * 删除网格和网格员的关联关系
     * @param EventGridMemberRelationDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/delete")
    R delete(@RequestBody EventGridMemberRelationDeleteDTO EventGridMemberRelationDeleteDTO){
        return eventGridMemberRelationService.delete(EventGridMemberRelationDeleteDTO);
    };

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

}

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

New file
@@ -0,0 +1,83 @@
package com.panzhihua.service_grid.api;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.grid.EventGridMemberWarnLogAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberWarnLogDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberWarnLogEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberWarnLogDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberWarnLogDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberWarnLogVO;
import com.panzhihua.service_grid.service.EventGridMemberWarnLogService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Slf4j
@RestController
@RequestMapping("/eventgridmemberwarnlog")
public class EventGridMemberWarnLogApi{

    @Resource
    private EventGridMemberWarnLogService eventGridMemberWarnLogService;

    /**
     * 新增网格员定时上报地理预警记录
     * @param eventGridMemberWarnLogAddDTO
     * @return 新增结果
     */
    @PostMapping("/add")
    R add(@RequestBody EventGridMemberWarnLogAddDTO eventGridMemberWarnLogAddDTO){
        return eventGridMemberWarnLogService.add(eventGridMemberWarnLogAddDTO);
    };

    /**
     * 修改网格员定时上报地理预警记录
     * @param eventGridMemberWarnLogEditDTO
     * @return 维护结果
     */
    @PostMapping("/edit")
    R edit(@RequestBody EventGridMemberWarnLogEditDTO eventGridMemberWarnLogEditDTO){
        return eventGridMemberWarnLogService.edit(eventGridMemberWarnLogEditDTO);
    };

    /**
     * 分页查找网格员定时上报地理预警记录
     * @param pageEventGridMemberWarnLogDTO
     * @return 维护结果
     */
    @PostMapping("/page")
    R<IPage<EventGridMemberWarnLogVO>> query(@RequestBody PageEventGridMemberWarnLogDTO pageEventGridMemberWarnLogDTO){
        return eventGridMemberWarnLogService.query(pageEventGridMemberWarnLogDTO);
    };

    /**
     * 删除网格员定时上报地理预警记录
     * @param EventGridMemberWarnLogDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/delete")
    R delete(@RequestBody EventGridMemberWarnLogDeleteDTO EventGridMemberWarnLogDeleteDTO){
        return eventGridMemberWarnLogService.delete(EventGridMemberWarnLogDeleteDTO);
    };

    /**
     * 查询网格员定时上报地理预警记录详细信息
     * @param id 网格员定时上报地理预警记录 id
     * @return 查找结果
     */
    @PostMapping("/{id}")
    R<EventGridMemberWarnLogDetailsVO> eventGridMemberWarnLogDetails(@PathVariable("id") Long id){
        return eventGridMemberWarnLogService.eventGridMemberWarnLogDetails(id);
    };

}

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

New file
@@ -0,0 +1,83 @@
package com.panzhihua.service_grid.api;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.grid.EventMainMemberAddDTO;
import com.panzhihua.common.model.dtos.grid.EventMainMemberDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventMainMemberEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventMainMemberDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventMainMemberDetailsVO;
import com.panzhihua.common.model.vos.grid.EventMainMemberVO;
import com.panzhihua.service_grid.service.EventMainMemberService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Slf4j
@RestController
@RequestMapping("/eventmainmember")
public class EventMainMemberApi{

    @Resource
    private EventMainMemberService eventMainMemberService;

    /**
     * 新增重点人群记录
     * @param eventMainMemberAddDTO
     * @return 新增结果
     */
    @PostMapping("/add")
    R add(@RequestBody EventMainMemberAddDTO eventMainMemberAddDTO){
        return eventMainMemberService.add(eventMainMemberAddDTO);
    };

    /**
     * 修改重点人群记录
     * @param eventMainMemberEditDTO
     * @return 维护结果
     */
    @PostMapping("/edit")
    R edit(@RequestBody EventMainMemberEditDTO eventMainMemberEditDTO){
        return eventMainMemberService.edit(eventMainMemberEditDTO);
    };

    /**
     * 分页查找重点人群记录
     * @param pageEventMainMemberDTO
     * @return 维护结果
     */
    @PostMapping("/page")
    R<IPage<EventMainMemberVO>> query(@RequestBody PageEventMainMemberDTO pageEventMainMemberDTO){
        return eventMainMemberService.query(pageEventMainMemberDTO);
    };

    /**
     * 删除重点人群记录
     * @param EventMainMemberDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/delete")
    R delete(@RequestBody EventMainMemberDeleteDTO EventMainMemberDeleteDTO){
        return eventMainMemberService.delete(EventMainMemberDeleteDTO);
    };

    /**
     * 查询重点人群记录详细信息
     * @param id 重点人群记录 id
     * @return 查找结果
     */
    @PostMapping("/{id}")
    R<EventMainMemberDetailsVO> eventMainMemberDetails(@PathVariable("id") Long id){
        return eventMainMemberService.eventMainMemberDetails(id);
    };

}

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

New file
@@ -0,0 +1,83 @@
package com.panzhihua.service_grid.api;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.grid.EventResourceAddDTO;
import com.panzhihua.common.model.dtos.grid.EventResourceDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventResourceEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventResourceDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventResourceDetailsVO;
import com.panzhihua.common.model.vos.grid.EventResourceVO;
import com.panzhihua.service_grid.service.EventResourceService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Slf4j
@RestController
@RequestMapping("/eventresource")
public class EventResourceApi{

    @Resource
    private EventResourceService eventResourceService;

    /**
     * 新增事件或者走访中关联的图片音频和视频文件
     * @param eventResourceAddDTO
     * @return 新增结果
     */
    @PostMapping("/add")
    R add(@RequestBody EventResourceAddDTO eventResourceAddDTO){
        return eventResourceService.add(eventResourceAddDTO);
    };

    /**
     * 修改事件或者走访中关联的图片音频和视频文件
     * @param eventResourceEditDTO
     * @return 维护结果
     */
    @PostMapping("/edit")
    R edit(@RequestBody EventResourceEditDTO eventResourceEditDTO){
        return eventResourceService.edit(eventResourceEditDTO);
    };

    /**
     * 分页查找事件或者走访中关联的图片音频和视频文件
     * @param pageEventResourceDTO
     * @return 维护结果
     */
    @PostMapping("/page")
    R<IPage<EventResourceVO>> query(@RequestBody PageEventResourceDTO pageEventResourceDTO){
        return eventResourceService.query(pageEventResourceDTO);
    };

    /**
     * 删除事件或者走访中关联的图片音频和视频文件
     * @param EventResourceDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/delete")
    R delete(@RequestBody EventResourceDeleteDTO EventResourceDeleteDTO){
        return eventResourceService.delete(EventResourceDeleteDTO);
    };

    /**
     * 查询事件或者走访中关联的图片音频和视频文件详细信息
     * @param id 事件或者走访中关联的图片音频和视频文件 id
     * @return 查找结果
     */
    @PostMapping("/{id}")
    R<EventResourceDetailsVO> eventResourceDetails(@PathVariable("id") Long id){
        return eventResourceService.eventResourceDetails(id);
    };

}

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

New file
@@ -0,0 +1,83 @@
package com.panzhihua.service_grid.api;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.grid.EventTransferRecordAddDTO;
import com.panzhihua.common.model.dtos.grid.EventTransferRecordDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventTransferRecordEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventTransferRecordDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventTransferRecordDetailsVO;
import com.panzhihua.common.model.vos.grid.EventTransferRecordVO;
import com.panzhihua.service_grid.service.EventTransferRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Slf4j
@RestController
@RequestMapping("/eventtransferrecord")
public class EventTransferRecordApi{

    @Resource
    private EventTransferRecordService eventTransferRecordService;

    /**
     * 新增事件处理流转记录
     * @param eventTransferRecordAddDTO
     * @return 新增结果
     */
    @PostMapping("/add")
    R add(@RequestBody EventTransferRecordAddDTO eventTransferRecordAddDTO){
        return eventTransferRecordService.add(eventTransferRecordAddDTO);
    };

    /**
     * 修改事件处理流转记录
     * @param eventTransferRecordEditDTO
     * @return 维护结果
     */
    @PostMapping("/edit")
    R edit(@RequestBody EventTransferRecordEditDTO eventTransferRecordEditDTO){
        return eventTransferRecordService.edit(eventTransferRecordEditDTO);
    };

    /**
     * 分页查找事件处理流转记录
     * @param pageEventTransferRecordDTO
     * @return 维护结果
     */
    @PostMapping("/page")
    R<IPage<EventTransferRecordVO>> query(@RequestBody PageEventTransferRecordDTO pageEventTransferRecordDTO){
        return eventTransferRecordService.query(pageEventTransferRecordDTO);
    };

    /**
     * 删除事件处理流转记录
     * @param EventTransferRecordDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/delete")
    R delete(@RequestBody EventTransferRecordDeleteDTO EventTransferRecordDeleteDTO){
        return eventTransferRecordService.delete(EventTransferRecordDeleteDTO);
    };

    /**
     * 查询事件处理流转记录详细信息
     * @param id 事件处理流转记录 id
     * @return 查找结果
     */
    @PostMapping("/{id}")
    R<EventTransferRecordDetailsVO> eventTransferRecordDetails(@PathVariable("id") Long id){
        return eventTransferRecordService.eventTransferRecordDetails(id);
    };

}

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

New file
@@ -0,0 +1,83 @@
package com.panzhihua.service_grid.api;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.grid.EventVisitingTasksAddDTO;
import com.panzhihua.common.model.dtos.grid.EventVisitingTasksDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventVisitingTasksEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventVisitingTasksDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventVisitingTasksDetailsVO;
import com.panzhihua.common.model.vos.grid.EventVisitingTasksVO;
import com.panzhihua.service_grid.service.EventVisitingTasksService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Slf4j
@RestController
@RequestMapping("/eventvisitingtasks")
public class EventVisitingTasksApi{

    @Resource
    private EventVisitingTasksService eventVisitingTasksService;

    /**
     * 新增重点人群走访记录
     * @param eventVisitingTasksAddDTO
     * @return 新增结果
     */
    @PostMapping("/add")
    R add(@RequestBody EventVisitingTasksAddDTO eventVisitingTasksAddDTO){
        return eventVisitingTasksService.add(eventVisitingTasksAddDTO);
    };

    /**
     * 修改重点人群走访记录
     * @param eventVisitingTasksEditDTO
     * @return 维护结果
     */
    @PostMapping("/edit")
    R edit(@RequestBody EventVisitingTasksEditDTO eventVisitingTasksEditDTO){
        return eventVisitingTasksService.edit(eventVisitingTasksEditDTO);
    };

    /**
     * 分页查找重点人群走访记录
     * @param pageEventVisitingTasksDTO
     * @return 维护结果
     */
    @PostMapping("/page")
    R<IPage<EventVisitingTasksVO>> query(@RequestBody PageEventVisitingTasksDTO pageEventVisitingTasksDTO){
        return eventVisitingTasksService.query(pageEventVisitingTasksDTO);
    };

    /**
     * 删除重点人群走访记录
     * @param EventVisitingTasksDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/delete")
    R delete(@RequestBody EventVisitingTasksDeleteDTO EventVisitingTasksDeleteDTO){
        return eventVisitingTasksService.delete(EventVisitingTasksDeleteDTO);
    };

    /**
     * 查询重点人群走访记录详细信息
     * @param id 重点人群走访记录 id
     * @return 查找结果
     */
    @PostMapping("/{id}")
    R<EventVisitingTasksDetailsVO> eventVisitingTasksDetails(@PathVariable("id") Long id){
        return eventVisitingTasksService.eventVisitingTasksDetails(id);
    };

}

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

New file
@@ -0,0 +1,63 @@
package com.panzhihua.service_grid.api;

import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_grid.service.EventGridDataService;
import com.panzhihua.service_grid.service.EventGridMemberGpsLogService;
import com.panzhihua.service_grid.service.EventGridMemberRelationService;
import com.panzhihua.service_grid.service.EventService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

/**
 * 地图模块api
 */
@Slf4j
@RestController
@RequestMapping("/map")
public class MapApi {

    @Resource
    private EventService eventService;
    @Resource
    private EventGridDataService eventGridDataService;
    @Resource
    private EventGridMemberGpsLogService eventGridMemberGpsLogService;
    @Resource
    private EventGridMemberRelationService eventGridMemberRelationService;

    /**
     * 地图模块-根据网格id查询网格详细信息
     * @param gridId    网格id
     * @return  网格详细信息
     */
    @PostMapping("getGridDetail")
    public R getGridDetail(@RequestParam("gridId") Long gridId){
        return eventGridDataService.getMapGridDetail(gridId);
    }

    /**
     * 根据网格员id查询今日轨迹
     * @param userId    网格员id
     * @return  网格员今日轨迹
     */
    @PostMapping("/getTrajectoryByApp")
    public R getTrajectoryByApp(@RequestParam("userId") Long userId){
        return eventGridMemberGpsLogService.getTrajectoryByApp(userId);
    }

    /**
     * 根据网格员id查询关联网格列表
     * @param userId    网格员id
     * @return  网格列表
     */
    @PostMapping("getMapGridListByApp")
    public R getMapGridListByApp(@RequestParam("userId") Long userId){
        return eventGridMemberRelationService.getMapGridListByApp(userId);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/config/MyMetaObjectHandler.java

New file
@@ -0,0 +1,40 @@
package com.panzhihua.service_grid.config;

import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.stereotype.Component;

import java.time.LocalDateTime;
import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 自动填充
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-11 14:23
 **/
@Slf4j
@Component
public class MyMetaObjectHandler implements MetaObjectHandler {
    @Override
    public void insertFill(MetaObject metaObject) {
        log.info("start insert fill ....");
//        this.strictInsertFill(metaObject, "createTime", Date.class, new Date()); // 起始版本 3.3.0(推荐使用)
        // 或者
        this.strictInsertFill(metaObject, "createAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐)
        this.strictInsertFill(metaObject, "updateAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐)
        // 或者
//        this.fillStrategy(metaObject, "createTime", LocalDateTime.now()); // 也可以使用(3.3.0 该方法有bug)
    }

    @Override
    public void updateFill(MetaObject metaObject) {
        log.info("start update fill ....");
//        this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now()); // 起始版本 3.3.0(推荐)
        // 或者
        this.strictUpdateFill(metaObject, "updateAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐)
        // 或者
//        this.fillStrategy(metaObject, "updateTime", LocalDateTime.now()); // 也可以使用(3.3.0 该方法有bug)
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/config/MybatisPlusConfig.java

New file
@@ -0,0 +1,37 @@
package com.panzhihua.service_grid.config;

import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 分页
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-30 16:26
 **/
@MapperScan({"com.panzhihua.service_grid.dao*"})
@Configuration
public class MybatisPlusConfig {

    /**
     * 新的分页插件,一缓和二缓遵循mybatis的规则,需要设置 MybatisConfiguration#useDeprecatedExecutor = false 避免缓存出现问题(该属性会在旧插件移除后一同移除)
     */
    @Bean
    public MybatisPlusInterceptor mybatisPlusInterceptor() {
        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.H2));
        return interceptor;
    }

    @Bean
    public ConfigurationCustomizer configurationCustomizer() {
        return configuration -> configuration.setUseDeprecatedExecutor(false);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/ApplicationAppReleaseMapper.java

New file
@@ -0,0 +1,19 @@
package com.panzhihua.service_grid.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_grid.model.dos.ApplicationAppRelease;
import org.apache.ibatis.annotations.Param;

import java.math.BigInteger;

/**
 * 应用APP版本控制表Mapper
 * ClassName  ApplicationAppReleaseMapper
 * Description
 *
 * @author manailin
 */
public interface ApplicationAppReleaseMapper extends BaseMapper<ApplicationAppRelease> {

    ApplicationAppRelease selectByRand(@Param("data") Long data);
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/ComActEasyPhotoMapper.java

New file
@@ -0,0 +1,37 @@
package com.panzhihua.service_grid.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.grid.PageEasyAppDTO;
import com.panzhihua.service_grid.model.dos.ComActEasyPhotoDO;
import com.panzhihua.common.model.vos.grid.ComActEasyPhotoVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @date 2021-05-26
 * @since 1.0
 */
@Mapper
public interface ComActEasyPhotoMapper extends BaseMapper<ComActEasyPhotoDO> {

    /**
     * 分页查询
     * @param easyAppDTO    请求参数
     * @return  随手拍列表
     */
    IPage<ComActEasyPhotoVO> findByPage(Page page, @Param("easyAppDTO") PageEasyAppDTO easyAppDTO);

    /**
     * 根据随手拍id查询随手拍详情
     * @param easyId    随手拍id
     * @return  随手拍详情
     */
    ComActEasyPhotoVO findByEaseId(@Param("easyId") Long easyId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/ComActEasyPhotoTypeMapper.java

New file
@@ -0,0 +1,32 @@
package com.panzhihua.service_grid.dao;



import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.grid.PageComActEasyPhotoTypeDTO;
import com.panzhihua.service_grid.model.dos.ComActEasyPhotoTypeDO;
import com.panzhihua.common.model.vos.grid.ComActEasyPhotoTypeVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Mapper
public interface ComActEasyPhotoTypeMapper extends BaseMapper<ComActEasyPhotoTypeDO> {

        /**
         * 分页查询
         * @param pageComActEasyPhotoTypeDTO
         * @return
         */
        IPage<ComActEasyPhotoTypeVO> findByPage(Page page, @Param("pageComActEasyPhotoTypeDTO")PageComActEasyPhotoTypeDTO pageComActEasyPhotoTypeDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/ComActEasyPhotoTypeRelationMapper.java

New file
@@ -0,0 +1,29 @@
package com.panzhihua.service_grid.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_grid.model.dos.ComActEasyPhotoTypeRelationDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-27
 * */
@Mapper
public interface ComActEasyPhotoTypeRelationMapper extends BaseMapper<ComActEasyPhotoTypeRelationDO> {

    /**
     * 根据随手拍id查询随手拍类型
     * @param easyId    随手拍id
     * @return  随手拍类型名称列表
     */
    List<String> getEasyPhotoTypeRelationByEasyId(@Param("easyId") Long easyId);


}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventApplicationAppReleaseMapper.java

New file
@@ -0,0 +1,32 @@
package com.panzhihua.service_grid.dao;



import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.grid.PageEventApplicationAppReleaseDTO;
import com.panzhihua.service_grid.model.dos.EventApplicationAppReleaseDO;
import com.panzhihua.common.model.vos.grid.EventApplicationAppReleaseVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Mapper
public interface EventApplicationAppReleaseMapper extends BaseMapper<EventApplicationAppReleaseDO> {

        /**
         * 分页查询
         * @param pageEventApplicationAppReleaseDTO
         * @return
         */
        IPage<EventApplicationAppReleaseVO> findByPage(Page page, @Param("pageEventApplicationAppReleaseDTO")PageEventApplicationAppReleaseDTO pageEventApplicationAppReleaseDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventApplicationUserNoticeMapper.java

New file
@@ -0,0 +1,32 @@
package com.panzhihua.service_grid.dao;



import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.grid.PageEventApplicationUserNoticeDTO;
import com.panzhihua.service_grid.model.dos.EventApplicationUserNoticeDO;
import com.panzhihua.common.model.vos.grid.EventApplicationUserNoticeVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Mapper
public interface EventApplicationUserNoticeMapper extends BaseMapper<EventApplicationUserNoticeDO> {

        /**
         * 分页查询
         * @param pageEventApplicationUserNoticeDTO
         * @return
         */
        IPage<EventApplicationUserNoticeVO> findByPage(Page page, @Param("pageEventApplicationUserNoticeDTO")PageEventApplicationUserNoticeDTO pageEventApplicationUserNoticeDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java

New file
@@ -0,0 +1,41 @@
package com.panzhihua.service_grid.dao;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_grid.model.dos.EventGridDataDO;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @date 2021-05-26
 * @since 1.0
 */
@Mapper
public interface EventGridDataMapper extends BaseMapper<EventGridDataDO> {

    /**
     * 分页查询
     *
     * @param pageEventGridDataDTO
     * @return
     */
    IPage<EventGridDataVO> findByPage(Page page, @Param("pageEventGridDataDTO") PageEventGridDataDTO pageEventGridDataDTO);

    /**
     * 分页查询网格员所在网格
     *
     * @param pageEventGridDataDTO
     * @return
     */
    IPage<EventGridDataVO> selectUserGrid(Page page, @Param("pageEventGridDataDTO") PageEventGridDataDTO pageEventGridDataDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberGpsLogMapper.java

New file
@@ -0,0 +1,37 @@
package com.panzhihua.service_grid.dao;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberGpsLogDTO;
import com.panzhihua.common.model.vos.grid.EventMapTrajectoryVO;
import com.panzhihua.service_grid.model.dos.EventGridMemberGpsLogDO;
import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @date 2021-05-26
 * @since 1.0
 */
@Mapper
public interface EventGridMemberGpsLogMapper extends BaseMapper<EventGridMemberGpsLogDO> {

    /**
     * 分页查询
     *
     * @param pageEventGridMemberGpsLogDTO
     * @return
     */
    IPage<EventGridMemberGpsLogVO> findByPage(Page page, @Param("pageEventGridMemberGpsLogDTO") PageEventGridMemberGpsLogDTO pageEventGridMemberGpsLogDTO);

    List<EventMapTrajectoryVO> getTrajectoryByApp(@Param("userId") Long userId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberRelationMapper.java

New file
@@ -0,0 +1,42 @@
package com.panzhihua.service_grid.dao;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
import com.panzhihua.common.model.vos.grid.EventMapGridVO;
import com.panzhihua.service_grid.model.dos.EventGridMemberRelationDO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @date 2021-05-26
 * @since 1.0
 */
@Mapper
public interface EventGridMemberRelationMapper extends BaseMapper<EventGridMemberRelationDO> {

    /**
     * 分页查询
     *
     * @param pageEventGridMemberRelationDTO
     * @return
     */
    IPage<EventGridMemberRelationVO> findByPage(Page page, @Param("pageEventGridMemberRelationDTO") PageEventGridMemberRelationDTO pageEventGridMemberRelationDTO);

    /**
     * 根据网格员id查询关联网格列表
     * @param userId    网格员id
     * @return  网格列表
     */
    List<EventMapGridVO> getMapGridListByApp(@Param("userId") Long userId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberWarnLogMapper.java

New file
@@ -0,0 +1,32 @@
package com.panzhihua.service_grid.dao;



import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberWarnLogDTO;
import com.panzhihua.service_grid.model.dos.EventGridMemberWarnLogDO;
import com.panzhihua.common.model.vos.grid.EventGridMemberWarnLogVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Mapper
public interface EventGridMemberWarnLogMapper extends BaseMapper<EventGridMemberWarnLogDO> {

        /**
         * 分页查询
         * @param pageEventGridMemberWarnLogDTO
         * @return
         */
        IPage<EventGridMemberWarnLogVO> findByPage(Page page, @Param("pageEventGridMemberWarnLogDTO")PageEventGridMemberWarnLogDTO pageEventGridMemberWarnLogDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMainMemberMapper.java

New file
@@ -0,0 +1,32 @@
package com.panzhihua.service_grid.dao;



import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.grid.PageEventMainMemberDTO;
import com.panzhihua.service_grid.model.dos.EventMainMemberDO;
import com.panzhihua.common.model.vos.grid.EventMainMemberVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Mapper
public interface EventMainMemberMapper extends BaseMapper<EventMainMemberDO> {

        /**
         * 分页查询
         * @param pageEventMainMemberDTO
         * @return
         */
        IPage<EventMainMemberVO> findByPage(Page page, @Param("pageEventMainMemberDTO")PageEventMainMemberDTO pageEventMainMemberDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java

New file
@@ -0,0 +1,50 @@
package com.panzhihua.service_grid.dao;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.grid.PageEventDTO;
import com.panzhihua.common.model.dtos.grid.PagePublicityEventDTO;
import com.panzhihua.common.model.vos.grid.ComMapGridEventVO;
import com.panzhihua.service_grid.model.dos.EventDO;
import com.panzhihua.common.model.vos.grid.EventVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @date 2021-05-26
 * @since 1.0
 */
@Mapper
public interface EventMapper extends BaseMapper<EventDO> {

    /**
     * 分页查询事件
     *
     * @param pageEventDTO
     * @return
     */
    IPage<EventVO> findByPage(Page page, @Param("pageEventDTO") PageEventDTO pageEventDTO);

    /**
     * 分页查询宣传教育
     *
     * @param pagePublicityEventDTO
     * @return
     */
    IPage<EventVO> findPublicityByPage(Page page, @Param("pagePublicityEventDTO") PagePublicityEventDTO pagePublicityEventDTO);
    /**
     * 地图模块-根据网格id查询网格办件事件
     * @param gridId    网格id
     * @return  网格办件事件
     */
    List<ComMapGridEventVO> getEventByGridId(@Param("gridId") Long gridId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventResourceMapper.java

New file
@@ -0,0 +1,32 @@
package com.panzhihua.service_grid.dao;



import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.grid.PageEventResourceDTO;
import com.panzhihua.service_grid.model.dos.EventResourceDO;
import com.panzhihua.common.model.vos.grid.EventResourceVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Mapper
public interface EventResourceMapper extends BaseMapper<EventResourceDO> {

        /**
         * 分页查询
         * @param pageEventResourceDTO
         * @return
         */
        IPage<EventResourceVO> findByPage(Page page, @Param("pageEventResourceDTO")PageEventResourceDTO pageEventResourceDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventTransferRecordMapper.java

New file
@@ -0,0 +1,32 @@
package com.panzhihua.service_grid.dao;



import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.grid.PageEventTransferRecordDTO;
import com.panzhihua.service_grid.model.dos.EventTransferRecordDO;
import com.panzhihua.common.model.vos.grid.EventTransferRecordVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Mapper
public interface EventTransferRecordMapper extends BaseMapper<EventTransferRecordDO> {

        /**
         * 分页查询
         * @param pageEventTransferRecordDTO
         * @return
         */
        IPage<EventTransferRecordVO> findByPage(Page page, @Param("pageEventTransferRecordDTO")PageEventTransferRecordDTO pageEventTransferRecordDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventVisitingTasksMapper.java

New file
@@ -0,0 +1,32 @@
package com.panzhihua.service_grid.dao;



import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.grid.PageEventVisitingTasksDTO;
import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO;
import com.panzhihua.common.model.vos.grid.EventVisitingTasksVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Mapper
public interface EventVisitingTasksMapper extends BaseMapper<EventVisitingTasksDO> {

        /**
         * 分页查询
         * @param pageEventVisitingTasksDTO
         * @return
         */
        IPage<EventVisitingTasksVO> findByPage(Page page, @Param("pageEventVisitingTasksDTO")PageEventVisitingTasksDTO pageEventVisitingTasksDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ApplicationAppRelease.java

New file
@@ -0,0 +1,32 @@
package com.panzhihua.service_grid.model.dos;

import lombok.Data;
import java.io.Serializable;
import java.util.Date;

/**
 * Description  应用APP版本控制表
 * ClassName    ApplicationAppRelease
 * @author      manailin
 */
 @Data
public class ApplicationAppRelease implements Serializable {
    private static final long serialVersionUID = 1L;
    /**主键*/
    private Long id;
    /**应用ID*/
    private Integer productId;
    /**应用名称*/
    private String productName;
    /**版本编号*/
    private String releaseNumber;
    /**通知行为(1、强制更新2、提示更新)*/
    private Integer action;
    /**版本地址*/
    private String url;
    /**创建时间*/
    private Date createDate;
    /**创建人*/
    private Long createUser;

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/BaseDO.java

New file
@@ -0,0 +1,25 @@
package com.panzhihua.service_grid.model.dos;


import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;

import java.util.Date;

/**
 * @Author: llming
 * @Description:
 */
@Data
public class BaseDO {
    private Long createBy;

    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    private Long updateBy;
    @TableField(fill = FieldFill.INSERT)

    private Date updateAt;
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoDO.java

New file
@@ -0,0 +1,127 @@
package com.panzhihua.service_grid.model.dos;

import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;



/**
 * 社区活动 》随手拍实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@TableName("com_act_easy_photo")
public class ComActEasyPhotoDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 自增id   列: id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 发起人id   列: sponsor_id
     */
    private Long sponsorId;
    /**
     * 发生地址   列: happen_addr
     */
    private String happenAddr;
    /**
     * 地址备注   列: addr_remark
     */
    private String addrRemark;
    /**
     * 状态 1待审核   2进行中 3已驳回 4已完成  列: status
     */
    private Integer status;
    /**
     * 处理人id   列: handler_id
     */
    private Long handlerId;
    /**
     * 创建时间   列: create_at
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 审核时间   列: examine_at
     */
    private Date examineAt;
    /**
     * 详情   列: detail
     */
    private String detail;
    /**
     * 图片路径列表，逗号分隔   列: photo_path_list
     */
    private String photoPathList;
    /**
     * 处理结果   列: handle_result
     */
    private String handleResult;
    /**
     * 处理结果，图片路径列表，逗号分隔   列: handle_photo_list
     */
    private String handlePhotoList;
    /**
     * 社区id   列: community_id
     */
    private Long communityId;
    /**
     * 是否匿名发布 0 否 1 是   列: is_hide
     */
    private Integer isHide;
    /**
     * 是否需要反馈 0 不需要 1 需要   列: is_need_feed_back
     */
    private Integer isNeedFeedBack;
    /**
     * 反馈时间   列: feedback_at
     */
    private Date feedbackAt;
    /**
     * 驳回原因   列: reject_reason
     */
    private String rejectReason;
    /**
     * 是否删除 0 否 1 是   列: del_tag
     */
    private Integer delTag;
    /**
     * 是否上报社区处理(0.否 1.是)   列: is_report
     */
    private Integer isReport;
    /**
     * 是否公示(0.否 1.是)   列: is_publicity
     */
    private Integer isPublicity;
    /**
     * 处理状态（1.待处理 2.已处理）
     */
    private Integer handleStatus;
    /**
     * 处理状态（1.待处理 2.已处理）
     */
    public interface handleStatus{
        int no = 1;
        int yes = 2;
    }
    /**
     * 是否上报社区处理(0.否 1.是)
     */
    public interface isReport{
        int no = 0;
        int yes = 1;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoTypeDO.java

New file
@@ -0,0 +1,41 @@
package com.panzhihua.service_grid.model.dos;

import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;



/**
 * 随手拍类型实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@TableName("com_act_easy_photo_type")
public class ComActEasyPhotoTypeDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id   列: id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 随手拍类型名称   列: name
     */
    private String name;
    /**
     * 创建时间   列: create_at
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoTypeRelationDO.java

New file
@@ -0,0 +1,42 @@
package com.panzhihua.service_grid.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;



/**
 * 随手拍类型关联实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-27
 * */
@Data
@TableName("com_act_easy_photo_type_relation")
public class ComActEasyPhotoTypeRelationDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id   列: id
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 随手拍id   列: easy_id
     */
    private Long easyId;
    /**
     * 随手拍类型id   列: easy_type_id
     */
    private Long easyTypeId;
    /**
     * 创建时间   列: create_at
     */
    private Date createAt;
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventApplicationAppReleaseDO.java

New file
@@ -0,0 +1,61 @@
package com.panzhihua.service_grid.model.dos;

import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;



/**
 * APP应用版本信息实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@TableName("event_application_app_release")
public class EventApplicationAppReleaseDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * id   列: id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 应用ID   列: product_id
     */
    private Integer productId;
    /**
     * 应用名称   列: product_name
     */
    private String productName;
    /**
     * 版本编号   列: release_number
     */
    private String releaseNumber;
    /**
     * 通知行为(1、强制更新2、提示更新)   列: action
     */
    private Integer action;
    /**
     * 版本地址   列: url
     */
    private String url;
    /**
     * 创建时间   列: create_at
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 创建人   列: create_by
     */
    private Long createBy;
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventApplicationUserNoticeDO.java

New file
@@ -0,0 +1,57 @@
package com.panzhihua.service_grid.model.dos;

import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;



/**
 * 用户协议和隐私政策信息实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@TableName("event_application_user_notice")
public class EventApplicationUserNoticeDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * id   列: id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 应用ID   列: product_id
     */
    private Integer productId;
    /**
     * 应用名称   列: product_name
     */
    private String productName;
    /**
     * 通知行为(1、强制通知必须手段确定2、提示更新，自动消退)   列: action
     */
    private Integer action;
    /**
     * 内容   列: content
     */
    private String content;
    /**
     * 创建时间   列: create_at
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 创建人   列: create_by
     */
    private Long createBy;
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java

New file
@@ -0,0 +1,206 @@
package com.panzhihua.service_grid.model.dos;

import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;



/**
 * 事件实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@TableName("event")
public class EventDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * id   列: id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 服务单号   列: order_sn
     */
    private String orderSn;
    /**
     * 1、办件事件2是宣传事件3是阅读事件   列: event_category
     */
    private Long eventCategory;
    /**
     * 网格员所处的街道   列: grid_member_street
     */
    private Long gridMemberStreet;
    /**
     * 网格员所处社区   列: grid_member_community
     */
    private Long gridMemberCommunity;
    /**
     * 网格ID   列: grid_id
     */
    private Long gridId;
    /**
     * 网格员   列: grid_member_id
     */
    private Long gridMemberId;
    /**
     * 网格员名字   列: grid_member_name
     */
    private String gridMemberName;
    /**
     * 网格员联系方式   列: grid_member_telephone
     */
    private String gridMemberTelephone;
    /**
     * 事件标题   列: event_title
     */
    private String eventTitle;
    /**
     * 宣传类型   列: propaganda_type
     */
    private String propagandaType;
    /**
     * 宣传时间   列: propaganda_time
     */
    private Date propagandaTime;
    /**
     * 当event_type_category是1填写事件分类1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报   列: event_type
     */
    private Integer eventType;
    /**
     * 事件类型   列: event_clazz
     */
    private Integer eventClazz;
    /**
     * 事件描述   列: event_des
     */
    private String eventDes;
    /**
     * 宣传对象   列: propaganda_object
     */
    private String propagandaObject;
    /**
     * 宣传人数   列: propaganda_num
     */
    private String propagandaNum;
    /**
     * 社区处理(0是无需社区1是社区处理)   列: community_process
     */
    private Integer communityProcess;
    /**
     * 发生时间   列: happen_time
     */
    private Date happenTime;
    /**
     * 发生地点   列: happent_address
     */
    private String happentAddress;
    /**
     * 发生的精度纬度信息（逗号隔开）   列: happent_lat_lng
     */
    private String happentLatLng;
    /**
     * 事件状态（1草稿箱2发布3逻辑删除4、撤销）   列: event_status
     */
    private Integer eventStatus;
    /**
     * 1待处理2已解决3待验证   列: event_process_status
     */
    private Integer eventProcessStatus;
    /**
     * 当前处理对象类型（1、网格员2、社区3、是街道）   列: process_type
     */
    private Integer processType;
    /**
     * 处理人ID   列: process_user_id
     */
    private Long processUserId;
    /**
     * 处理人名称   列: process_user_name
     */
    private String processUserName;
    /**
     * 处理时间   列: process_date
     */
    private Date processDate;
    /**
     * 解决人针对解决事件的处理描述   列: process_desc
     */
    private String processDesc;
    /**
     * 事件来源   列: event_resource
     */
    private String eventResource;
    /**
     * 危险级别   列: danger_level
     */
    private Integer dangerLevel;
    /**
     * 红牌   列: red_card
     */
    private Boolean redCard;
    /**
     * 黄牌   列: yellow_card
     */
    private Boolean yellowCard;
    /**
     * 是否有效   列: invalid
     */
    private Boolean invalid;
    /**
     * 是否重大   列: major
     */
    private Boolean major;
    /**
     * 死亡人数   列: deaths_number
     */
    private Integer deathsNumber;
    /**
     * 受伤人数   列: injuries_number
     */
    private Integer injuriesNumber;
    /**
     * 是否疑难事件   列: difficult
     */
    private Boolean difficult;
    /**
     * 是否紧急   列: urgent
     */
    private Boolean urgent;
    /**
     * 是否催办   列: urgent_dell
     */
    private Boolean urgentDell;
    /**
     * 上报提交时间   列: submit_date
     */
    private Date submitDate;
    /**
     * 创建人   列: create_by
     */
    private Long createBy;
    /**
     * 创建时间   列: create_at
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 修改人   列: update_by
     */
    private Long updateBy;
    /**
     * 修改时间   列: update_at
     */
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridDataDO.java

New file
@@ -0,0 +1,98 @@
package com.panzhihua.service_grid.model.dos;

import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;



/**
 * 区县/街道/社区/网格员网格数据管理实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@TableName("event_grid_data")
public class EventGridDataDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键ID   列: id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 类型，1、区县网格2街道网格3社区网格   列: type
     */
    private Long type;
    /**
     * 区/县ID   列: zone_id
     */
    private Long zoneId;
    /**
     * 网格所属街道   列: grid_street_id
     */
    private Long gridStreetId;
    /**
     * 网格所属社区ID   列: grid_community_id
     */
    private Long gridCommunityId;
    /**
     * 网格名称   列: grid_name
     */
    private String gridName;
    /**
     * 所属图层   列: map_level
     */
    private Integer mapLevel;
    /**
     * 面积   列: area
     */
    private String area;
    /**
     * 线条颜色   列: line_color
     */
    private String lineColor;
    /**
     * 线条宽度   列: line_broadband
     */
    private String lineBroadband;
    /**
     * 填充颜色   列: fill_color
     */
    private String fillColor;
    /**
     * 备注   列: remarks
     */
    private String remarks;
    /**
     * 围栏数据   列: data
     */
    private String data;
    /**
     * 创建人   列: create_by
     */
    private Long createBy;
    /**
     * 创建时间   列: create_at
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 修改人   列: update_by
     */
    private Long updateBy;
    /**
     * 修改时间   列: update_at
     */
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridMemberGpsLogDO.java

New file
@@ -0,0 +1,69 @@
package com.panzhihua.service_grid.model.dos;

import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;



/**
 * 网格员定时上报地理信息实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@TableName("event_grid_member_gps_log")
public class EventGridMemberGpsLogDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键ID   列: id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 网格所属街道   列: grid_street_id
     */
    private Long gridStreetId;
    /**
     * 网格所属社区ID   列: grid_community_id
     */
    private Long gridCommunityId;
    /**
     * 网格ID   列: grid_id
     */
    private Long gridId;
    /**
     * 网格名称   列: grid_name
     */
    private String gridName;
    /**
     * 网格员ID   列: grid_member_id
     */
    private Long gridMemberId;
    /**
     * 精度维度信息，逗号分割   列: lng_lat
     */
    private String lngLat;
    /**
     * 位置信息状态（1、为判定2、正常3、是不正常）   列: position_station
     */
    private Integer positionStation;
    /**
     * 创建人   列: create_by
     */
    private Long createBy;
    /**
     * 创建时间   列: create_at
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridMemberRelationDO.java

New file
@@ -0,0 +1,61 @@
package com.panzhihua.service_grid.model.dos;

import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;



/**
 * 网格和网格员的关联关系实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@TableName("event_grid_member_relation")
public class EventGridMemberRelationDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键ID   列: id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 网格所属街道   列: grid_street_id
     */
    private Long gridStreetId;
    /**
     * 网格所属社区ID   列: grid_community_id
     */
    private Long gridCommunityId;
    /**
     * 网格ID   列: grid_id
     */
    private Long gridId;
    /**
     * 网格名称   列: grid_name
     */
    private String gridName;
    /**
     * 网格员ID   列: grid_member_id
     */
    private Long gridMemberId;
    /**
     * 创建人   列: create_by
     */
    private Long createBy;
    /**
     * 创建时间   列: create_at
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridMemberWarnLogDO.java

New file
@@ -0,0 +1,69 @@
package com.panzhihua.service_grid.model.dos;

import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;



/**
 * 网格员定时上报地理预警记录实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@TableName("event_grid_member_warn_log")
public class EventGridMemberWarnLogDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键ID   列: id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 网格所属街道   列: grid_street_id
     */
    private Long gridStreetId;
    /**
     * 网格所属社区ID   列: grid_community_id
     */
    private Long gridCommunityId;
    /**
     * 网格ID   列: grid_id
     */
    private Long gridId;
    /**
     * 网格名称   列: grid_name
     */
    private String gridName;
    /**
     * 网格员ID   列: grid_member_id
     */
    private Long gridMemberId;
    /**
     * 精度维度信息，逗号分割   列: lng_lat
     */
    private String lngLat;
    /**
     * 预警信息内容   列: content
     */
    private String content;
    /**
     * 创建人   列: create_by
     */
    private Long createBy;
    /**
     * 创建时间   列: create_at
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventMainMemberDO.java

New file
@@ -0,0 +1,150 @@
package com.panzhihua.service_grid.model.dos;

import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;



/**
 * 重点人群记录实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@TableName("event_main_member")
public class EventMainMemberDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * id   列: id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 网格员所处的街道   列: grid_member_street
     */
    private Long gridMemberStreet;
    /**
     * 网格员所处社区   列: grid_member_community
     */
    private Long gridMemberCommunity;
    /**
     * 网格员   列: grid_member
     */
    private Long gridMember;
    /**
     * 网格员名字   列: grid_member_name
     */
    private String gridMemberName;
    /**
     * 网格员联系方式   列: grid_member_tele
     */
    private String gridMemberTele;
    /**
     * 需走访人ID   列: visiter_id
     */
    private Long visiterId;
    /**
     * 需走访人名字   列: visiter_name
     */
    private String visiterName;
    /**
     * 需走访人员性别   列: visiter_sex
     */
    private Integer visiterSex;
    /**
     * 需走访人电话   列: visiter_tele
     */
    private String visiterTele;
    /**
     * 需走访人居住地址   列: visiter_address
     */
    private String visiterAddress;
    /**
     * 需走访人地址精度纬度信息（逗号隔开）   列: visiter_address_lat_lng
     */
    private String visiterAddressLatLng;
    /**
     * 人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员   列: visiter_type
     */
    private Integer visiterType;
    /**
     * 社区处理(0是无需社区1是社区处理)   列: act_opara
     */
    private Integer actOpara;
    /**
     * 事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）   列: event_status
     */
    private Integer eventStatus;
    /**
     * 上报状态   列: reporting
     */
    private Integer reporting;
    /**
     * 当前处理对象类型（1、网格员2、社区3、是街道）   列: dell_type
     */
    private Integer dellType;
    /**
     * 处理人ID   列: dell_user_id
     */
    private Long dellUserId;
    /**
     * 处理人名称   列: dell_user_name
     */
    private String dellUserName;
    /**
     * 处理时间   列: dell_date
     */
    private Date dellDate;
    /**
     * 解决人针对解决事件的处理描述   列: dell_desc
     */
    private String dellDesc;
    /**
     * 是否有效   列: invalid
     */
    private Boolean invalid;
    /**
     * 是否紧急   列: urgent
     */
    private Boolean urgent;
    /**
     * 是否催办   列: urgent_dell
     */
    private Boolean urgentDell;
    /**
     * 上报提交时间   列: submit_date
     */
    private Date submitDate;
    /**
     * 走访频率配置，一个月几次   列: visiter_config
     */
    private String visiterConfig;
    /**
     * 创建人   列: create_by
     */
    private Long createBy;
    /**
     * 创建事件   列: create_at
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 修改人   列: update_by
     */
    private Long updateBy;
    /**
     * 修改时间   列: update_at
     */
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventResourceDO.java

New file
@@ -0,0 +1,65 @@
package com.panzhihua.service_grid.model.dos;

import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;



/**
 * 事件或者走访中关联的图片音频和视频文件实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@TableName("event_resource")
public class EventResourceDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 分类（1、事件 2、走访 3、事件流转）   列: classification
     */
    private Integer classification;
    /**
     * ID   列: id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 事件或者走访任务关联ID   列: id
     */
    private Long refId;
    /**
     * 事件上传的资源类型(1是图片2是音频3是是视频)   列: type
     */
    private Integer type;
    /**
     * 资源名称   列: resource_name
     */
    private String resourceName;
    /**
     * 资源大小   列: resource_size
     */
    private String resourceSize;
    /**
     * 事件上传的资源URL地址   列: url
     */
    private String url;
    /**
     * 创建人   列: create_by
     */
    private Long createBy;
    /**
     * 创建时间   列: create_at
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventTransferRecordDO.java

New file
@@ -0,0 +1,73 @@
package com.panzhihua.service_grid.model.dos;

import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;



/**
 * 事件处理流转记录实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@TableName("event_transfer_record")
public class EventTransferRecordDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * id   列: id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 事件ID   列: event_id
     */
    private Long eventId;
    /**
     * 来源类型（1、网格员2、社区3、是街道）   列: from_type
     */
    private Integer fromType;
    /**
     * 事件来源机构或网格员   列: from_id
     */
    private Long fromId;
    /**
     * 转交办理人路径名称   列: from_name
     */
    private String fromName;
    /**
     * 转交类型（1、网格员2、社区3、是街道）   列: to_type
     */
    private Integer toType;
    /**
     * 事件下游机构或网格员   列: to_id
     */
    private Long toId;
    /**
     * 需要办理人路径名称   列: to_name
     */
    private String toName;
    /**
     * 处理结果   列: process_result
     */
    private String processResult;
    /**
     * 处理时间   列: process_date
     */
    private Date processDate;
    /**
     * 创建时间   列: create_at
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventVisitingTasksDO.java

New file
@@ -0,0 +1,174 @@
package com.panzhihua.service_grid.model.dos;

import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;



/**
 * 重点人群走访记录实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@TableName("event_visiting_tasks")
public class EventVisitingTasksDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * id   列: id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 网格员所处的街道   列: grid_member_street
     */
    private Long gridMemberStreet;
    /**
     * 网格员所处社区   列: grid_member_community
     */
    private Long gridMemberCommunity;
    /**
     * 网格员   列: grid_member
     */
    private Long gridMember;
    /**
     * 网格员名字   列: grid_member_name
     */
    private String gridMemberName;
    /**
     * 网格员联系方式   列: grid_menber_tele
     */
    private String gridMenberTele;
    /**
     * 需走访人ID   列: visiter_id
     */
    private Long visiterId;
    /**
     * 需走访人名字   列: visiter_name
     */
    private String visiterName;
    /**
     * 需走访人员性别   列: visiter_sex
     */
    private Integer visiterSex;
    /**
     * 需走访人电话   列: visiter_tele
     */
    private String visiterTele;
    /**
     * 需走访人居住地址   列: visiter_address
     */
    private String visiterAddress;
    /**
     * 人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员   列: visiter_type
     */
    private Integer visiterType;
    /**
     * 事件标题   列: event_title
     */
    private String eventTitle;
    /**
     * 事件类型   列: event_type
     */
    private Integer eventType;
    /**
     * 事件描述   列: event_des
     */
    private String eventDes;
    /**
     * 社区处理(0是无需社区1是社区处理)   列: act_opara
     */
    private Integer actOpara;
    /**
     * 发生时间   列: happen_time
     */
    private Date happenTime;
    /**
     * 发生地点   列: happent_address
     */
    private String happentAddress;
    /**
     * 发生的精度纬度信息（逗号隔开）   列: happent_lat_lng
     */
    private String happentLatLng;
    /**
     * 事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）   列: event_status
     */
    private Integer eventStatus;
    /**
     * 上报状态   列: reporting
     */
    private Integer reporting;
    /**
     * 当前处理对象类型（1、网格员2、社区3、是街道）   列: dell_type
     */
    private Integer dellType;
    /**
     * 处理人ID   列: dell_user_id
     */
    private Long dellUserId;
    /**
     * 处理人名称   列: dell_user_name
     */
    private String dellUserName;
    /**
     * 处理时间   列: dell_date
     */
    private Date dellDate;
    /**
     * 解决人针对解决事件的处理描述   列: dell_desc
     */
    private String dellDesc;
    /**
     * 是否有效   列: invalid
     */
    private Boolean invalid;
    /**
     * 是否紧急   列: urgent
     */
    private Boolean urgent;
    /**
     * 是否催办   列: urgent_dell
     */
    private Boolean urgentDell;
    /**
     * 上报提交时间   列: submit_date
     */
    private Date submitDate;
    /**
     * 是否异常行为   列: exception
     */
    private Boolean exception;
    /**
     * 走访内容根据重点人员类型输入项不同，录入全部的表单内容数据   列: table_content_json
     */
    private String tableContentJson;
    /**
     * 创建人   列: create_by
     */
    private Long createBy;
    /**
     * 创建事件   列: create_at
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 修改人   列: update_by
     */
    private Long updateBy;
    /**
     * 修改时间   列: update_at
     */
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/helper/encrypt/ParammeterInterceptor.java

New file
@@ -0,0 +1,114 @@
package com.panzhihua.service_grid.model.helper.encrypt;


import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
import com.panzhihua.common.model.helper.encrypt.EncryptQueryClass;
import com.panzhihua.common.model.helper.encrypt.IEncryptDecrypt;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.binding.BindingException;
import org.apache.ibatis.binding.MapperMethod;
import org.apache.ibatis.executor.parameter.ParameterHandler;
import org.apache.ibatis.plugin.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.stereotype.Component;

import java.lang.reflect.Field;
import java.sql.PreparedStatement;
import java.util.*;

/**
 * 加密拦截器
 * 包含加密字段查询时 的加密步骤
 * @author cedoo
 * @since 2021-4-1 10:40:52
 */
@Intercepts({
        @Signature(type = ParameterHandler.class, method = "setParameters", args = PreparedStatement.class),
})
@ConditionalOnProperty(value = "domain.encrypt", havingValue = "true")
@Component
@Slf4j
public class ParammeterInterceptor  implements Interceptor {

    @Autowired
    private IEncryptDecrypt encryptDecrypt;

    @Override
    public Object intercept(Invocation invocation) throws Throwable {
        //拦截 ParameterHandler 的 setParameters 方法 动态设置参数
        if (invocation.getTarget() instanceof ParameterHandler) {
            ParameterHandler parameterHandler = (ParameterHandler) invocation.getTarget();
            PreparedStatement ps = (PreparedStatement) invocation.getArgs()[0];

            // 反射获取 参数对像
            Field parameterField =
                    parameterHandler.getClass().getDeclaredField("parameterObject");
            parameterField.setAccessible(true);
            Object parameterObject = parameterField.get(parameterHandler);
            if (Objects.nonNull(parameterObject)) {
                Class<?> parameterObjectClass = parameterObject.getClass();
                EncryptDecryptClass encryptDecryptClass = AnnotationUtils.findAnnotation(parameterObjectClass, EncryptDecryptClass.class);
                if (Objects.nonNull(encryptDecryptClass)) {
                    Field[] declaredFields = parameterObjectClass.getDeclaredFields();
                    final Object encrypt = encryptDecrypt.encrypt(declaredFields, parameterObject);
                }
                /**
                 * 通过加密字段查询时， 将查询参数中的加密字段加密后查询
                 */
                if(parameterObjectClass == MapperMethod.ParamMap.class) {
                    MapperMethod.ParamMap paramMap = (MapperMethod.ParamMap) parameterObject;
                    boolean encrypted = false;
                    try{
                        /**
                         * 分页插件，会在分页查询时 进行多次查询，需要判断是否已对加密参数加密，防止多次加密后，查询失败
                         */
                        encrypted = paramMap.get("encrypted")!=null;
                    }catch (BindingException be){
                        encrypted = false;
                    }
                    if(!encrypted) {
                        Iterator iterator = paramMap.entrySet().iterator();
                        while(iterator.hasNext()){
                            Map.Entry<String, Object> entry = (Map.Entry<String, Object>) iterator.next();
                            if (entry.getKey().startsWith("param")) {
                                Object v = entry.getValue();
                                if(v!=null) {
                                    EncryptQueryClass encryptQueryClass = AnnotationUtils.findAnnotation(v.getClass(), EncryptQueryClass.class);
                                    if (Objects.nonNull(encryptQueryClass)) {
                                        Field[] declaredFields = v.getClass().getDeclaredFields();
                                        for (Field field : declaredFields) {
                                            if (field.isAnnotationPresent(EncryptQuery.class)) {
                                                try {
                                                    final Object encrypt = encryptDecrypt.encrypt(new Field[]{field}, v);
                                                    paramMap.put("encrypted", true);
                                                } catch (IllegalAccessException e) {
                                                    e.printStackTrace();
                                                }
                                            }
                                        }
                                    }
                                }
                            }
                        }
                    }

                }

            }
        }
        return invocation.proceed();
    }

    @Override
    public Object plugin(Object o) {
        return Plugin.wrap(o, this);
    }

    @Override
    public void setProperties(Properties properties) {

    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/helper/encrypt/ResultInterceptor.java

New file
@@ -0,0 +1,79 @@
package com.panzhihua.service_grid.model.helper.encrypt;

import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.IEncryptDecrypt;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.executor.resultset.ResultSetHandler;
import org.apache.ibatis.plugin.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;

import java.sql.Statement;
import java.util.ArrayList;
import java.util.Objects;
import java.util.Properties;

/**
 * 解密拦截器
 *
 * @author cedoo
 * @since 2021-4-1 10:40:52
 */
@Intercepts({
        @Signature(type = ResultSetHandler.class, method = "handleResultSets", args={Statement.class})
})
@ConditionalOnProperty(value = "domain.decrypt", havingValue = "true")
@Component
@Slf4j
@Order(110)
public class ResultInterceptor implements Interceptor {

    @Autowired
    private IEncryptDecrypt encryptDecrypt;

    @Override
    public Object intercept(Invocation invocation) throws Throwable {
        Object result = invocation.proceed();
        if (Objects.isNull(result)){
            return null;
        }

        if (result instanceof ArrayList) {
            ArrayList resultList = (ArrayList) result;
            if (resultList!=null && resultList.size()>0 && needToDecrypt(resultList.get(0))){
                for (int i = 0; i < resultList.size(); i++) {
                    encryptDecrypt.decrypt(resultList.get(i));
                }
            }
        }else {
            if (needToDecrypt(result)){
                encryptDecrypt.decrypt(result);
            }
        }
        return result;
    }

    public boolean needToDecrypt(Object object){
        if(object!=null) {
            Class<?> objectClass = object.getClass();
            EncryptDecryptClass encryptDecryptClass = AnnotationUtils.findAnnotation(objectClass, EncryptDecryptClass.class);
            if (Objects.nonNull(encryptDecryptClass)) {
                return true;
            }
        }
        return false;
    }

    @Override
    public Object plugin(Object target) {
        return Plugin.wrap(target, this);
    }

    @Override
    public void setProperties(Properties properties) {

    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/helper/sensitive/SensitiveInterceptor.java

New file
@@ -0,0 +1,75 @@
package com.panzhihua.service_grid.model.helper.sensitive;

import com.panzhihua.common.model.helper.sensitive.Sensitive;
import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.executor.resultset.ResultSetHandler;
import org.apache.ibatis.plugin.Interceptor;
import org.apache.ibatis.plugin.Intercepts;
import org.apache.ibatis.plugin.Invocation;
import org.apache.ibatis.plugin.Signature;
import org.apache.ibatis.reflection.MetaObject;
import org.apache.ibatis.reflection.SystemMetaObject;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;

import java.lang.reflect.Field;
import java.sql.Statement;
import java.util.List;
import java.util.stream.Stream;

/**
 * 字段脱敏拦截器
 * @author cedoo
 * @since 2021-4-1 10:40:52
 */
@Intercepts(@Signature(type = ResultSetHandler.class,
        method = "handleResultSets",
        args = {Statement.class}))
@Slf4j
@ConditionalOnProperty(value = "domain.sensitive", havingValue = "true")
@Component
@Order(120)
public class SensitiveInterceptor implements Interceptor {
    @SuppressWarnings("unchecked")
    @Override
    public Object intercept(Invocation invocation) throws Throwable {
        //log.debug("脱敏拦截器");
        List<Object> records = (List<Object>) invocation.proceed();
        // 对结果集脱敏
        records.forEach(this::sensitive);
        return records;
    }


    private void sensitive(Object source) {
        if(source!=null) {
            // 拿到返回值类型
            Class<?> sourceClass = source.getClass();
            // 初始化返回值类型的 MetaObject
            MetaObject metaObject = SystemMetaObject.forObject(source);
            // 捕捉到属性上的标记注解 @Sensitive 并进行对应的脱敏处理
            Stream.of(sourceClass.getDeclaredFields())
                    .filter(field -> field.isAnnotationPresent(Sensitive.class))
                    .forEach(field -> doSensitive(metaObject, field));
        }
    }


    private void doSensitive(MetaObject metaObject, Field field) {
        // 拿到属性名
        String name = field.getName();
        // 获取属性值
        Object value = metaObject.getValue(name);
        // 只有字符串类型才能脱敏  而且不能为null
        if (String.class == metaObject.getGetterType(name) && value != null) {
            Sensitive annotation = field.getAnnotation(Sensitive.class);
            // 获取对应的脱敏策略 并进行脱敏
            SensitiveStrategy type = annotation.strategy();
            Object o = type.getDesensitizer().apply((String) value);
            // 把脱敏后的值塞回去
            metaObject.setValue(name, o);
        }
    }
}

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

New file
@@ -0,0 +1,85 @@
package com.panzhihua.service_grid.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.ComActEasyPhotoDetailsVO;
import com.panzhihua.common.model.vos.grid.ComActEasyPhotoVO;
import com.panzhihua.service_grid.model.dos.ComActEasyPhotoDO;

/**
 * 社区活动 》随手拍 service
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
public interface ComActEasyPhotoService extends IService<ComActEasyPhotoDO> {

    /**
     * 新增社区活动 》随手拍
     * @param comActEasyPhotoAddDTO
     * @return 新增结果
     */
    R add(ComActEasyPhotoAddDTO comActEasyPhotoAddDTO);

    /**
     * 修改社区活动 》随手拍
     * @param comActEasyPhotoEditDTO
     * @return 维护结果
     */
    R edit(ComActEasyPhotoEditDTO comActEasyPhotoEditDTO);

    /**
     * 分页查询随手拍
     * @param easyAppDTO    请求参数
     * @return 随手拍列表
     */
    R<IPage<ComActEasyPhotoVO>> query(PageEasyAppDTO easyAppDTO);

    /**
     * 删除社区活动 》随手拍
     * @param ComActEasyPhotoDeleteDTO
     * @return 平台用户信息
     */
    R delete(ComActEasyPhotoDeleteDTO ComActEasyPhotoDeleteDTO);

    /**
     * 查询社区活动 》随手拍详细信息
     * @param id 社区活动 》随手拍 id
     * @return 查找结果
     */
    R<ComActEasyPhotoDetailsVO> comActEasyPhotoDetails(Long id);

    /**
     * 根据随手拍id查询随手拍详情
     * @param easyId    随手拍id
     * @return  随手拍详情
     */
    R detail(Long easyId);

    /**
     * 随手拍处理
     * @param photoHandleDTO    请求参数
     * @return  处理结果
     */
    R easyHandle(ComActEasyPhotoHandleDTO photoHandleDTO);

    /**
     * 随手拍公示状态切换
     * @param photoHandleDTO    请求参数
     * @return  切换结果
     */
    R easyPublicity(ComActEasyPhotoHandleDTO photoHandleDTO);

    /**
     * 随手拍上报社区
     * @param photoHandleDTO    请求参数
     * @return  上报结果
     */
    R easyReport(ComActEasyPhotoHandleDTO photoHandleDTO);


}

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

New file
@@ -0,0 +1,17 @@
package com.panzhihua.service_grid.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_grid.model.dos.ComActEasyPhotoTypeRelationDO;

/**
 * 随手拍类型关联 service
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-27
 * */
public interface ComActEasyPhotoTypeRelationService extends IService<ComActEasyPhotoTypeRelationDO> {


}

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

New file
@@ -0,0 +1,66 @@
package com.panzhihua.service_grid.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoTypeAddDTO;
import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoTypeDeleteDTO;
import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoTypeEditDTO;
import com.panzhihua.common.model.dtos.grid.PageComActEasyPhotoTypeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.ComActEasyPhotoTypeDetailsVO;
import com.panzhihua.common.model.vos.grid.ComActEasyPhotoTypeVO;
import com.panzhihua.service_grid.model.dos.ComActEasyPhotoTypeDO;

/**
 * 随手拍类型 service
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
public interface ComActEasyPhotoTypeService extends IService<ComActEasyPhotoTypeDO> {

    /**
     * 新增随手拍类型
     * @param comActEasyPhotoTypeAddDTO
     * @return 新增结果
     */
    R add(ComActEasyPhotoTypeAddDTO comActEasyPhotoTypeAddDTO);

    /**
     * 修改随手拍类型
     * @param comActEasyPhotoTypeEditDTO
     * @return 维护结果
     */
    R edit(ComActEasyPhotoTypeEditDTO comActEasyPhotoTypeEditDTO);

    /**
     * 分页查找随手拍类型
     * @param pageComActEasyPhotoTypeDTO
     * @return 维护结果
     */
    R<IPage<ComActEasyPhotoTypeVO>> query(PageComActEasyPhotoTypeDTO pageComActEasyPhotoTypeDTO);

    /**
     * 删除随手拍类型
     * @param ComActEasyPhotoTypeDeleteDTO
     * @return 平台用户信息
     */
    R delete(ComActEasyPhotoTypeDeleteDTO ComActEasyPhotoTypeDeleteDTO);

    /**
     * 查询随手拍类型详细信息
     * @param id 随手拍类型 id
     * @return 查找结果
     */
    R<ComActEasyPhotoTypeDetailsVO> comActEasyPhotoTypeDetails(Long id);

    /**
     * 查询随手拍类型列表
     * @return  类型列表
     */
    R typeList();


}

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

New file
@@ -0,0 +1,60 @@
package com.panzhihua.service_grid.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.grid.EventApplicationAppReleaseAddDTO;
import com.panzhihua.common.model.dtos.grid.EventApplicationAppReleaseDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventApplicationAppReleaseEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventApplicationAppReleaseDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventApplicationAppReleaseDetailsVO;
import com.panzhihua.common.model.vos.grid.EventApplicationAppReleaseVO;
import com.panzhihua.service_grid.model.dos.EventApplicationAppReleaseDO;

/**
 * APP应用版本信息 service
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
public interface EventApplicationAppReleaseService extends IService<EventApplicationAppReleaseDO> {

    /**
     * 新增APP应用版本信息
     * @param eventApplicationAppReleaseAddDTO
     * @return 新增结果
     */
    R add(EventApplicationAppReleaseAddDTO eventApplicationAppReleaseAddDTO);

    /**
     * 修改APP应用版本信息
     * @param eventApplicationAppReleaseEditDTO
     * @return 维护结果
     */
    R edit(EventApplicationAppReleaseEditDTO eventApplicationAppReleaseEditDTO);

    /**
     * 分页查找APP应用版本信息
     * @param pageEventApplicationAppReleaseDTO
     * @return 维护结果
     */
    R<IPage<EventApplicationAppReleaseVO>> query(PageEventApplicationAppReleaseDTO pageEventApplicationAppReleaseDTO);

    /**
     * 删除APP应用版本信息
     * @param EventApplicationAppReleaseDeleteDTO
     * @return 平台用户信息
     */
    R delete(EventApplicationAppReleaseDeleteDTO EventApplicationAppReleaseDeleteDTO);

    /**
     * 查询APP应用版本信息详细信息
     * @param id APP应用版本信息 id
     * @return 查找结果
     */
    R<EventApplicationAppReleaseDetailsVO> eventApplicationAppReleaseDetails(Long id);


}

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

New file
@@ -0,0 +1,60 @@
package com.panzhihua.service_grid.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.grid.EventApplicationUserNoticeAddDTO;
import com.panzhihua.common.model.dtos.grid.EventApplicationUserNoticeDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventApplicationUserNoticeEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventApplicationUserNoticeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventApplicationUserNoticeDetailsVO;
import com.panzhihua.common.model.vos.grid.EventApplicationUserNoticeVO;
import com.panzhihua.service_grid.model.dos.EventApplicationUserNoticeDO;

/**
 * 用户协议和隐私政策信息 service
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
public interface EventApplicationUserNoticeService extends IService<EventApplicationUserNoticeDO> {

    /**
     * 新增用户协议和隐私政策信息
     * @param eventApplicationUserNoticeAddDTO
     * @return 新增结果
     */
    R add(EventApplicationUserNoticeAddDTO eventApplicationUserNoticeAddDTO);

    /**
     * 修改用户协议和隐私政策信息
     * @param eventApplicationUserNoticeEditDTO
     * @return 维护结果
     */
    R edit(EventApplicationUserNoticeEditDTO eventApplicationUserNoticeEditDTO);

    /**
     * 分页查找用户协议和隐私政策信息
     * @param pageEventApplicationUserNoticeDTO
     * @return 维护结果
     */
    R<IPage<EventApplicationUserNoticeVO>> query(PageEventApplicationUserNoticeDTO pageEventApplicationUserNoticeDTO);

    /**
     * 删除用户协议和隐私政策信息
     * @param EventApplicationUserNoticeDeleteDTO
     * @return 平台用户信息
     */
    R delete(EventApplicationUserNoticeDeleteDTO EventApplicationUserNoticeDeleteDTO);

    /**
     * 查询用户协议和隐私政策信息详细信息
     * @param id 用户协议和隐私政策信息 id
     * @return 查找结果
     */
    R<EventApplicationUserNoticeDetailsVO> eventApplicationUserNoticeDetails(Long id);


}

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

New file
@@ -0,0 +1,73 @@
package com.panzhihua.service_grid.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.grid.EventGridDataAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridDataDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventGridDataEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
import com.panzhihua.service_grid.model.dos.EventGridDataDO;

/**
 * 区县/街道/社区/网格员网格数据管理 service
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
public interface EventGridDataService extends IService<EventGridDataDO> {

    /**
     * 新增区县/街道/社区/网格员网格数据管理
     * @param eventGridDataAddDTO
     * @return 新增结果
     */
    R add(EventGridDataAddDTO eventGridDataAddDTO);

    /**
     * 修改区县/街道/社区/网格员网格数据管理
     * @param eventGridDataEditDTO
     * @return 维护结果
     */
    R edit(EventGridDataEditDTO eventGridDataEditDTO);

    /**
     * 分页查找区县/街道/社区/网格员网格数据管理
     * @param pageEventGridDataDTO
     * @return 维护结果
     */
    R<IPage<EventGridDataVO>> query(PageEventGridDataDTO pageEventGridDataDTO);

    /**
     * 删除区县/街道/社区/网格员网格数据管理
     * @param EventGridDataDeleteDTO
     * @return 平台用户信息
     */
    R delete(EventGridDataDeleteDTO EventGridDataDeleteDTO);

    /**
     * 查询区县/街道/社区/网格员网格数据管理详细信息
     * @param id 区县/街道/社区/网格员网格数据管理 id
     * @return 查找结果
     */
    R<EventGridDataDetailsVO> eventGridDataDetails(Long id);


    /**
     * 查询用户网格数据管理
     * @param pageEventGridDataDTO dto
     * @return 查找结果
     */
    R getUserGrid(PageEventGridDataDTO pageEventGridDataDTO);

    /**
     * 地图模块-根据网格id查询网格详细信息
     * @param gridId    网格id
     * @return  网格详细信息
     */
    R getMapGridDetail(Long gridId);
}

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

New file
@@ -0,0 +1,67 @@
package com.panzhihua.service_grid.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.grid.EventGridMemberGpsLogAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberGpsLogDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberGpsLogEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberGpsLogDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogVO;
import com.panzhihua.service_grid.model.dos.EventGridMemberGpsLogDO;

/**
 * 网格员定时上报地理信息 service
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
public interface EventGridMemberGpsLogService extends IService<EventGridMemberGpsLogDO> {

    /**
     * 新增网格员定时上报地理信息
     * @param eventGridMemberGpsLogAddDTO
     * @return 新增结果
     */
    R add(EventGridMemberGpsLogAddDTO eventGridMemberGpsLogAddDTO);

    /**
     * 修改网格员定时上报地理信息
     * @param eventGridMemberGpsLogEditDTO
     * @return 维护结果
     */
    R edit(EventGridMemberGpsLogEditDTO eventGridMemberGpsLogEditDTO);

    /**
     * 分页查找网格员定时上报地理信息
     * @param pageEventGridMemberGpsLogDTO
     * @return 维护结果
     */
    R<IPage<EventGridMemberGpsLogVO>> query(PageEventGridMemberGpsLogDTO pageEventGridMemberGpsLogDTO);

    /**
     * 删除网格员定时上报地理信息
     * @param EventGridMemberGpsLogDeleteDTO
     * @return 平台用户信息
     */
    R delete(EventGridMemberGpsLogDeleteDTO EventGridMemberGpsLogDeleteDTO);

    /**
     * 查询网格员定时上报地理信息详细信息
     * @param id 网格员定时上报地理信息 id
     * @return 查找结果
     */
    R<EventGridMemberGpsLogDetailsVO> eventGridMemberGpsLogDetails(Long id);

    /**
     * 根据网格员id查询今日轨迹
     * @param userId    网格员id
     * @return  网格员今日轨迹
     */
    R getTrajectoryByApp(Long userId);


}

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

New file
@@ -0,0 +1,67 @@
package com.panzhihua.service_grid.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
import com.panzhihua.service_grid.model.dos.EventGridMemberRelationDO;

/**
 * 网格和网格员的关联关系 service
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
public interface EventGridMemberRelationService extends IService<EventGridMemberRelationDO> {

    /**
     * 新增网格和网格员的关联关系
     * @param eventGridMemberRelationAddDTO
     * @return 新增结果
     */
    R add(EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO);

    /**
     * 修改网格和网格员的关联关系
     * @param eventGridMemberRelationEditDTO
     * @return 维护结果
     */
    R edit(EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO);

    /**
     * 分页查找网格和网格员的关联关系
     * @param pageEventGridMemberRelationDTO
     * @return 维护结果
     */
    R<IPage<EventGridMemberRelationVO>> query(PageEventGridMemberRelationDTO pageEventGridMemberRelationDTO);

    /**
     * 删除网格和网格员的关联关系
     * @param EventGridMemberRelationDeleteDTO
     * @return 平台用户信息
     */
    R delete(EventGridMemberRelationDeleteDTO EventGridMemberRelationDeleteDTO);

    /**
     * 查询网格和网格员的关联关系详细信息
     * @param id 网格和网格员的关联关系 id
     * @return 查找结果
     */
    R<EventGridMemberRelationDetailsVO> eventGridMemberRelationDetails(Long id);

    /**
     * 根据网格员id查询关联网格列表
     * @param userId    网格员id
     * @return  网格列表
     */
    R getMapGridListByApp(Long userId);


}

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

New file
@@ -0,0 +1,60 @@
package com.panzhihua.service_grid.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.grid.EventGridMemberWarnLogAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberWarnLogDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberWarnLogEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberWarnLogDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberWarnLogDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberWarnLogVO;
import com.panzhihua.service_grid.model.dos.EventGridMemberWarnLogDO;

/**
 * 网格员定时上报地理预警记录 service
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
public interface EventGridMemberWarnLogService extends IService<EventGridMemberWarnLogDO> {

    /**
     * 新增网格员定时上报地理预警记录
     * @param eventGridMemberWarnLogAddDTO
     * @return 新增结果
     */
    R add(EventGridMemberWarnLogAddDTO eventGridMemberWarnLogAddDTO);

    /**
     * 修改网格员定时上报地理预警记录
     * @param eventGridMemberWarnLogEditDTO
     * @return 维护结果
     */
    R edit(EventGridMemberWarnLogEditDTO eventGridMemberWarnLogEditDTO);

    /**
     * 分页查找网格员定时上报地理预警记录
     * @param pageEventGridMemberWarnLogDTO
     * @return 维护结果
     */
    R<IPage<EventGridMemberWarnLogVO>> query(PageEventGridMemberWarnLogDTO pageEventGridMemberWarnLogDTO);

    /**
     * 删除网格员定时上报地理预警记录
     * @param EventGridMemberWarnLogDeleteDTO
     * @return 平台用户信息
     */
    R delete(EventGridMemberWarnLogDeleteDTO EventGridMemberWarnLogDeleteDTO);

    /**
     * 查询网格员定时上报地理预警记录详细信息
     * @param id 网格员定时上报地理预警记录 id
     * @return 查找结果
     */
    R<EventGridMemberWarnLogDetailsVO> eventGridMemberWarnLogDetails(Long id);


}

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

New file
@@ -0,0 +1,60 @@
package com.panzhihua.service_grid.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.grid.EventMainMemberAddDTO;
import com.panzhihua.common.model.dtos.grid.EventMainMemberDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventMainMemberEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventMainMemberDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventMainMemberDetailsVO;
import com.panzhihua.common.model.vos.grid.EventMainMemberVO;
import com.panzhihua.service_grid.model.dos.EventMainMemberDO;

/**
 * 重点人群记录 service
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
public interface EventMainMemberService extends IService<EventMainMemberDO> {

    /**
     * 新增重点人群记录
     * @param eventMainMemberAddDTO
     * @return 新增结果
     */
    R add(EventMainMemberAddDTO eventMainMemberAddDTO);

    /**
     * 修改重点人群记录
     * @param eventMainMemberEditDTO
     * @return 维护结果
     */
    R edit(EventMainMemberEditDTO eventMainMemberEditDTO);

    /**
     * 分页查找重点人群记录
     * @param pageEventMainMemberDTO
     * @return 维护结果
     */
    R<IPage<EventMainMemberVO>> query(PageEventMainMemberDTO pageEventMainMemberDTO);

    /**
     * 删除重点人群记录
     * @param EventMainMemberDeleteDTO
     * @return 平台用户信息
     */
    R delete(EventMainMemberDeleteDTO EventMainMemberDeleteDTO);

    /**
     * 查询重点人群记录详细信息
     * @param id 重点人群记录 id
     * @return 查找结果
     */
    R<EventMainMemberDetailsVO> eventMainMemberDetails(Long id);


}

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

New file
@@ -0,0 +1,60 @@
package com.panzhihua.service_grid.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.grid.EventResourceAddDTO;
import com.panzhihua.common.model.dtos.grid.EventResourceDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventResourceEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventResourceDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventResourceDetailsVO;
import com.panzhihua.common.model.vos.grid.EventResourceVO;
import com.panzhihua.service_grid.model.dos.EventResourceDO;

/**
 * 事件或者走访中关联的图片音频和视频文件 service
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
public interface EventResourceService extends IService<EventResourceDO> {

    /**
     * 新增事件或者走访中关联的图片音频和视频文件
     * @param eventResourceAddDTO
     * @return 新增结果
     */
    R add(EventResourceAddDTO eventResourceAddDTO);

    /**
     * 修改事件或者走访中关联的图片音频和视频文件
     * @param eventResourceEditDTO
     * @return 维护结果
     */
    R edit(EventResourceEditDTO eventResourceEditDTO);

    /**
     * 分页查找事件或者走访中关联的图片音频和视频文件
     * @param pageEventResourceDTO
     * @return 维护结果
     */
    R<IPage<EventResourceVO>> query(PageEventResourceDTO pageEventResourceDTO);

    /**
     * 删除事件或者走访中关联的图片音频和视频文件
     * @param EventResourceDeleteDTO
     * @return 平台用户信息
     */
    R delete(EventResourceDeleteDTO EventResourceDeleteDTO);

    /**
     * 查询事件或者走访中关联的图片音频和视频文件详细信息
     * @param id 事件或者走访中关联的图片音频和视频文件 id
     * @return 查找结果
     */
    R<EventResourceDetailsVO> eventResourceDetails(Long id);


}

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

New file
@@ -0,0 +1,160 @@
package com.panzhihua.service_grid.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.service_grid.model.dos.EventDO;

/**
 * 事件 service
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
public interface EventService extends IService<EventDO> {

    /**
     * 新增事件
     * @param eventAddDTO
     * @return 新增结果
     */
    R add(EventAddDTO eventAddDTO);

    /**
     * 修改事件
     * @param eventEditDTO
     * @return 维护结果
     */
    R edit(EventEditDTO eventEditDTO);

    /**
     * 分页查找事件
     * @param pageEventDTO
     * @return 维护结果
     */
    R<IPage<EventVO>> query(PageEventDTO pageEventDTO);

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

    /**
     * 查询事件详细信息
     * @param id 事件 id
     * @return 查找结果
     */
    R<EventDetailsVO> eventDetails(Long id);

    /**
     * 添加事件
     * @param commonEventAddDTO
     * @return
     */
    R addCommon(CommonEventAddDTO commonEventAddDTO);

    /**
     * 保存事件草稿
     * @param commonEventEditDTO
     * @return
     */
    R saveDraft(CommonEventEditDTO commonEventEditDTO);

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

    /**
     * 突发事件撤销
     * @param eventRevokeDTO
     * @return
     */
    R emergenciesRevoke(EventRevokeDTO eventRevokeDTO);
    /**
     * 处理事件
     * @param commonEventDealDTO
     * @return
     */
    R dealEvent(CommonEventDealDTO commonEventDealDTO);

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

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

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

    /**
     * 保存殊人群事件上报草稿
     * @param specialEventEditDTO
     * @return
     */
    R saveSpecialDraft(SpecialEventEditDTO specialEventEditDTO);

    /**
     * 特殊人员信息上报
     * @param specialEventAddDTO
     * @return
     */
    R addSpecial(SpecialEventAddDTO specialEventAddDTO);


    /**
     * 获取指定特殊人员信息
     * @param idCard
     * @return
     */
    R getSpecialPopulation(String idCard);

    /**
     * 添加发布宣传教育事件
     * @param publicityEventAddDTO   请求参数
     * @return  上报结果
     */
    R addPublicity(PublicityEventAddDTO publicityEventAddDTO);

    /**
     * 保存宣传教育事件草稿
     * @param publicityEventEditDTO   请求参数
     * @return  保存结果
     */
    R savePublicityDraft(PublicityEventEditDTO publicityEventEditDTO);

    /**
     * 分页查询宣传教育事件
     * @param pagePublicityEventDTO
     * @return
     */
    R selectPublicity(PagePublicityEventDTO pagePublicityEventDTO);

    /**
     * 获取社区列表:当前默认所有社区
     * @return
     */
    R<ComActVO> actList();
}

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

New file
@@ -0,0 +1,60 @@
package com.panzhihua.service_grid.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.grid.EventTransferRecordAddDTO;
import com.panzhihua.common.model.dtos.grid.EventTransferRecordDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventTransferRecordEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventTransferRecordDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventTransferRecordDetailsVO;
import com.panzhihua.common.model.vos.grid.EventTransferRecordVO;
import com.panzhihua.service_grid.model.dos.EventTransferRecordDO;

/**
 * 事件处理流转记录 service
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
public interface EventTransferRecordService extends IService<EventTransferRecordDO> {

    /**
     * 新增事件处理流转记录
     * @param eventTransferRecordAddDTO
     * @return 新增结果
     */
    R add(EventTransferRecordAddDTO eventTransferRecordAddDTO);

    /**
     * 修改事件处理流转记录
     * @param eventTransferRecordEditDTO
     * @return 维护结果
     */
    R edit(EventTransferRecordEditDTO eventTransferRecordEditDTO);

    /**
     * 分页查找事件处理流转记录
     * @param pageEventTransferRecordDTO
     * @return 维护结果
     */
    R<IPage<EventTransferRecordVO>> query(PageEventTransferRecordDTO pageEventTransferRecordDTO);

    /**
     * 删除事件处理流转记录
     * @param EventTransferRecordDeleteDTO
     * @return 平台用户信息
     */
    R delete(EventTransferRecordDeleteDTO EventTransferRecordDeleteDTO);

    /**
     * 查询事件处理流转记录详细信息
     * @param id 事件处理流转记录 id
     * @return 查找结果
     */
    R<EventTransferRecordDetailsVO> eventTransferRecordDetails(Long id);


}

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

New file
@@ -0,0 +1,60 @@
package com.panzhihua.service_grid.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.grid.EventVisitingTasksAddDTO;
import com.panzhihua.common.model.dtos.grid.EventVisitingTasksDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventVisitingTasksEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventVisitingTasksDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventVisitingTasksDetailsVO;
import com.panzhihua.common.model.vos.grid.EventVisitingTasksVO;
import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO;

/**
 * 重点人群走访记录 service
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
public interface EventVisitingTasksService extends IService<EventVisitingTasksDO> {

    /**
     * 新增重点人群走访记录
     * @param eventVisitingTasksAddDTO
     * @return 新增结果
     */
    R add(EventVisitingTasksAddDTO eventVisitingTasksAddDTO);

    /**
     * 修改重点人群走访记录
     * @param eventVisitingTasksEditDTO
     * @return 维护结果
     */
    R edit(EventVisitingTasksEditDTO eventVisitingTasksEditDTO);

    /**
     * 分页查找重点人群走访记录
     * @param pageEventVisitingTasksDTO
     * @return 维护结果
     */
    R<IPage<EventVisitingTasksVO>> query(PageEventVisitingTasksDTO pageEventVisitingTasksDTO);

    /**
     * 删除重点人群走访记录
     * @param EventVisitingTasksDeleteDTO
     * @return 平台用户信息
     */
    R delete(EventVisitingTasksDeleteDTO EventVisitingTasksDeleteDTO);

    /**
     * 查询重点人群走访记录详细信息
     * @param id 重点人群走访记录 id
     * @return 查找结果
     */
    R<EventVisitingTasksDetailsVO> eventVisitingTasksDetails(Long id);


}

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

New file
@@ -0,0 +1,217 @@
package com.panzhihua.service_grid.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.ComActEasyPhotoDetailsVO;
import com.panzhihua.common.model.vos.grid.ComActEasyPhotoVO;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.ComActEasyPhotoService;
import com.panzhihua.service_grid.service.ComActEasyPhotoTypeRelationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
 * @auther lyq
 * @create 2021-04-14 15:03:01
 * @describe 订单表服务实现类
 */
@Slf4j
@Service
public class ComActEasyPhotoServiceImpl extends ServiceImpl<ComActEasyPhotoMapper, ComActEasyPhotoDO> implements ComActEasyPhotoService {

    @Resource
    private ComActEasyPhotoMapper comActEasyPhotoMapper;
    @Resource
    private ComActEasyPhotoTypeRelationMapper comActEasyPhotoTypeRelationMapper;
    @Resource
    private ComActEasyPhotoTypeRelationService comActEasyPhotoTypeRelationService;
    /**
     * 新增社区活动 》随手拍
     * @param comActEasyPhotoAddDTO
     * @return 新增结果
     */
    public R add(ComActEasyPhotoAddDTO comActEasyPhotoAddDTO){
        ComActEasyPhotoDO comActEasyPhotoDO = new ComActEasyPhotoDO();
        BeanUtils.copyProperties(comActEasyPhotoAddDTO, comActEasyPhotoDO);
        comActEasyPhotoDO.setCreateAt(new Date());
        if(comActEasyPhotoMapper.insert(comActEasyPhotoDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 修改社区活动 》随手拍
     * @param comActEasyPhotoEditDTO
     * @return 维护结果
     */
    public R edit(ComActEasyPhotoEditDTO comActEasyPhotoEditDTO){
        ComActEasyPhotoDO comActEasyPhotoDO = new ComActEasyPhotoDO();
        BeanUtils.copyProperties(comActEasyPhotoEditDTO, comActEasyPhotoDO);
        //comActEasyPhotoDO.setUpdateAt(new Date());
        if(comActEasyPhotoMapper.updateById(comActEasyPhotoDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页查找社区活动 》随手拍
     * @param easyAppDTO
     * @return 维护结果
     */
    public R<IPage<ComActEasyPhotoVO>> query(PageEasyAppDTO easyAppDTO){
        Page page = new Page(easyAppDTO.getPageNum(),easyAppDTO.getPageSize());
        if(easyAppDTO.getStatus() != null){
            switch (easyAppDTO.getStatus()){
                case 1:
                    easyAppDTO.setHandleStatus(1);
                    break;
                case 2:
                    easyAppDTO.setIsReport(1);
                    break;
                case 3:
                    easyAppDTO.setIsPublicity(1);
                    break;
                case 4:
                    easyAppDTO.setIsPublicity(0);
                    break;
                default:
                    break;
            }
        }
        return R.ok(comActEasyPhotoMapper.findByPage(page, easyAppDTO));
    }

    /**
     * 删除社区活动 》随手拍
     * @param ComActEasyPhotoDeleteDTO
     * @return 平台用户信息
     */
    public R delete(ComActEasyPhotoDeleteDTO ComActEasyPhotoDeleteDTO){
        return R.fail();
    }

    /**
     * 查询社区活动 》随手拍详细信息
     * @param id 社区活动 》随手拍 id
     * @return 查找结果
     */
    public R<ComActEasyPhotoDetailsVO> comActEasyPhotoDetails(Long id){
        ComActEasyPhotoDO comActEasyPhotoDO = comActEasyPhotoMapper.selectById(id);
        if(comActEasyPhotoDO!=null) {
            ComActEasyPhotoDetailsVO comActEasyPhotoDetailsVO = new ComActEasyPhotoDetailsVO();
            BeanUtils.copyProperties(comActEasyPhotoDO, comActEasyPhotoDetailsVO);
            return R.ok(comActEasyPhotoDetailsVO);
        }
        return R.fail();
    }

    /**
     * 根据随手拍id查询随手拍详情
     * @param easyId    随手拍id
     * @return  随手拍详情
     */
    @Override
    public R detail(Long easyId){
        ComActEasyPhotoVO easyPhotoVO = this.baseMapper.findByEaseId(easyId);
        if(easyPhotoVO != null){
            //查询随手拍类型
            List<String> typeRelationList = comActEasyPhotoTypeRelationMapper.getEasyPhotoTypeRelationByEasyId(easyId);
            if(!typeRelationList.isEmpty()){
                easyPhotoVO.setEasyPhotoList(typeRelationList);
            }
        }
        return R.ok(easyPhotoVO);
    }

    /**
     * 随手拍处理
     * @param photoHandleDTO    请求参数
     * @return  处理结果
     */
    @Override

    public R easyHandle(ComActEasyPhotoHandleDTO photoHandleDTO){
        ComActEasyPhotoDO easyPhotoDO = this.baseMapper.selectById(photoHandleDTO.getId());
        if(easyPhotoDO == null){
            return R.fail("随手拍不存在");
        }
        if(easyPhotoDO.getHandleStatus().equals(ComActEasyPhotoDO.handleStatus.yes)){
            return R.fail("该随手拍已处理");
        }
        BeanUtils.copyProperties(photoHandleDTO,easyPhotoDO);
        easyPhotoDO.setHandleStatus(ComActEasyPhotoDO.handleStatus.yes);
        //关联随手拍类型
        if(!photoHandleDTO.getEasyTypeIds().isEmpty()){
            List<ComActEasyPhotoTypeRelationDO> typeRelationDOList = new ArrayList<>();
            photoHandleDTO.getEasyTypeIds().forEach(typeId -> {
                ComActEasyPhotoTypeRelationDO typeRelationDO = new ComActEasyPhotoTypeRelationDO();
                typeRelationDO.setEasyId(easyPhotoDO.getId());
                typeRelationDO.setEasyTypeId(typeId);
                typeRelationDO.setCreateAt(new Date());
                typeRelationDOList.add(typeRelationDO);
            });
            comActEasyPhotoTypeRelationService.saveBatch(typeRelationDOList);
        }
        if(this.baseMapper.updateById(easyPhotoDO) > 0){
            return R.ok();
        }else{
            return R.fail();
        }
    }

    /**
     * 随手拍公示状态切换
     * @param photoHandleDTO    请求参数
     * @return  切换结果
     */
    @Override
    public R easyPublicity(ComActEasyPhotoHandleDTO photoHandleDTO){

        ComActEasyPhotoDO easyPhotoDO = this.baseMapper.selectById(photoHandleDTO.getId());
        if(easyPhotoDO == null){
            return R.fail("随手拍不存在");
        }
        easyPhotoDO.setIsPublicity(photoHandleDTO.getIsPublicity());
        if(this.baseMapper.updateById(easyPhotoDO) > 0){
            return R.ok();
        }else{
            return R.fail();
        }
    }

    /**
     * 随手拍上报社区
     * @param photoHandleDTO    请求参数
     * @return  上报结果
     */
    @Override
    public R easyReport(ComActEasyPhotoHandleDTO photoHandleDTO){
        ComActEasyPhotoDO easyPhotoDO = this.baseMapper.selectById(photoHandleDTO.getId());
        if(easyPhotoDO == null){
            return R.fail("随手拍不存在");
        }
        if(easyPhotoDO.getIsReport().equals(ComActEasyPhotoDO.isReport.yes)){
            return R.fail("随手拍已上报");
        }
        easyPhotoDO.setIsReport(ComActEasyPhotoDO.isReport.yes);
        if(this.baseMapper.updateById(easyPhotoDO) > 0){
            return R.ok();
        }else{
            return R.fail();
        }
    }

}

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

New file
@@ -0,0 +1,25 @@
package com.panzhihua.service_grid.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.ComActEasyPhotoTypeRelationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

/**
 * @auther lyq
 * @create 2021-04-14 15:03:01
 * @describe 订单表服务实现类
 */
@Slf4j
@Service
public class ComActEasyPhotoTypeRelationServiceImpl extends ServiceImpl<ComActEasyPhotoTypeRelationMapper, ComActEasyPhotoTypeRelationDO> implements ComActEasyPhotoTypeRelationService {

    @Resource
    private ComActEasyPhotoTypeRelationMapper comActEasyPhotoTypeRelationMapper;


}

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

New file
@@ -0,0 +1,114 @@
package com.panzhihua.service_grid.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoTypeAddDTO;
import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoTypeDeleteDTO;
import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoTypeEditDTO;
import com.panzhihua.common.model.dtos.grid.PageComActEasyPhotoTypeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.ComActEasyPhotoTypeDetailsVO;
import com.panzhihua.common.model.vos.grid.ComActEasyPhotoTypeVO;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.ComActEasyPhotoTypeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;

import javax.annotation.Resource;
import java.util.Date;

/**
 * @auther lyq
 * @create 2021-04-14 15:03:01
 * @describe 订单表服务实现类
 */
@Slf4j
@Service
public class ComActEasyPhotoTypeServiceImpl extends ServiceImpl<ComActEasyPhotoTypeMapper, ComActEasyPhotoTypeDO> implements ComActEasyPhotoTypeService {

    @Resource
    private ComActEasyPhotoTypeMapper comActEasyPhotoTypeMapper;
    /**
     * 新增随手拍类型
     * @param comActEasyPhotoTypeAddDTO
     * @return 新增结果
     */
    public R add(ComActEasyPhotoTypeAddDTO comActEasyPhotoTypeAddDTO){
        ComActEasyPhotoTypeDO comActEasyPhotoTypeDO = new ComActEasyPhotoTypeDO();
        BeanUtils.copyProperties(comActEasyPhotoTypeAddDTO, comActEasyPhotoTypeDO);
        comActEasyPhotoTypeDO.setCreateAt(new Date());
        if(comActEasyPhotoTypeMapper.insert(comActEasyPhotoTypeDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 修改随手拍类型
     * @param comActEasyPhotoTypeEditDTO
     * @return 维护结果
     */
    public R edit(ComActEasyPhotoTypeEditDTO comActEasyPhotoTypeEditDTO){
        ComActEasyPhotoTypeDO comActEasyPhotoTypeDO = new ComActEasyPhotoTypeDO();
        BeanUtils.copyProperties(comActEasyPhotoTypeEditDTO, comActEasyPhotoTypeDO);
        //comActEasyPhotoTypeDO.setUpdateAt(new Date());
        if(comActEasyPhotoTypeMapper.updateById(comActEasyPhotoTypeDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页查找随手拍类型
     * @param pageComActEasyPhotoTypeDTO
     * @return 维护结果
     */
    public R<IPage<ComActEasyPhotoTypeVO>> query(PageComActEasyPhotoTypeDTO pageComActEasyPhotoTypeDTO){
        Page page = new Page(1,10);
        if(pageComActEasyPhotoTypeDTO.getPageNum()!=null) {
            page.setCurrent(pageComActEasyPhotoTypeDTO.getPageNum());
        }
        if(pageComActEasyPhotoTypeDTO.getPageSize()!=null) {
            page.setSize(pageComActEasyPhotoTypeDTO.getPageSize());
        }
        return R.ok(comActEasyPhotoTypeMapper.findByPage(page, pageComActEasyPhotoTypeDTO));
    }

    /**
     * 删除随手拍类型
     * @param ComActEasyPhotoTypeDeleteDTO
     * @return 平台用户信息
     */
    public R delete(ComActEasyPhotoTypeDeleteDTO ComActEasyPhotoTypeDeleteDTO){
        return R.fail();
    }

    /**
     * 查询随手拍类型详细信息
     * @param id 随手拍类型 id
     * @return 查找结果
     */
    public R<ComActEasyPhotoTypeDetailsVO> comActEasyPhotoTypeDetails(Long id){
        ComActEasyPhotoTypeDO comActEasyPhotoTypeDO = comActEasyPhotoTypeMapper.selectById(id);
        if(comActEasyPhotoTypeDO!=null) {
            ComActEasyPhotoTypeDetailsVO comActEasyPhotoTypeDetailsVO = new ComActEasyPhotoTypeDetailsVO();
            BeanUtils.copyProperties(comActEasyPhotoTypeDO, comActEasyPhotoTypeDetailsVO);
            return R.ok(comActEasyPhotoTypeDetailsVO);
        }
        return R.fail();
    }

    /**
     * 查询随手拍类型列表
     * @return  类型列表
     */
    @Override
    public R typeList(){
        return R.ok(this.baseMapper.selectList(null));
    }

}

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

New file
@@ -0,0 +1,104 @@
package com.panzhihua.service_grid.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.grid.EventApplicationAppReleaseAddDTO;
import com.panzhihua.common.model.dtos.grid.EventApplicationAppReleaseDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventApplicationAppReleaseEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventApplicationAppReleaseDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventApplicationAppReleaseDetailsVO;
import com.panzhihua.common.model.vos.grid.EventApplicationAppReleaseVO;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.EventApplicationAppReleaseService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;

import javax.annotation.Resource;
import java.util.Date;

/**
 * @auther lyq
 * @create 2021-04-14 15:03:01
 * @describe 订单表服务实现类
 */
@Slf4j
@Service
public class EventApplicationAppReleaseServiceImpl extends ServiceImpl<EventApplicationAppReleaseMapper, EventApplicationAppReleaseDO> implements EventApplicationAppReleaseService {

    @Resource
    private EventApplicationAppReleaseMapper eventApplicationAppReleaseMapper;
    /**
     * 新增APP应用版本信息
     * @param eventApplicationAppReleaseAddDTO
     * @return 新增结果
     */
    public R add(EventApplicationAppReleaseAddDTO eventApplicationAppReleaseAddDTO){
        EventApplicationAppReleaseDO eventApplicationAppReleaseDO = new EventApplicationAppReleaseDO();
        BeanUtils.copyProperties(eventApplicationAppReleaseAddDTO, eventApplicationAppReleaseDO);
        eventApplicationAppReleaseDO.setCreateAt(new Date());
        if(eventApplicationAppReleaseMapper.insert(eventApplicationAppReleaseDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 修改APP应用版本信息
     * @param eventApplicationAppReleaseEditDTO
     * @return 维护结果
     */
    public R edit(EventApplicationAppReleaseEditDTO eventApplicationAppReleaseEditDTO){
        EventApplicationAppReleaseDO eventApplicationAppReleaseDO = new EventApplicationAppReleaseDO();
        BeanUtils.copyProperties(eventApplicationAppReleaseEditDTO, eventApplicationAppReleaseDO);
        //eventApplicationAppReleaseDO.setUpdateAt(new Date());
        if(eventApplicationAppReleaseMapper.updateById(eventApplicationAppReleaseDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页查找APP应用版本信息
     * @param pageEventApplicationAppReleaseDTO
     * @return 维护结果
     */
    public R<IPage<EventApplicationAppReleaseVO>> query(PageEventApplicationAppReleaseDTO pageEventApplicationAppReleaseDTO){
        Page page = new Page(1,10);
        if(pageEventApplicationAppReleaseDTO.getPageNum()!=null) {
            page.setCurrent(pageEventApplicationAppReleaseDTO.getPageNum());
        }
        if(pageEventApplicationAppReleaseDTO.getPageSize()!=null) {
            page.setSize(pageEventApplicationAppReleaseDTO.getPageSize());
        }
        return R.ok(eventApplicationAppReleaseMapper.findByPage(page, pageEventApplicationAppReleaseDTO));
    }

    /**
     * 删除APP应用版本信息
     * @param EventApplicationAppReleaseDeleteDTO
     * @return 平台用户信息
     */
    public R delete(EventApplicationAppReleaseDeleteDTO EventApplicationAppReleaseDeleteDTO){
        return R.fail();
    }

    /**
     * 查询APP应用版本信息详细信息
     * @param id APP应用版本信息 id
     * @return 查找结果
     */
    public R<EventApplicationAppReleaseDetailsVO> eventApplicationAppReleaseDetails(Long id){
        EventApplicationAppReleaseDO eventApplicationAppReleaseDO = eventApplicationAppReleaseMapper.selectById(id);
        if(eventApplicationAppReleaseDO!=null) {
            EventApplicationAppReleaseDetailsVO eventApplicationAppReleaseDetailsVO = new EventApplicationAppReleaseDetailsVO();
            BeanUtils.copyProperties(eventApplicationAppReleaseDO, eventApplicationAppReleaseDetailsVO);
            return R.ok(eventApplicationAppReleaseDetailsVO);
        }
        return R.fail();
    }

}

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

New file
@@ -0,0 +1,104 @@
package com.panzhihua.service_grid.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.grid.EventApplicationUserNoticeAddDTO;
import com.panzhihua.common.model.dtos.grid.EventApplicationUserNoticeDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventApplicationUserNoticeEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventApplicationUserNoticeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventApplicationUserNoticeDetailsVO;
import com.panzhihua.common.model.vos.grid.EventApplicationUserNoticeVO;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.EventApplicationUserNoticeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;

import javax.annotation.Resource;
import java.util.Date;

/**
 * @auther lyq
 * @create 2021-04-14 15:03:01
 * @describe 订单表服务实现类
 */
@Slf4j
@Service
public class EventApplicationUserNoticeServiceImpl extends ServiceImpl<EventApplicationUserNoticeMapper, EventApplicationUserNoticeDO> implements EventApplicationUserNoticeService {

    @Resource
    private EventApplicationUserNoticeMapper eventApplicationUserNoticeMapper;
    /**
     * 新增用户协议和隐私政策信息
     * @param eventApplicationUserNoticeAddDTO
     * @return 新增结果
     */
    public R add(EventApplicationUserNoticeAddDTO eventApplicationUserNoticeAddDTO){
        EventApplicationUserNoticeDO eventApplicationUserNoticeDO = new EventApplicationUserNoticeDO();
        BeanUtils.copyProperties(eventApplicationUserNoticeAddDTO, eventApplicationUserNoticeDO);
        eventApplicationUserNoticeDO.setCreateAt(new Date());
        if(eventApplicationUserNoticeMapper.insert(eventApplicationUserNoticeDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 修改用户协议和隐私政策信息
     * @param eventApplicationUserNoticeEditDTO
     * @return 维护结果
     */
    public R edit(EventApplicationUserNoticeEditDTO eventApplicationUserNoticeEditDTO){
        EventApplicationUserNoticeDO eventApplicationUserNoticeDO = new EventApplicationUserNoticeDO();
        BeanUtils.copyProperties(eventApplicationUserNoticeEditDTO, eventApplicationUserNoticeDO);
        //eventApplicationUserNoticeDO.setUpdateAt(new Date());
        if(eventApplicationUserNoticeMapper.updateById(eventApplicationUserNoticeDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页查找用户协议和隐私政策信息
     * @param pageEventApplicationUserNoticeDTO
     * @return 维护结果
     */
    public R<IPage<EventApplicationUserNoticeVO>> query(PageEventApplicationUserNoticeDTO pageEventApplicationUserNoticeDTO){
        Page page = new Page(1,10);
        if(pageEventApplicationUserNoticeDTO.getPageNum()!=null) {
            page.setCurrent(pageEventApplicationUserNoticeDTO.getPageNum());
        }
        if(pageEventApplicationUserNoticeDTO.getPageSize()!=null) {
            page.setSize(pageEventApplicationUserNoticeDTO.getPageSize());
        }
        return R.ok(eventApplicationUserNoticeMapper.findByPage(page, pageEventApplicationUserNoticeDTO));
    }

    /**
     * 删除用户协议和隐私政策信息
     * @param EventApplicationUserNoticeDeleteDTO
     * @return 平台用户信息
     */
    public R delete(EventApplicationUserNoticeDeleteDTO EventApplicationUserNoticeDeleteDTO){
        return R.fail();
    }

    /**
     * 查询用户协议和隐私政策信息详细信息
     * @param id 用户协议和隐私政策信息 id
     * @return 查找结果
     */
    public R<EventApplicationUserNoticeDetailsVO> eventApplicationUserNoticeDetails(Long id){
        EventApplicationUserNoticeDO eventApplicationUserNoticeDO = eventApplicationUserNoticeMapper.selectById(id);
        if(eventApplicationUserNoticeDO!=null) {
            EventApplicationUserNoticeDetailsVO eventApplicationUserNoticeDetailsVO = new EventApplicationUserNoticeDetailsVO();
            BeanUtils.copyProperties(eventApplicationUserNoticeDO, eventApplicationUserNoticeDetailsVO);
            return R.ok(eventApplicationUserNoticeDetailsVO);
        }
        return R.fail();
    }

}

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

New file
@@ -0,0 +1,145 @@
package com.panzhihua.service_grid.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.grid.EventGridDataAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridDataDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventGridDataEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.ComMapGridDetailVO;
import com.panzhihua.common.model.vos.grid.ComMapGridEventVO;
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.EventGridDataService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
 * @auther lyq
 * @create 2021-04-14 15:03:01
 * @describe 订单表服务实现类
 */
@Slf4j
@Service
public class EventGridDataServiceImpl extends ServiceImpl<EventGridDataMapper, EventGridDataDO> implements EventGridDataService {

    @Resource
    private EventGridDataMapper eventGridDataMapper;
    @Resource
    private EventMapper eventMapper;
    /**
     * 新增区县/街道/社区/网格员网格数据管理
     * @param eventGridDataAddDTO
     * @return 新增结果
     */
    public R add(EventGridDataAddDTO eventGridDataAddDTO){
        EventGridDataDO eventGridDataDO = new EventGridDataDO();
        BeanUtils.copyProperties(eventGridDataAddDTO, eventGridDataDO);
        eventGridDataDO.setCreateAt(new Date());
        if(eventGridDataMapper.insert(eventGridDataDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 修改区县/街道/社区/网格员网格数据管理
     * @param eventGridDataEditDTO
     * @return 维护结果
     */
    public R edit(EventGridDataEditDTO eventGridDataEditDTO){
        EventGridDataDO eventGridDataDO = new EventGridDataDO();
        BeanUtils.copyProperties(eventGridDataEditDTO, eventGridDataDO);
        //eventGridDataDO.setUpdateAt(new Date());
        if(eventGridDataMapper.updateById(eventGridDataDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页查找区县/街道/社区/网格员网格数据管理
     * @param pageEventGridDataDTO
     * @return 维护结果
     */
    public R<IPage<EventGridDataVO>> query(PageEventGridDataDTO pageEventGridDataDTO){
        Page page = new Page(1,10);
        if(pageEventGridDataDTO.getPageNum()!=null) {
            page.setCurrent(pageEventGridDataDTO.getPageNum());
        }
        if(pageEventGridDataDTO.getPageSize()!=null) {
            page.setSize(pageEventGridDataDTO.getPageSize());
        }
        return R.ok(eventGridDataMapper.findByPage(page, pageEventGridDataDTO));
    }

    /**
     * 删除区县/街道/社区/网格员网格数据管理
     * @param EventGridDataDeleteDTO
     * @return 平台用户信息
     */
    public R delete(EventGridDataDeleteDTO EventGridDataDeleteDTO){
        return R.fail();
    }

    /**
     * 查询区县/街道/社区/网格员网格数据管理详细信息
     * @param id 区县/街道/社区/网格员网格数据管理 id
     * @return 查找结果
     */
    public R<EventGridDataDetailsVO> eventGridDataDetails(Long id){
        EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(id);
        if(eventGridDataDO!=null) {
            EventGridDataDetailsVO eventGridDataDetailsVO = new EventGridDataDetailsVO();
            BeanUtils.copyProperties(eventGridDataDO, eventGridDataDetailsVO);
            return R.ok(eventGridDataDetailsVO);
        }
        return R.fail();
    }

    @Override
    public R getUserGrid(PageEventGridDataDTO pageEventGridDataDTO) {
        Page page = new Page(1,10);
        if(pageEventGridDataDTO.getPageNum()!=null) {
            page.setCurrent(pageEventGridDataDTO.getPageNum());
        }
        if(pageEventGridDataDTO.getPageSize()!=null) {
            page.setSize(pageEventGridDataDTO.getPageSize());
        }

        return R.ok(eventGridDataMapper.selectUserGrid(page, pageEventGridDataDTO));
    }

    /**
     * 地图模块-根据网格id查询网格详细信息
     * @param gridId    网格id
     * @return  网格详细信息
     */
    @Override
    public R getMapGridDetail(Long gridId){
        ComMapGridDetailVO gridDetailVO = new ComMapGridDetailVO();
        //查询网格信息
        EventGridDataDO eventGridDataDO = this.baseMapper.selectById(gridId);
        if(eventGridDataDO == null){
            return R.fail("未查询到网格信息");
        }
        BeanUtils.copyProperties(eventGridDataDO,gridDetailVO);
        //查询网格待办事件
        List<ComMapGridEventVO> gridEventList = eventMapper.getEventByGridId(gridId);
        if(!gridEventList.isEmpty()){
            gridDetailVO.setGridEventList(gridEventList);
        }
        return R.ok(gridDetailVO);
    }

}

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

New file
@@ -0,0 +1,114 @@
package com.panzhihua.service_grid.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.grid.EventGridMemberGpsLogAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberGpsLogDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberGpsLogEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberGpsLogDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogVO;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.EventGridMemberGpsLogService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;

import javax.annotation.Resource;
import java.util.Date;

/**
 * @auther lyq
 * @create 2021-04-14 15:03:01
 * @describe 订单表服务实现类
 */
@Slf4j
@Service
public class EventGridMemberGpsLogServiceImpl extends ServiceImpl<EventGridMemberGpsLogMapper, EventGridMemberGpsLogDO> implements EventGridMemberGpsLogService {

    @Resource
    private EventGridMemberGpsLogMapper eventGridMemberGpsLogMapper;
    /**
     * 新增网格员定时上报地理信息
     * @param eventGridMemberGpsLogAddDTO
     * @return 新增结果
     */
    public R add(EventGridMemberGpsLogAddDTO eventGridMemberGpsLogAddDTO){
        EventGridMemberGpsLogDO eventGridMemberGpsLogDO = new EventGridMemberGpsLogDO();
        BeanUtils.copyProperties(eventGridMemberGpsLogAddDTO, eventGridMemberGpsLogDO);
        eventGridMemberGpsLogDO.setCreateAt(new Date());
        if(eventGridMemberGpsLogMapper.insert(eventGridMemberGpsLogDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 修改网格员定时上报地理信息
     * @param eventGridMemberGpsLogEditDTO
     * @return 维护结果
     */
    public R edit(EventGridMemberGpsLogEditDTO eventGridMemberGpsLogEditDTO){
        EventGridMemberGpsLogDO eventGridMemberGpsLogDO = new EventGridMemberGpsLogDO();
        BeanUtils.copyProperties(eventGridMemberGpsLogEditDTO, eventGridMemberGpsLogDO);
        //eventGridMemberGpsLogDO.setUpdateAt(new Date());
        if(eventGridMemberGpsLogMapper.updateById(eventGridMemberGpsLogDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页查找网格员定时上报地理信息
     * @param pageEventGridMemberGpsLogDTO
     * @return 维护结果
     */
    public R<IPage<EventGridMemberGpsLogVO>> query(PageEventGridMemberGpsLogDTO pageEventGridMemberGpsLogDTO){
        Page page = new Page(1,10);
        if(pageEventGridMemberGpsLogDTO.getPageNum()!=null) {
            page.setCurrent(pageEventGridMemberGpsLogDTO.getPageNum());
        }
        if(pageEventGridMemberGpsLogDTO.getPageSize()!=null) {
            page.setSize(pageEventGridMemberGpsLogDTO.getPageSize());
        }
        return R.ok(eventGridMemberGpsLogMapper.findByPage(page, pageEventGridMemberGpsLogDTO));
    }

    /**
     * 删除网格员定时上报地理信息
     * @param EventGridMemberGpsLogDeleteDTO
     * @return 平台用户信息
     */
    public R delete(EventGridMemberGpsLogDeleteDTO EventGridMemberGpsLogDeleteDTO){
        return R.fail();
    }

    /**
     * 查询网格员定时上报地理信息详细信息
     * @param id 网格员定时上报地理信息 id
     * @return 查找结果
     */
    public R<EventGridMemberGpsLogDetailsVO> eventGridMemberGpsLogDetails(Long id){
        EventGridMemberGpsLogDO eventGridMemberGpsLogDO = eventGridMemberGpsLogMapper.selectById(id);
        if(eventGridMemberGpsLogDO!=null) {
            EventGridMemberGpsLogDetailsVO eventGridMemberGpsLogDetailsVO = new EventGridMemberGpsLogDetailsVO();
            BeanUtils.copyProperties(eventGridMemberGpsLogDO, eventGridMemberGpsLogDetailsVO);
            return R.ok(eventGridMemberGpsLogDetailsVO);
        }
        return R.fail();
    }

    /**
     * 根据网格员id查询今日轨迹
     * @param userId    网格员id
     * @return  网格员今日轨迹
     */
    @Override
    public R getTrajectoryByApp(Long userId){
        return R.ok(this.baseMapper.getTrajectoryByApp(userId));
    }

}

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

New file
@@ -0,0 +1,114 @@
package com.panzhihua.service_grid.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.EventGridMemberRelationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;

import javax.annotation.Resource;
import java.util.Date;

/**
 * @auther lyq
 * @create 2021-04-14 15:03:01
 * @describe 订单表服务实现类
 */
@Slf4j
@Service
public class EventGridMemberRelationServiceImpl extends ServiceImpl<EventGridMemberRelationMapper, EventGridMemberRelationDO> implements EventGridMemberRelationService {

    @Resource
    private EventGridMemberRelationMapper eventGridMemberRelationMapper;
    /**
     * 新增网格和网格员的关联关系
     * @param eventGridMemberRelationAddDTO
     * @return 新增结果
     */
    public R add(EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO){
        EventGridMemberRelationDO eventGridMemberRelationDO = new EventGridMemberRelationDO();
        BeanUtils.copyProperties(eventGridMemberRelationAddDTO, eventGridMemberRelationDO);
        eventGridMemberRelationDO.setCreateAt(new Date());
        if(eventGridMemberRelationMapper.insert(eventGridMemberRelationDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 修改网格和网格员的关联关系
     * @param eventGridMemberRelationEditDTO
     * @return 维护结果
     */
    public R edit(EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO){
        EventGridMemberRelationDO eventGridMemberRelationDO = new EventGridMemberRelationDO();
        BeanUtils.copyProperties(eventGridMemberRelationEditDTO, eventGridMemberRelationDO);
        //eventGridMemberRelationDO.setUpdateAt(new Date());
        if(eventGridMemberRelationMapper.updateById(eventGridMemberRelationDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页查找网格和网格员的关联关系
     * @param pageEventGridMemberRelationDTO
     * @return 维护结果
     */
    public R<IPage<EventGridMemberRelationVO>> query(PageEventGridMemberRelationDTO pageEventGridMemberRelationDTO){
        Page page = new Page(1,10);
        if(pageEventGridMemberRelationDTO.getPageNum()!=null) {
            page.setCurrent(pageEventGridMemberRelationDTO.getPageNum());
        }
        if(pageEventGridMemberRelationDTO.getPageSize()!=null) {
            page.setSize(pageEventGridMemberRelationDTO.getPageSize());
        }
        return R.ok(eventGridMemberRelationMapper.findByPage(page, pageEventGridMemberRelationDTO));
    }

    /**
     * 删除网格和网格员的关联关系
     * @param EventGridMemberRelationDeleteDTO
     * @return 平台用户信息
     */
    public R delete(EventGridMemberRelationDeleteDTO EventGridMemberRelationDeleteDTO){
        return R.fail();
    }

    /**
     * 查询网格和网格员的关联关系详细信息
     * @param id 网格和网格员的关联关系 id
     * @return 查找结果
     */
    public R<EventGridMemberRelationDetailsVO> eventGridMemberRelationDetails(Long id){
        EventGridMemberRelationDO eventGridMemberRelationDO = eventGridMemberRelationMapper.selectById(id);
        if(eventGridMemberRelationDO!=null) {
            EventGridMemberRelationDetailsVO eventGridMemberRelationDetailsVO = new EventGridMemberRelationDetailsVO();
            BeanUtils.copyProperties(eventGridMemberRelationDO, eventGridMemberRelationDetailsVO);
            return R.ok(eventGridMemberRelationDetailsVO);
        }
        return R.fail();
    }

    /**
     * 根据网格员id查询关联网格列表
     * @param userId    网格员id
     * @return  网格列表
     */
    @Override
    public R getMapGridListByApp(Long userId){
        return R.ok(this.baseMapper.getMapGridListByApp(userId));
    }

}

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

New file
@@ -0,0 +1,104 @@
package com.panzhihua.service_grid.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.grid.EventGridMemberWarnLogAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberWarnLogDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberWarnLogEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberWarnLogDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberWarnLogDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberWarnLogVO;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.EventGridMemberWarnLogService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;

import javax.annotation.Resource;
import java.util.Date;

/**
 * @auther lyq
 * @create 2021-04-14 15:03:01
 * @describe 订单表服务实现类
 */
@Slf4j
@Service
public class EventGridMemberWarnLogServiceImpl extends ServiceImpl<EventGridMemberWarnLogMapper, EventGridMemberWarnLogDO> implements EventGridMemberWarnLogService {

    @Resource
    private EventGridMemberWarnLogMapper eventGridMemberWarnLogMapper;
    /**
     * 新增网格员定时上报地理预警记录
     * @param eventGridMemberWarnLogAddDTO
     * @return 新增结果
     */
    public R add(EventGridMemberWarnLogAddDTO eventGridMemberWarnLogAddDTO){
        EventGridMemberWarnLogDO eventGridMemberWarnLogDO = new EventGridMemberWarnLogDO();
        BeanUtils.copyProperties(eventGridMemberWarnLogAddDTO, eventGridMemberWarnLogDO);
        eventGridMemberWarnLogDO.setCreateAt(new Date());
        if(eventGridMemberWarnLogMapper.insert(eventGridMemberWarnLogDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 修改网格员定时上报地理预警记录
     * @param eventGridMemberWarnLogEditDTO
     * @return 维护结果
     */
    public R edit(EventGridMemberWarnLogEditDTO eventGridMemberWarnLogEditDTO){
        EventGridMemberWarnLogDO eventGridMemberWarnLogDO = new EventGridMemberWarnLogDO();
        BeanUtils.copyProperties(eventGridMemberWarnLogEditDTO, eventGridMemberWarnLogDO);
        //eventGridMemberWarnLogDO.setUpdateAt(new Date());
        if(eventGridMemberWarnLogMapper.updateById(eventGridMemberWarnLogDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页查找网格员定时上报地理预警记录
     * @param pageEventGridMemberWarnLogDTO
     * @return 维护结果
     */
    public R<IPage<EventGridMemberWarnLogVO>> query(PageEventGridMemberWarnLogDTO pageEventGridMemberWarnLogDTO){
        Page page = new Page(1,10);
        if(pageEventGridMemberWarnLogDTO.getPageNum()!=null) {
            page.setCurrent(pageEventGridMemberWarnLogDTO.getPageNum());
        }
        if(pageEventGridMemberWarnLogDTO.getPageSize()!=null) {
            page.setSize(pageEventGridMemberWarnLogDTO.getPageSize());
        }
        return R.ok(eventGridMemberWarnLogMapper.findByPage(page, pageEventGridMemberWarnLogDTO));
    }

    /**
     * 删除网格员定时上报地理预警记录
     * @param EventGridMemberWarnLogDeleteDTO
     * @return 平台用户信息
     */
    public R delete(EventGridMemberWarnLogDeleteDTO EventGridMemberWarnLogDeleteDTO){
        return R.fail();
    }

    /**
     * 查询网格员定时上报地理预警记录详细信息
     * @param id 网格员定时上报地理预警记录 id
     * @return 查找结果
     */
    public R<EventGridMemberWarnLogDetailsVO> eventGridMemberWarnLogDetails(Long id){
        EventGridMemberWarnLogDO eventGridMemberWarnLogDO = eventGridMemberWarnLogMapper.selectById(id);
        if(eventGridMemberWarnLogDO!=null) {
            EventGridMemberWarnLogDetailsVO eventGridMemberWarnLogDetailsVO = new EventGridMemberWarnLogDetailsVO();
            BeanUtils.copyProperties(eventGridMemberWarnLogDO, eventGridMemberWarnLogDetailsVO);
            return R.ok(eventGridMemberWarnLogDetailsVO);
        }
        return R.fail();
    }

}

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

New file
@@ -0,0 +1,104 @@
package com.panzhihua.service_grid.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.grid.EventMainMemberAddDTO;
import com.panzhihua.common.model.dtos.grid.EventMainMemberDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventMainMemberEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventMainMemberDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventMainMemberDetailsVO;
import com.panzhihua.common.model.vos.grid.EventMainMemberVO;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.EventMainMemberService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;

import javax.annotation.Resource;
import java.util.Date;

/**
 * @auther lyq
 * @create 2021-04-14 15:03:01
 * @describe 订单表服务实现类
 */
@Slf4j
@Service
public class EventMainMemberServiceImpl extends ServiceImpl<EventMainMemberMapper, EventMainMemberDO> implements EventMainMemberService {

    @Resource
    private EventMainMemberMapper eventMainMemberMapper;
    /**
     * 新增重点人群记录
     * @param eventMainMemberAddDTO
     * @return 新增结果
     */
    public R add(EventMainMemberAddDTO eventMainMemberAddDTO){
        EventMainMemberDO eventMainMemberDO = new EventMainMemberDO();
        BeanUtils.copyProperties(eventMainMemberAddDTO, eventMainMemberDO);
        eventMainMemberDO.setCreateAt(new Date());
        if(eventMainMemberMapper.insert(eventMainMemberDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 修改重点人群记录
     * @param eventMainMemberEditDTO
     * @return 维护结果
     */
    public R edit(EventMainMemberEditDTO eventMainMemberEditDTO){
        EventMainMemberDO eventMainMemberDO = new EventMainMemberDO();
        BeanUtils.copyProperties(eventMainMemberEditDTO, eventMainMemberDO);
        //eventMainMemberDO.setUpdateAt(new Date());
        if(eventMainMemberMapper.updateById(eventMainMemberDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页查找重点人群记录
     * @param pageEventMainMemberDTO
     * @return 维护结果
     */
    public R<IPage<EventMainMemberVO>> query(PageEventMainMemberDTO pageEventMainMemberDTO){
        Page page = new Page(1,10);
        if(pageEventMainMemberDTO.getPageNum()!=null) {
            page.setCurrent(pageEventMainMemberDTO.getPageNum());
        }
        if(pageEventMainMemberDTO.getPageSize()!=null) {
            page.setSize(pageEventMainMemberDTO.getPageSize());
        }
        return R.ok(eventMainMemberMapper.findByPage(page, pageEventMainMemberDTO));
    }

    /**
     * 删除重点人群记录
     * @param EventMainMemberDeleteDTO
     * @return 平台用户信息
     */
    public R delete(EventMainMemberDeleteDTO EventMainMemberDeleteDTO){
        return R.fail();
    }

    /**
     * 查询重点人群记录详细信息
     * @param id 重点人群记录 id
     * @return 查找结果
     */
    public R<EventMainMemberDetailsVO> eventMainMemberDetails(Long id){
        EventMainMemberDO eventMainMemberDO = eventMainMemberMapper.selectById(id);
        if(eventMainMemberDO!=null) {
            EventMainMemberDetailsVO eventMainMemberDetailsVO = new EventMainMemberDetailsVO();
            BeanUtils.copyProperties(eventMainMemberDO, eventMainMemberDetailsVO);
            return R.ok(eventMainMemberDetailsVO);
        }
        return R.fail();
    }

}

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

New file
@@ -0,0 +1,104 @@
package com.panzhihua.service_grid.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.grid.EventResourceAddDTO;
import com.panzhihua.common.model.dtos.grid.EventResourceDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventResourceEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventResourceDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventResourceDetailsVO;
import com.panzhihua.common.model.vos.grid.EventResourceVO;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.EventResourceService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;

import javax.annotation.Resource;
import java.util.Date;

/**
 * @auther lyq
 * @create 2021-04-14 15:03:01
 * @describe 订单表服务实现类
 */
@Slf4j
@Service
public class EventResourceServiceImpl extends ServiceImpl<EventResourceMapper, EventResourceDO> implements EventResourceService {

    @Resource
    private EventResourceMapper eventResourceMapper;
    /**
     * 新增事件或者走访中关联的图片音频和视频文件
     * @param eventResourceAddDTO
     * @return 新增结果
     */
    public R add(EventResourceAddDTO eventResourceAddDTO){
        EventResourceDO eventResourceDO = new EventResourceDO();
        BeanUtils.copyProperties(eventResourceAddDTO, eventResourceDO);
        eventResourceDO.setCreateAt(new Date());
        if(eventResourceMapper.insert(eventResourceDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 修改事件或者走访中关联的图片音频和视频文件
     * @param eventResourceEditDTO
     * @return 维护结果
     */
    public R edit(EventResourceEditDTO eventResourceEditDTO){
        EventResourceDO eventResourceDO = new EventResourceDO();
        BeanUtils.copyProperties(eventResourceEditDTO, eventResourceDO);
        //eventResourceDO.setUpdateAt(new Date());
        if(eventResourceMapper.updateById(eventResourceDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页查找事件或者走访中关联的图片音频和视频文件
     * @param pageEventResourceDTO
     * @return 维护结果
     */
    public R<IPage<EventResourceVO>> query(PageEventResourceDTO pageEventResourceDTO){
        Page page = new Page(1,10);
        if(pageEventResourceDTO.getPageNum()!=null) {
            page.setCurrent(pageEventResourceDTO.getPageNum());
        }
        if(pageEventResourceDTO.getPageSize()!=null) {
            page.setSize(pageEventResourceDTO.getPageSize());
        }
        return R.ok(eventResourceMapper.findByPage(page, pageEventResourceDTO));
    }

    /**
     * 删除事件或者走访中关联的图片音频和视频文件
     * @param EventResourceDeleteDTO
     * @return 平台用户信息
     */
    public R delete(EventResourceDeleteDTO EventResourceDeleteDTO){
        return R.fail();
    }

    /**
     * 查询事件或者走访中关联的图片音频和视频文件详细信息
     * @param id 事件或者走访中关联的图片音频和视频文件 id
     * @return 查找结果
     */
    public R<EventResourceDetailsVO> eventResourceDetails(Long id){
        EventResourceDO eventResourceDO = eventResourceMapper.selectById(id);
        if(eventResourceDO!=null) {
            EventResourceDetailsVO eventResourceDetailsVO = new EventResourceDetailsVO();
            BeanUtils.copyProperties(eventResourceDO, eventResourceDetailsVO);
            return R.ok(eventResourceDetailsVO);
        }
        return R.fail();
    }

}

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

New file
@@ -0,0 +1,1145 @@
package com.panzhihua.service_grid.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.enums.EventType;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventResourceVO;
import com.panzhihua.common.model.vos.grid.EventTransferRecordVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.EventResourceService;
import com.panzhihua.service_grid.service.EventService;
import com.panzhihua.service_grid.service.EventTransferRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
 * @author cedoo
 * 2021-04-14 15:03:01
 * 订单表服务实现类
 */
@Slf4j
@Service
public class EventServiceImpl extends ServiceImpl<EventMapper, EventDO> implements EventService {

    @Resource
    private EventMapper eventMapper;
    @Resource
    private EventResourceService eventResourceService;
    @Resource
    private EventTransferRecordService eventTransferRecordService;
    @Resource
    private CommunityService communityService;

    /**
     * 新增事件
     * @param eventAddDTO 事件新增DTO
     * @return 新增结果
     */
    public R add(EventAddDTO eventAddDTO){
        EventDO eventDO = new EventDO();
        BeanUtils.copyProperties(eventAddDTO, eventDO);
        eventDO.setCreateAt(new Date());
        if(eventMapper.insert(eventDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 修改事件
     * @param eventEditDTO
     * @return 维护结果
     */
    public R edit(EventEditDTO eventEditDTO){
        EventDO eventDO = new EventDO();
        BeanUtils.copyProperties(eventEditDTO, eventDO);
        //eventDO.setUpdateAt(new Date());
        if(eventMapper.updateById(eventDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页查找事件
     * @param pageEventDTO
     * @return 维护结果
     */
    public R<IPage<EventVO>> query(PageEventDTO pageEventDTO){
        Page page = new Page(1,10);
        if(pageEventDTO.getPageNum()!=null) {
            page.setCurrent(pageEventDTO.getPageNum());
        }
        if(pageEventDTO.getPageSize()!=null) {
            page.setSize(pageEventDTO.getPageSize());
        }
        IPage<EventVO> ipage = eventMapper.findByPage(page, pageEventDTO);
        if(ipage!=null){
            List<EventVO> eventVOList = ipage.getRecords();
            eventVOList.forEach(eventVO -> {
                List<EventResourceDO> eventResourceDOList =
                        eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
                                .eq(EventResourceDO::getClassification, 1)
                                .eq(EventResourceDO::getRefId, eventVO.getId())
                        );
                List<EventResourceVO> picList = new ArrayList<>();
                List<EventResourceVO> audioList = new ArrayList<>();
                List<EventResourceVO> videoList = new ArrayList<>();
                eventResourceDOList.forEach(eventResourceDO -> {
                    switch (eventResourceDO.getType()){
                        case 1:
                            EventResourceVO picEventResourceVO = new EventResourceVO();
                            BeanUtils.copyProperties(eventResourceDO, picEventResourceVO);
                            picList.add(picEventResourceVO);
                            break;
                        case 2:
                            EventResourceVO audioResourceVO = new EventResourceVO();
                            BeanUtils.copyProperties(eventResourceDO, audioResourceVO);
                            audioList.add(audioResourceVO);
                            break;
                        case 3:
                            EventResourceVO videoResourceVO = new EventResourceVO();
                            BeanUtils.copyProperties(eventResourceDO, videoResourceVO);
                            videoList.add(videoResourceVO);
                            break;
                    }
                });
                eventVO.setAudios(audioList);
                eventVO.setPics(picList);
                eventVO.setVideos(videoList);
            });
            return R.ok(ipage);
        }
        return R.fail();
    }

    /**
     * 删除事件
     * @param commonEventDeleteDTO
     * @return 平台用户信息
     */
    public R delete(CommonEventDeleteDTO commonEventDeleteDTO){
        EventDO eventDO = eventMapper.selectById(commonEventDeleteDTO.getId());
        if(eventDO==null){
            return R.fail("事件不存在");
        }
        if(eventDO.getEventStatus()!=null &&
                (eventDO.getEventStatus().intValue()==1||eventDO.getEventStatus().intValue()==4)){//草稿 或者 已撤销 的事件可以删除
            eventDO.setEventStatus(3);//逻辑删除
            eventDO.setUpdateBy(commonEventDeleteDTO.getUserId());
            int updated = this.getBaseMapper().updateById(eventDO);
            return updated==1?R.ok():R.fail();
        }
        return R.fail("事件不是草稿/已撤销状态， 不允许删除");
    }

    /**
     * 查询事件详细信息
     * @param id 事件 id
     * @return 查找结果
     */
    public R<EventDetailsVO> eventDetails(Long id){
        EventDO eventDO = eventMapper.selectById(id);
        if(eventDO!=null) {
            EventDetailsVO eventDetailsVO = new EventDetailsVO();
            BeanUtils.copyProperties(eventDO, eventDetailsVO);
            //查询事件关联附件
            List<EventResourceDO> eventResourceDOList =
                    eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
                            .eq(EventResourceDO::getClassification, 1)
                            .eq(EventResourceDO::getRefId, id)
                    );
            List<EventResourceVO> picList = new ArrayList<>();
            List<EventResourceVO> audioList = new ArrayList<>();
            List<EventResourceVO> videoList = new ArrayList<>();
            eventResourceDOList.forEach(eventResourceDO -> {
                switch (eventResourceDO.getType()){
                    case 1:
                        EventResourceVO picEventResourceVO = new EventResourceVO();
                        BeanUtils.copyProperties(eventResourceDO, picEventResourceVO);
                        picList.add(picEventResourceVO);
                        break;
                    case 2:
                        EventResourceVO audioResourceVO = new EventResourceVO();
                        BeanUtils.copyProperties(eventResourceDO, audioResourceVO);
                        audioList.add(audioResourceVO);
                        break;
                    case 3:
                        EventResourceVO videoResourceVO = new EventResourceVO();
                        BeanUtils.copyProperties(eventResourceDO, videoResourceVO);
                        videoList.add(videoResourceVO);
                        break;
                }
            });
            eventDetailsVO.setAudios(audioList);
            eventDetailsVO.setPics(picList);
            eventDetailsVO.setVideos(videoList);



            //查询事件流转记录
            List<EventTransferRecordDO> eventTransferRecordDOList = eventTransferRecordService.getBaseMapper()
                    .selectList(new LambdaQueryWrapper<EventTransferRecordDO>()
                            .eq(EventTransferRecordDO::getEventId, id)
                            .orderByAsc(EventTransferRecordDO::getCreateAt)
                    );

            List<EventTransferRecordVO> eventTransferRecordVOS = new ArrayList<>();
            for (EventTransferRecordDO eventTransferRecordDO : eventTransferRecordDOList) {
                EventTransferRecordVO eventTransferRecordVO = new EventTransferRecordVO();
                BeanUtils.copyProperties(eventTransferRecordDO, eventTransferRecordVO);
                List<EventResourceDO> eventTransferResourceDOList =
                        eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
                                .eq(EventResourceDO::getClassification, 3)
                                .eq(EventResourceDO::getRefId, eventTransferRecordDO.getId())
                        );
                List<EventResourceVO> transferPicList = new ArrayList<>();
                List<EventResourceVO> transferAudioList = new ArrayList<>();
                List<EventResourceVO> transferVideoList = new ArrayList<>();
                eventTransferResourceDOList.forEach(eventResourceDO -> {
                    switch (eventResourceDO.getType()){
                        case 1:
                            EventResourceVO picEventResourceVO = new EventResourceVO();
                            BeanUtils.copyProperties(eventResourceDO, picEventResourceVO);
                            transferPicList.add(picEventResourceVO);
                            break;
                        case 2:
                            EventResourceVO audioResourceVO = new EventResourceVO();
                            BeanUtils.copyProperties(eventResourceDO, audioResourceVO);
                            transferAudioList.add(audioResourceVO);
                            break;
                        case 3:
                            EventResourceVO videoResourceVO = new EventResourceVO();
                            BeanUtils.copyProperties(eventResourceDO, videoResourceVO);
                            transferVideoList.add(videoResourceVO);
                            break;
                    }
                });
                eventTransferRecordVO.setAudios(transferAudioList);
                eventTransferRecordVO.setPics(transferPicList);
                eventTransferRecordVO.setVideos(transferVideoList);
                eventTransferRecordVOS.add(eventTransferRecordVO);
            }
            eventDetailsVO.setTrans(eventTransferRecordVOS);
            return R.ok(eventDetailsVO);
        }
        return R.fail();
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R addCommon(CommonEventAddDTO commonEventAddDTO) {
        EventDO eventDO = new EventDO();
        BeanUtils.copyProperties(commonEventAddDTO, eventDO);
        eventDO.setGridMemberId(commonEventAddDTO.getUserId());
        eventDO.setEventCategory(1l);//办件事件
        eventDO.setEventStatus(2);//事件状态 2发布
        eventDO.setProcessType(1);//网格员处理
        eventDO.setCommunityProcess(0);//非 社区处理
        eventDO.setEventProcessStatus(1);
        eventDO.setGridMemberId(commonEventAddDTO.getUserId());
        eventDO.setGridMemberName(commonEventAddDTO.getUserName());
        eventDO.setGridMemberTelephone(commonEventAddDTO.getPhone());
        eventDO.setCreateBy(commonEventAddDTO.getUserId());
        eventDO.setSubmitDate(new Date());
        if(eventMapper.insert(eventDO)==1){
            //添加音频
            if(StringUtils.isNotEmpty(commonEventAddDTO.getAudio())){
                EventResourceDO eventResourceDO = new EventResourceDO();
                eventResourceDO.setClassification(1);
                eventResourceDO.setType(2);
                eventResourceDO.setUrl(commonEventAddDTO.getAudio());
                eventResourceDO.setRefId(eventDO.getId());
                eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
                int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if(audioAdd!=1){
                    throw new ServiceException("添加音频失败");
                }
            }
            //添加视频
            if(StringUtils.isNotEmpty(commonEventAddDTO.getVideo())){
                EventResourceDO eventResourceDO = new EventResourceDO();
                eventResourceDO.setClassification(1);
                eventResourceDO.setType(3);
                eventResourceDO.setUrl(commonEventAddDTO.getVideo());
                eventResourceDO.setRefId(eventDO.getId());
                eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
                int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if(videoAdd!=1){
                    throw new ServiceException("添加视频失败");
                }
            }
            //添加图片
            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(commonEventAddDTO.getUserId());
                    int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if(picAdd!=1){
                        throw new ServiceException("添加图片失败");
                    }
                }
            }
            addReleaseRecord(eventDO.getId(), commonEventAddDTO.getUserId(), commonEventAddDTO.getUserName());
            return R.ok();
        }
        return R.fail();
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R saveDraft(CommonEventEditDTO commonEventEditDTO) {
        if(commonEventEditDTO.getId()==null) {
            EventDO eventDO = new EventDO();
            BeanUtils.copyProperties(commonEventEditDTO, eventDO);
            eventDO.setGridMemberId(commonEventEditDTO.getUserId());
            eventDO.setEventCategory(1l);//办件事件
            eventDO.setEventStatus(1);//事件状态 1草稿
            eventDO.setProcessType(1);//网格员处理
            eventDO.setCommunityProcess(0);//非 社区处理
            eventDO.setCreateBy(commonEventEditDTO.getUserId());
            eventDO.setGridMemberId(commonEventEditDTO.getUserId());
            eventDO.setGridMemberName(commonEventEditDTO.getUserName());
            eventDO.setGridMemberTelephone(commonEventEditDTO.getPhone());
            if (eventMapper.insert(eventDO) > 0) {
                //添加音频
                if (StringUtils.isNotEmpty(commonEventEditDTO.getAudio())) {
                    EventResourceDO eventResourceDO = new EventResourceDO();
                    eventResourceDO.setClassification(1);
                    eventResourceDO.setType(2);
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(commonEventEditDTO.getAudio());
                    eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
                    int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (audioAdd != 1) {
                        throw new ServiceException("添加音频失败");
                    }
                }
                //添加视频
                if (StringUtils.isNotEmpty(commonEventEditDTO.getVideo())) {
                    EventResourceDO eventResourceDO = new EventResourceDO();
                    eventResourceDO.setClassification(1);
                    eventResourceDO.setType(3);
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(commonEventEditDTO.getVideo());
                    eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
                    int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (videoAdd != 1) {
                        throw new ServiceException("添加视频失败");
                    }
                }
                //添加图片
                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(commonEventEditDTO.getUserId());
                        int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                        if (picAdd != 1) {
                            throw new ServiceException("添加图片失败");
                        }
                    }
                }
                return R.ok();
            }
            return R.fail();
        }else{
            //编辑原来的
            EventDO eventDO = eventMapper.selectById(commonEventEditDTO.getId());
            BeanUtils.copyProperties(commonEventEditDTO, eventDO);
            eventDO.setGridMemberId(commonEventEditDTO.getUserId());
            eventDO.setEventCategory(1l);//办件事件
            eventDO.setEventStatus(1);//事件状态 2发布
            eventDO.setProcessType(1);//网格员处理
            eventDO.setCommunityProcess(0);//非 社区处理
            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(commonEventEditDTO.getAudio())) {
                    EventResourceDO eventResourceDO = new EventResourceDO();
                    eventResourceDO.setClassification(1);
                    eventResourceDO.setType(2);
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(commonEventEditDTO.getAudio());
                    eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
                    int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (audioAdd != 1) {
                        throw new ServiceException("添加音频失败");
                    }
                }
                //添加视频
                if (StringUtils.isNotEmpty(commonEventEditDTO.getVideo())) {
                    EventResourceDO eventResourceDO = new EventResourceDO();
                    eventResourceDO.setClassification(1);
                    eventResourceDO.setType(3);
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(commonEventEditDTO.getVideo());
                    eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
                    int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (videoAdd != 1) {
                        throw new ServiceException("添加视频失败");
                    }
                }
                //添加图片
                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(commonEventEditDTO.getUserId());
                        int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                        if (picAdd != 1) {
                            throw new ServiceException("添加图片失败");
                        }
                    }
                }
                return R.ok();
            }
            return R.fail();
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R report(CommonEventReportDTO commonEventReportDTO) {
        EventDO eventDO = this.getBaseMapper().selectById(commonEventReportDTO.getEventId());
        if(eventDO==null){
            return R.fail("事件不存在");
        }
        if(eventDO.getEventStatus()!=2){
            return R.fail("当前事件不能上报社区");
        }
        if(eventDO.getProcessType()==2){
            return R.fail("当前事件已交由社区处理");
        }

        R r  = communityService.detailCommunity(commonEventReportDTO.getToId());
        if(!R.isOk(r)){
            return R.fail("查询社区错误");
        }
        ComActVO comActVO= JSONObject.parseObject(JSONObject.toJSONString(r.getData()),ComActVO.class);
        if(comActVO!=null){
            return R.fail("社区不存在");
        }
        eventDO.setCommunityProcess(1);    //社区处理
        eventDO.setProcessType(2);    //当前处理对象： 社区处理
        eventDO.setCommunityProcess(1);
        eventDO.setEventProcessStatus(1);    //待处理
        eventDO.setUpdateBy(commonEventReportDTO.getUserId());
        eventDO.setSubmitDate(new Date());
        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated!=1){
            throw new ServiceException("更新突发事件状态更新失败");
        }
        addTransferRecord(eventDO.getId(), commonEventReportDTO.getToId(), comActVO.getName(), 2, "上报社区成功");
        return R.ok();

    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R emergenciesRevoke(EventRevokeDTO eventRevokeDTO) {
        EventDO eventDO = this.getBaseMapper().selectById(eventRevokeDTO.getId());
        if(eventDO==null){
            return R.fail("事件不存在");
        }
        boolean canRevoke = eventDO.getEventStatus()==2; //发布状态
        if(!canRevoke){
            return R.fail("当前事件不允许撤销");
        }
        if(eventDO.getEventCategory()!=null && eventDO.getEventCategory().intValue()==2){//宣传教育事件
            //不做验证
        }else if(eventDO.getEventProcessStatus()==2 ||eventDO.getEventProcessStatus()==3) {   //已解决 或者 待验证 不允许撤销
            return R.fail("当前事件不允许撤销");
        }
        eventDO.setEventStatus(4);
        eventDO.setUpdateBy(eventRevokeDTO.getUserId());
        eventDO.setProcessType(1);//网格员处理
        eventDO.setCommunityProcess(0);//非 社区处理
        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated == 1){
            addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(), 1,"撤销成功");
            return R.ok();
        }
        return R.fail();
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    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){
                return R.fail("事件不是发布状态");
            }
            if(eventDO.getEventProcessStatus()!=1){
                return R.fail("事件不是待处理状态");
            }
            return R.fail("事件当前不可自处理");
        }

        eventDO.setEventProcessStatus(2);//2已解决
        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 transferRecordDO =
                addTransferRecord(eventDO.getId(), commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(),1, "网格员自处理完成");
        if(transferRecordDO!=null && transferRecordDO.getId()!=null){
            //添加音频
            if(StringUtils.isNotEmpty(commonEventDealDTO.getAudio())){
                EventResourceDO eventResourceDO = new EventResourceDO();
                eventResourceDO.setClassification(3);
                eventResourceDO.setType(2);
                eventResourceDO.setUrl(commonEventDealDTO.getAudio());
                eventResourceDO.setRefId(transferRecordDO.getId());
                eventResourceDO.setCreateBy(commonEventDealDTO.getUserId());
                int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if(audioAdd!=1){
                    throw new ServiceException("添加音频失败");
                }
            }
            //添加视频
            if(StringUtils.isNotEmpty(commonEventDealDTO.getVideo())){
                EventResourceDO eventResourceDO = new EventResourceDO();
                eventResourceDO.setClassification(3);
                eventResourceDO.setType(3);
                eventResourceDO.setUrl(commonEventDealDTO.getVideo());
                eventResourceDO.setRefId(transferRecordDO.getId());
                eventResourceDO.setCreateBy(commonEventDealDTO.getUserId());
                int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if(videoAdd!=1){
                    throw new ServiceException("添加视频失败");
                }
            }
            //添加图片
            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(transferRecordDO.getId());
                    eventResourceDO.setCreateBy(commonEventDealDTO.getUserId());
                    int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if(picAdd!=1){
                        throw new ServiceException("添加图片失败");
                    }
                }
            }
            return R.ok();
        }else{
            throw new ServiceException("处理事件记录出错");
        }
    }

    @Override
    public R verifyEvent(CommonEventVerifyDTO commonEventVerifyDTO) {
        EventDO eventDO = this.getBaseMapper().selectById(commonEventVerifyDTO.getId());
        boolean canVerifyByUser = eventDO.getEventProcessStatus()==3;
        if(!canVerifyByUser){
            return R.fail("当前不是待验证状态");
        }
        boolean processTypeRight = eventDO.getProcessType()==1;
        if(!processTypeRight){
            return R.fail("当前处理对象不是网格员");
        }

        eventDO.setEventProcessStatus(2);//2已解决
        eventDO.setUpdateBy(commonEventVerifyDTO.getUserId());
        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated!=1){
            return R.fail("更新事件状态失败");
        }
        addTransferRecord(eventDO.getId(), commonEventVerifyDTO.getUserId(), commonEventVerifyDTO.getUserName(), 1, "事件验证完成");
        return R.ok();
    }

    @Override
    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.setEventProcessStatus(1); //待解决
        eventDO.setProcessType(1);   //网格员处理
        eventDO.setUpdateBy(commonEventRepublicDTO.getUserId());
        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated!=1){
            return R.fail("更新事件状态失败");
        }
        addTransferRecord(eventDO.getId(), commonEventRepublicDTO.getUserId(), commonEventRepublicDTO.getUserName(), 1, "重新发布已撤销事件");
        return R.ok();
    }

    @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("更新事件状态失败");
        }
        addReleaseRecord(eventDO.getId(), commonEventPublicDTO.getUserId(), commonEventPublicDTO.getUserName());
        return R.ok();
    }

    @Override
    public R saveSpecialDraft(SpecialEventEditDTO specialEventEditDTO) {
        R rtVal = R.fail();
        if(specialEventEditDTO.getId()==null) {
            EventDO eventDO = new EventDO();
            BeanUtils.copyProperties(specialEventEditDTO, eventDO);
            eventDO.setGridMemberId(specialEventEditDTO.getUserId());
            eventDO.setEventCategory(1l);//办件事件
            eventDO.setEventType(EventType.SPECIAL);//特殊人群信息上报-事件分类
            eventDO.setEventStatus(1);//事件状态 1草稿
            eventDO.setProcessType(1);//网格员处理
            eventDO.setCommunityProcess(0);//非 社区处理
            eventDO.setCreateBy(specialEventEditDTO.getUserId());
            if (eventMapper.insert(eventDO) > 0) {
                //添加音频
                if (StringUtils.isNotEmpty(specialEventEditDTO.getAudio())) {
                    EventResourceDO eventResourceDO = new EventResourceDO();
                    eventResourceDO.setClassification(1);
                    eventResourceDO.setType(2);
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(specialEventEditDTO.getAudio());
                    eventResourceDO.setCreateBy(specialEventEditDTO.getUserId());
                    int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (audioAdd != 1) {
                        throw new ServiceException("添加音频失败");
                    }
                }
                //添加视频
                if (StringUtils.isNotEmpty(specialEventEditDTO.getVideo())) {
                    EventResourceDO eventResourceDO = new EventResourceDO();
                    eventResourceDO.setClassification(1);
                    eventResourceDO.setType(3);
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(specialEventEditDTO.getVideo());
                    eventResourceDO.setCreateBy(specialEventEditDTO.getUserId());
                    int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (videoAdd != 1) {
                        throw new ServiceException("添加视频失败");
                    }
                }
                //添加图片
                if (StringUtils.isNotEmpty(specialEventEditDTO.getPics())) {
                    String[] pica = specialEventEditDTO.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(specialEventEditDTO.getUserId());
                        int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                        if (picAdd != 1) {
                            throw new ServiceException("添加图片失败");
                        }
                    }
                }
                rtVal = R.ok();
            }
            rtVal = R.fail();
        }else{
            //编辑原来的
            EventDO eventDO = eventMapper.selectById(specialEventEditDTO.getId());
            BeanUtils.copyProperties(specialEventEditDTO, eventDO);
            eventDO.setGridMemberId(specialEventEditDTO.getUserId());
            eventDO.setEventCategory(1l);//办件事件
            eventDO.setEventStatus(1);//事件状态 2发布
            eventDO.setProcessType(1);//网格员处理
            eventDO.setCommunityProcess(0);//非 社区处理
            eventDO.setUpdateBy(specialEventEditDTO.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(specialEventEditDTO.getAudio())) {
                    EventResourceDO eventResourceDO = new EventResourceDO();
                    eventResourceDO.setClassification(1);
                    eventResourceDO.setType(2);
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(specialEventEditDTO.getAudio());
                    eventResourceDO.setCreateBy(specialEventEditDTO.getUserId());
                    int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (audioAdd != 1) {
                        throw new ServiceException("添加音频失败");
                    }
                }
                //添加视频
                if (StringUtils.isNotEmpty(specialEventEditDTO.getVideo())) {
                    EventResourceDO eventResourceDO = new EventResourceDO();
                    eventResourceDO.setClassification(1);
                    eventResourceDO.setType(3);
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(specialEventEditDTO.getVideo());
                    eventResourceDO.setCreateBy(specialEventEditDTO.getUserId());
                    int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (videoAdd != 1) {
                        throw new ServiceException("添加视频失败");
                    }
                }
                //添加图片
                if (StringUtils.isNotEmpty(specialEventEditDTO.getPics())) {
                    String[] pica = specialEventEditDTO.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(specialEventEditDTO.getUserId());
                        int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                        if (picAdd != 1) {
                            throw new ServiceException("添加图片失败");
                        }
                    }
                }
                rtVal = R.ok();
            }
            rtVal = R.fail();
        }
        if(R.isOk(rtVal)){
            //TODO 处理特殊人群实有人口数据

        }
        return rtVal;
    }

    @Override
    public R addSpecial(SpecialEventAddDTO specialEventAddDTO) {
        R rtVal = R.fail();
        EventDO eventDO = new EventDO();
        BeanUtils.copyProperties(specialEventAddDTO, eventDO);
        eventDO.setGridMemberId(specialEventAddDTO.getUserId());
        eventDO.setEventCategory(1l);//办件事件
        eventDO.setEventType(EventType.SPECIAL);//特殊人群信息上报-事件分类
        eventDO.setEventStatus(1);//事件状态 1草稿
        eventDO.setProcessType(1);//网格员处理
        eventDO.setCommunityProcess(0);//非 社区处理
        eventDO.setCreateBy(specialEventAddDTO.getUserId());
        if (eventMapper.insert(eventDO) > 0) {
            //添加音频
            if (StringUtils.isNotEmpty(specialEventAddDTO.getAudio())) {
                EventResourceDO eventResourceDO = new EventResourceDO();
                eventResourceDO.setClassification(1);
                eventResourceDO.setType(2);
                eventResourceDO.setRefId(eventDO.getId());
                eventResourceDO.setUrl(specialEventAddDTO.getAudio());
                eventResourceDO.setCreateBy(specialEventAddDTO.getUserId());
                int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if (audioAdd != 1) {
                    throw new ServiceException("添加音频失败");
                }
            }
            //添加视频
            if (StringUtils.isNotEmpty(specialEventAddDTO.getVideo())) {
                EventResourceDO eventResourceDO = new EventResourceDO();
                eventResourceDO.setClassification(1);
                eventResourceDO.setType(3);
                eventResourceDO.setRefId(eventDO.getId());
                eventResourceDO.setUrl(specialEventAddDTO.getVideo());
                eventResourceDO.setCreateBy(specialEventAddDTO.getUserId());
                int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if (videoAdd != 1) {
                    throw new ServiceException("添加视频失败");
                }
            }
            //添加图片
            if (StringUtils.isNotEmpty(specialEventAddDTO.getPics())) {
                String[] pica = specialEventAddDTO.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(specialEventAddDTO.getUserId());
                    int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (picAdd != 1) {
                        throw new ServiceException("添加图片失败");
                    }
                }
            }
            rtVal = R.ok();
        }
        rtVal = R.fail();

        if(R.isOk(rtVal)){
            //TODO 处理特殊人群实有人口数据

            addReleaseRecord(eventDO.getId(), specialEventAddDTO.getUserId(), specialEventAddDTO.getUserName());
            return R.ok();
        }
        return rtVal;
    }

    @Override
    public R getSpecialPopulation(String idCard) {
        ComMngPopulationDTO comMngPopulationDTO = new ComMngPopulationDTO();
        comMngPopulationDTO.setCardNo(idCard);
        comMngPopulationDTO.setPageSize(10l);
        comMngPopulationDTO.setPageNum(1l);
        return communityService.pagePopulation(comMngPopulationDTO);
    }

    @Override
    public R addPublicity(PublicityEventAddDTO publicityEventAddDTO) {
        EventDO eventDO = new EventDO();
        BeanUtils.copyProperties(publicityEventAddDTO, eventDO);
        eventDO.setGridMemberId(publicityEventAddDTO.getUserId());
        eventDO.setEventCategory(2l);//宣传事件
        eventDO.setEventStatus(2);//事件状态 2发布
        eventDO.setGridMemberId(publicityEventAddDTO.getUserId());
        eventDO.setGridMemberName(publicityEventAddDTO.getUserName());
        eventDO.setGridMemberTelephone(publicityEventAddDTO.getPhone());
        eventDO.setCreateBy(publicityEventAddDTO.getUserId());
        if(eventMapper.insert(eventDO)==1){
            //添加音频
            if(StringUtils.isNotEmpty(publicityEventAddDTO.getAudio())){
                EventResourceDO eventResourceDO = new EventResourceDO();
                eventResourceDO.setClassification(1);
                eventResourceDO.setType(2);
                eventResourceDO.setUrl(publicityEventAddDTO.getAudio());
                eventResourceDO.setRefId(eventDO.getId());
                eventResourceDO.setCreateBy(publicityEventAddDTO.getUserId());
                int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if(audioAdd!=1){
                    throw new ServiceException("添加音频失败");
                }
            }
            //添加视频
            if(StringUtils.isNotEmpty(publicityEventAddDTO.getVideo())){
                EventResourceDO eventResourceDO = new EventResourceDO();
                eventResourceDO.setClassification(1);
                eventResourceDO.setType(3);
                eventResourceDO.setUrl(publicityEventAddDTO.getVideo());
                eventResourceDO.setRefId(eventDO.getId());
                eventResourceDO.setCreateBy(publicityEventAddDTO.getUserId());
                int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if(videoAdd!=1){
                    throw new ServiceException("添加视频失败");
                }
            }
            //添加图片
            if(StringUtils.isNotEmpty(publicityEventAddDTO.getPics())){
                String[] pica = publicityEventAddDTO.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(publicityEventAddDTO.getUserId());
                    int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if(picAdd!=1){
                        throw new ServiceException("添加图片失败");
                    }
                }
            }
            addReleaseRecord(eventDO.getId(), publicityEventAddDTO.getUserId(), publicityEventAddDTO.getUserName());
            return R.ok();
        }
        return R.fail();

    }

    @Override
    public R savePublicityDraft(PublicityEventEditDTO publicityEventEditDTO) {
        if(publicityEventEditDTO.getId()==null) {
            EventDO eventDO = new EventDO();
            BeanUtils.copyProperties(publicityEventEditDTO, eventDO);
            eventDO.setGridMemberId(publicityEventEditDTO.getUserId());
            eventDO.setEventCategory(2l);//宣传事件
            eventDO.setEventStatus(1);//事件状态 1草稿
            eventDO.setCreateBy(publicityEventEditDTO.getUserId());
            eventDO.setGridMemberId(publicityEventEditDTO.getUserId());
            eventDO.setGridMemberName(publicityEventEditDTO.getUserName());
            eventDO.setGridMemberTelephone(publicityEventEditDTO.getPhone());
            if (eventMapper.insert(eventDO) > 0) {
                //添加音频
                if (StringUtils.isNotEmpty(publicityEventEditDTO.getAudio())) {
                    EventResourceDO eventResourceDO = new EventResourceDO();
                    eventResourceDO.setClassification(1);
                    eventResourceDO.setType(2);
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(publicityEventEditDTO.getAudio());
                    eventResourceDO.setCreateBy(publicityEventEditDTO.getUserId());
                    int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (audioAdd != 1) {
                        throw new ServiceException("添加音频失败");
                    }
                }
                //添加视频
                if (StringUtils.isNotEmpty(publicityEventEditDTO.getVideo())) {
                    EventResourceDO eventResourceDO = new EventResourceDO();
                    eventResourceDO.setClassification(1);
                    eventResourceDO.setType(3);
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(publicityEventEditDTO.getVideo());
                    eventResourceDO.setCreateBy(publicityEventEditDTO.getUserId());
                    int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (videoAdd != 1) {
                        throw new ServiceException("添加视频失败");
                    }
                }
                //添加图片
                if (StringUtils.isNotEmpty(publicityEventEditDTO.getPics())) {
                    String[] pica = publicityEventEditDTO.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(publicityEventEditDTO.getUserId());
                        int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                        if (picAdd != 1) {
                            throw new ServiceException("添加图片失败");
                        }
                    }
                }
                return R.ok();
            }
            return R.fail();
        }else{
            //编辑原来的
            EventDO eventDO = eventMapper.selectById(publicityEventEditDTO.getId());
            BeanUtils.copyProperties(publicityEventEditDTO, eventDO);
            eventDO.setGridMemberId(publicityEventEditDTO.getUserId());
            eventDO.setEventCategory(2L);//宣传事件
            eventDO.setEventStatus(1);//事件状态 2发布
            eventDO.setProcessType(1);//网格员处理
            eventDO.setCommunityProcess(0);//非 社区处理
            eventDO.setUpdateBy(publicityEventEditDTO.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(publicityEventEditDTO.getAudio())) {
                    EventResourceDO eventResourceDO = new EventResourceDO();
                    eventResourceDO.setClassification(1);
                    eventResourceDO.setType(2);
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(publicityEventEditDTO.getAudio());
                    eventResourceDO.setCreateBy(publicityEventEditDTO.getUserId());
                    int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (audioAdd != 1) {
                        throw new ServiceException("添加音频失败");
                    }
                }
                //添加视频
                if (StringUtils.isNotEmpty(publicityEventEditDTO.getVideo())) {
                    EventResourceDO eventResourceDO = new EventResourceDO();
                    eventResourceDO.setClassification(1);
                    eventResourceDO.setType(3);
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(publicityEventEditDTO.getVideo());
                    eventResourceDO.setCreateBy(publicityEventEditDTO.getUserId());
                    int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (videoAdd != 1) {
                        throw new ServiceException("添加视频失败");
                    }
                }
                //添加图片
                if (StringUtils.isNotEmpty(publicityEventEditDTO.getPics())) {
                    String[] pica = publicityEventEditDTO.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(publicityEventEditDTO.getUserId());
                        int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                        if (picAdd != 1) {
                            throw new ServiceException("添加图片失败");
                        }
                    }
                }
                return R.ok();
            }
            return R.fail();
        }
    }

    @Override
    public R selectPublicity(PagePublicityEventDTO pagePublicityEventDTO) {
        Page page = new Page(1,10);
        if(pagePublicityEventDTO.getPageNum()!=null) {
            page.setCurrent(pagePublicityEventDTO.getPageNum());
        }
        if(pagePublicityEventDTO.getPageSize()!=null) {
            page.setSize(pagePublicityEventDTO.getPageSize());
        }
        IPage<EventVO> ipage = eventMapper.findPublicityByPage(page, pagePublicityEventDTO);
        if(ipage!=null){
            List<EventVO> eventVOList = ipage.getRecords();
            eventVOList.forEach(eventVO -> {
                List<EventResourceDO> eventResourceDOList =
                        eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
                                .eq(EventResourceDO::getClassification, 1)
                                .eq(EventResourceDO::getRefId, eventVO.getId())
                        );
                List<EventResourceVO> picList = new ArrayList<>();
                List<EventResourceVO> audioList = new ArrayList<>();
                List<EventResourceVO> videoList = new ArrayList<>();
                eventResourceDOList.forEach(eventResourceDO -> {
                    switch (eventResourceDO.getType()){
                        case 1:
                            EventResourceVO picEventResourceVO = new EventResourceVO();
                            BeanUtils.copyProperties(eventResourceDO, picEventResourceVO);
                            picList.add(picEventResourceVO);
                            break;
                        case 2:
                            EventResourceVO audioResourceVO = new EventResourceVO();
                            BeanUtils.copyProperties(eventResourceDO, audioResourceVO);
                            audioList.add(audioResourceVO);
                            break;
                        case 3:
                            EventResourceVO videoResourceVO = new EventResourceVO();
                            BeanUtils.copyProperties(eventResourceDO, videoResourceVO);
                            videoList.add(videoResourceVO);
                            break;
                    }
                });
                eventVO.setAudios(audioList);
                eventVO.setPics(picList);
                eventVO.setVideos(videoList);
            });
            return R.ok(ipage);
        }
        return R.fail();
    }

    @Override
    public R<ComActVO> actList() {
        return communityService.listCommunityAll();
    }

    /**
     * 添加发布事件流转记录
     * @param eventId 事件ID
     * @param userId 操作用户ID
     * @param userName 操作用户姓名
     * @return 添加成功返回true， 否则返回false
     */
    private EventTransferRecordDO addReleaseRecord(Long eventId, Long userId, String userName){
        EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO();
        eventTransferRecordDO.setFromType(1);
        eventTransferRecordDO.setFromId(userId);
        eventTransferRecordDO.setFromName(userName);
        eventTransferRecordDO.setToType(1);
        eventTransferRecordDO.setToId(userId);
        eventTransferRecordDO.setToName(userName);
        eventTransferRecordDO.setProcessDate(new Date());
        eventTransferRecordDO.setEventId(eventId);
        eventTransferRecordDO.setProcessResult("发布成功");
        int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO);
        if(inserted!=1){
            throw new ServiceException("事件流转记录添加失败");
        }
        return eventTransferRecordDO;
    }

    /**
     * 查询最后的流转记录，并添加事件流转记录
     * @param eventId 事件ID
     * @param toId 流转到 ID
     * @param toName 流转到 名称
     * @param toType 发送类型
     * @param msg 流转消息
     * @return
     */
    private EventTransferRecordDO addTransferRecord(Long eventId, Long toId, String toName, Integer toType, String msg){
        List<EventTransferRecordDO> list = eventTransferRecordService.getBaseMapper().selectList(new LambdaQueryWrapper<EventTransferRecordDO>()
                .eq(EventTransferRecordDO::getEventId, eventId)
                .orderByDesc(EventTransferRecordDO::getCreateAt)
        );
        if(list==null ||list.size()==0){
            throw new ServiceException("事件流转记录异常");
        }
        EventTransferRecordDO lastRecord = list.get(0);
        EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO();
        eventTransferRecordDO.setFromType(lastRecord.getToType());
        eventTransferRecordDO.setFromId(lastRecord.getToId());
        eventTransferRecordDO.setFromName(lastRecord.getToName());
        eventTransferRecordDO.setToType(toType);
        eventTransferRecordDO.setToId(toId);
        eventTransferRecordDO.setProcessDate(new Date());
        eventTransferRecordDO.setToName(toName);
        eventTransferRecordDO.setEventId(eventId);
        eventTransferRecordDO.setProcessResult(msg);
        int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO);
        if(inserted==1) {
            return eventTransferRecordDO;
        }else{
            throw new ServiceException("事件流转记录添加失败");
        }
    }
}

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

New file
@@ -0,0 +1,104 @@
package com.panzhihua.service_grid.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.grid.EventTransferRecordAddDTO;
import com.panzhihua.common.model.dtos.grid.EventTransferRecordDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventTransferRecordEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventTransferRecordDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventTransferRecordDetailsVO;
import com.panzhihua.common.model.vos.grid.EventTransferRecordVO;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.EventTransferRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;

import javax.annotation.Resource;
import java.util.Date;

/**
 * @auther lyq
 * @create 2021-04-14 15:03:01
 * @describe 订单表服务实现类
 */
@Slf4j
@Service
public class EventTransferRecordServiceImpl extends ServiceImpl<EventTransferRecordMapper, EventTransferRecordDO> implements EventTransferRecordService {

    @Resource
    private EventTransferRecordMapper eventTransferRecordMapper;
    /**
     * 新增事件处理流转记录
     * @param eventTransferRecordAddDTO
     * @return 新增结果
     */
    public R add(EventTransferRecordAddDTO eventTransferRecordAddDTO){
        EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO();
        BeanUtils.copyProperties(eventTransferRecordAddDTO, eventTransferRecordDO);
        eventTransferRecordDO.setCreateAt(new Date());
        if(eventTransferRecordMapper.insert(eventTransferRecordDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 修改事件处理流转记录
     * @param eventTransferRecordEditDTO
     * @return 维护结果
     */
    public R edit(EventTransferRecordEditDTO eventTransferRecordEditDTO){
        EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO();
        BeanUtils.copyProperties(eventTransferRecordEditDTO, eventTransferRecordDO);
        //eventTransferRecordDO.setUpdateAt(new Date());
        if(eventTransferRecordMapper.updateById(eventTransferRecordDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页查找事件处理流转记录
     * @param pageEventTransferRecordDTO
     * @return 维护结果
     */
    public R<IPage<EventTransferRecordVO>> query(PageEventTransferRecordDTO pageEventTransferRecordDTO){
        Page page = new Page(1,10);
        if(pageEventTransferRecordDTO.getPageNum()!=null) {
            page.setCurrent(pageEventTransferRecordDTO.getPageNum());
        }
        if(pageEventTransferRecordDTO.getPageSize()!=null) {
            page.setSize(pageEventTransferRecordDTO.getPageSize());
        }
        return R.ok(eventTransferRecordMapper.findByPage(page, pageEventTransferRecordDTO));
    }

    /**
     * 删除事件处理流转记录
     * @param EventTransferRecordDeleteDTO
     * @return 平台用户信息
     */
    public R delete(EventTransferRecordDeleteDTO EventTransferRecordDeleteDTO){
        return R.fail();
    }

    /**
     * 查询事件处理流转记录详细信息
     * @param id 事件处理流转记录 id
     * @return 查找结果
     */
    public R<EventTransferRecordDetailsVO> eventTransferRecordDetails(Long id){
        EventTransferRecordDO eventTransferRecordDO = eventTransferRecordMapper.selectById(id);
        if(eventTransferRecordDO!=null) {
            EventTransferRecordDetailsVO eventTransferRecordDetailsVO = new EventTransferRecordDetailsVO();
            BeanUtils.copyProperties(eventTransferRecordDO, eventTransferRecordDetailsVO);
            return R.ok(eventTransferRecordDetailsVO);
        }
        return R.fail();
    }

}

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

New file
@@ -0,0 +1,104 @@
package com.panzhihua.service_grid.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.grid.EventVisitingTasksAddDTO;
import com.panzhihua.common.model.dtos.grid.EventVisitingTasksDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventVisitingTasksEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventVisitingTasksDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventVisitingTasksDetailsVO;
import com.panzhihua.common.model.vos.grid.EventVisitingTasksVO;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.EventVisitingTasksService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;

import javax.annotation.Resource;
import java.util.Date;

/**
 * @auther lyq
 * @create 2021-04-14 15:03:01
 * @describe 订单表服务实现类
 */
@Slf4j
@Service
public class EventVisitingTasksServiceImpl extends ServiceImpl<EventVisitingTasksMapper, EventVisitingTasksDO> implements EventVisitingTasksService {

    @Resource
    private EventVisitingTasksMapper eventVisitingTasksMapper;
    /**
     * 新增重点人群走访记录
     * @param eventVisitingTasksAddDTO
     * @return 新增结果
     */
    public R add(EventVisitingTasksAddDTO eventVisitingTasksAddDTO){
        EventVisitingTasksDO eventVisitingTasksDO = new EventVisitingTasksDO();
        BeanUtils.copyProperties(eventVisitingTasksAddDTO, eventVisitingTasksDO);
        eventVisitingTasksDO.setCreateAt(new Date());
        if(eventVisitingTasksMapper.insert(eventVisitingTasksDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 修改重点人群走访记录
     * @param eventVisitingTasksEditDTO
     * @return 维护结果
     */
    public R edit(EventVisitingTasksEditDTO eventVisitingTasksEditDTO){
        EventVisitingTasksDO eventVisitingTasksDO = new EventVisitingTasksDO();
        BeanUtils.copyProperties(eventVisitingTasksEditDTO, eventVisitingTasksDO);
        //eventVisitingTasksDO.setUpdateAt(new Date());
        if(eventVisitingTasksMapper.updateById(eventVisitingTasksDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页查找重点人群走访记录
     * @param pageEventVisitingTasksDTO
     * @return 维护结果
     */
    public R<IPage<EventVisitingTasksVO>> query(PageEventVisitingTasksDTO pageEventVisitingTasksDTO){
        Page page = new Page(1,10);
        if(pageEventVisitingTasksDTO.getPageNum()!=null) {
            page.setCurrent(pageEventVisitingTasksDTO.getPageNum());
        }
        if(pageEventVisitingTasksDTO.getPageSize()!=null) {
            page.setSize(pageEventVisitingTasksDTO.getPageSize());
        }
        return R.ok(eventVisitingTasksMapper.findByPage(page, pageEventVisitingTasksDTO));
    }

    /**
     * 删除重点人群走访记录
     * @param EventVisitingTasksDeleteDTO
     * @return 平台用户信息
     */
    public R delete(EventVisitingTasksDeleteDTO EventVisitingTasksDeleteDTO){
        return R.fail();
    }

    /**
     * 查询重点人群走访记录详细信息
     * @param id 重点人群走访记录 id
     * @return 查找结果
     */
    public R<EventVisitingTasksDetailsVO> eventVisitingTasksDetails(Long id){
        EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
        if(eventVisitingTasksDO!=null) {
            EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
            BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
            return R.ok(eventVisitingTasksDetailsVO);
        }
        return R.fail();
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/bootstrap.yml

New file
@@ -0,0 +1,25 @@
spring:
  application:
    name: grid
  cloud:
    config:
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: ${ENV:dev}  # 指定配置文件的环境
      uri: http://${CONFIG_URL:localhost}:8193/
  profiles:
    active: ${ENV:dev}

eureka:
  client:
    service-url:
      defaultZone: http://${EUREKA_URL:localhost}:8192/eureka

#实体加密、解密、字段脱敏拦截设置
domain:
  decrypt: true
  encrypt: true
  aesKey: Ryo7M3n8loC5
  sensitive: true


 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/logback-spring.xml

New file
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false">
    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
    <springProfile name="dev">
        <property name="LOG_HOME" value="F:/log" />
    </springProfile>
       <springProfile name="test">
        <property name="LOG_HOME" value="/mnt/data/gocd/log" />
    </springProfile>
<property name="LOG_HOME" value="/mnt/data/gocd/log" />
    <!-- 控制台输出 -->
    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
        </encoder>
    </appender>
    <!-- 按照每天生成日志文件 -->
    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!--日志文件输出的文件名-->
            <FileNamePattern>${LOG_HOME}/service_community.log.%d{yyyy-MM-dd}.log</FileNamePattern>
            <!--日志文件保留天数-->
            <MaxHistory>30</MaxHistory>
        </rollingPolicy>
        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
        </encoder>
        <!--日志文件最大的大小-->
        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
            <MaxFileSize>10MB</MaxFileSize>
        </triggeringPolicy>
    </appender>

    <!--myibatis log configure-->
    <logger name="com.apache.ibatis" level="TRACE"/>
    <logger name="java.sql.Connection" level="DEBUG"/>
    <logger name="java.sql.Statement" level="DEBUG"/>
    <logger name="java.sql.PreparedStatement" level="DEBUG"/>
    <logger name="com.panzhihua.service_community" level="DEBUG"/>

    <!-- 日志输出级别 -->
    <root level="DEBUG">
        <appender-ref ref="STDOUT" />
    </root>
    <root level="INFO">
        <appender-ref ref="STDOUT" />
        <appender-ref ref="FILE" />
    </root>
</configuration>

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

New file
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.panzhihua.service_grid.dao.ApplicationAppReleaseMapper">
     <resultMap id="baseResult" type="com.panzhihua.service_grid.model.dos.ApplicationAppRelease">
            <id property="id" column="id" />
            <result property="productId" column="product_id" />
            <result property="productName" column="product_name" />
            <result property="releaseNumber" column="release_number" />
            <result property="action" column="action" />
            <result property="url" column="url" />
            <result property="createDate" column="create_date" />
            <result property="createUser" column="create_user" />

    </resultMap>
    <sql id="columns">
        `id`,`product_id`,`product_name`,`release_number`,`action`,`url`,`create_date`,`create_user`
    </sql>

    <select id="selectByRand" resultType="com.panzhihua.service_grid.model.dos.ApplicationAppRelease">
        select *
        from event_application_app_release
        where  id=#{data}
    </select>

</mapper>

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

New file
@@ -0,0 +1,102 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >


<mapper namespace="com.panzhihua.service_grid.dao.ComActEasyPhotoMapper">

     <resultMap id="baseResult" type="com.panzhihua.service_grid.model.dos.ComActEasyPhotoDO">
        <result property="id" column="id"/>
        <result property="sponsorId" column="sponsor_id"/>
        <result property="happenAddr" column="happen_addr"/>
        <result property="addrRemark" column="addr_remark"/>
        <result property="status" column="status"/>
        <result property="handlerId" column="handler_id"/>
        <result property="createAt" column="create_at"/>
        <result property="examineAt" column="examine_at"/>
        <result property="detail" column="detail"/>
        <result property="photoPathList" column="photo_path_list"/>
        <result property="handleResult" column="handle_result"/>
        <result property="handlePhotoList" column="handle_photo_list"/>
        <result property="communityId" column="community_id"/>
        <result property="isHide" column="is_hide"/>
        <result property="isNeedFeedBack" column="is_need_feed_back"/>
        <result property="feedbackAt" column="feedback_at"/>
        <result property="rejectReason" column="reject_reason"/>
        <result property="delTag" column="del_tag"/>
        <result property="isReport" column="is_report"/>
        <result property="isPublicity" column="is_publicity"/>
        <result property="handleStatus" column="handle_status"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,sponsor_id,happen_addr,addr_remark,status,handler_id,create_at,examine_at,detail,photo_path_list,handle_result,handle_photo_list,community_id,is_hide,is_need_feed_back,feedback_at,reject_reason,del_tag,is_report,is_publicity
    ]]>
    </sql>


    <select id="findByPage" resultType="com.panzhihua.common.model.vos.grid.ComActEasyPhotoVO"
        parameterType="com.panzhihua.common.model.dtos.grid.PageEasyAppDTO">
        SELECT
        caep.id,
        su.nick_name,
        su.image_url,
        caep.sponsor_id,
        caep.detail,
        caep.create_at,
        caep.`status`,
        caep.is_publicity,
        caep.photo_path_list,
        caep.happen_addr,
        caep.is_report
        FROM
        com_act_easy_photo AS caep
        LEFT JOIN sys_user AS su ON su.user_id = caep.sponsor_id
        <where>
            AND caep.delTag = 0
            <if test="easyAppDTO.communityId!=null">
                AND caep.community_id = #{easyAppDTO.communityId}
            </if>
           <if test="easyAppDTO.isReport!=null">
                AND caep.is_report = #{easyAppDTO.isReport}
            </if>
           <if test="easyAppDTO.isPublicity!=null">
                AND caep.is_publicity = #{easyAppDTO.isPublicity}
            </if>
            <if test="easyAppDTO.handleStatus!=null">
                AND caep.handle_status = #{easyAppDTO.handleStatus}
            </if>
        </where>
        ORDER BY caep.create_at desc
    </select>

    <select id="findByEaseId" resultType="com.panzhihua.common.model.vos.grid.ComActEasyPhotoVO">
        SELECT
        caep.id,
        su.nick_name,
        su.image_url,
        caep.sponsor_id,
        caep.detail,
        caep.create_at,
        caep.`status`,
        caep.is_publicity,
        caep.photo_path_list,
        caep.happen_addr,
        caep.handle_result,
        caep.handle_photo_list,
        caep.feedback_at,
        caep.handler_id,
        su1.`name` AS handlerName,
        caep.is_report
        FROM
        com_act_easy_photo AS caep
        LEFT JOIN sys_user AS su ON su.user_id = caep.sponsor_id
        LEFT JOIN sys_user AS su1 ON su1.user_id = caep.handler_id
        <where>
            <if test="easyId!=null">
                AND caep.id = #{easyId}
            </if>
        </where>
        ORDER BY caep.create_at desc
    </select>
</mapper>

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

New file
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >


<mapper namespace="com.panzhihua.service_grid.dao.ComActEasyPhotoTypeMapper">

     <resultMap id="baseResult" type="com.panzhihua.service_grid.model.dos.ComActEasyPhotoTypeDO">
        <result property="id" column="id"/>
        <result property="name" column="name"/>
        <result property="createAt" column="create_at"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,name,create_at
    ]]>
    </sql>


    <select id="findByPage" resultType="com.panzhihua.common.model.vos.grid.ComActEasyPhotoTypeVO"
        parameterType="com.panzhihua.common.model.dtos.grid.PageComActEasyPhotoTypeDTO">
        SELECT <include refid="columns" />
        FROM com_act_easy_photo_type
        <where>
           <if test="pageComActEasyPhotoTypeDTO.id!=null">
                AND id = #{pageComActEasyPhotoTypeDTO.id}
            </if>
           <if test="pageComActEasyPhotoTypeDTO.name!=null">
                AND name = #{pageComActEasyPhotoTypeDTO.name}
            </if>
           <if test="pageComActEasyPhotoTypeDTO.createAtBegin!=null">
                AND create_at &gt;= #{pageComActEasyPhotoTypeDTO.createAtBegin}
           </if>
           <if test="pageComActEasyPhotoTypeDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageComActEasyPhotoTypeDTO.createAtEnd}
           </if>
        </where>
        <if test="pageComActEasyPhotoTypeDTO.sortColumns!=null">
            ORDER BY ${pageComActEasyPhotoTypeDTO.sortColumns} ${pageComActEasyPhotoTypeDTO.sortType}
        </if>
    </select>

</mapper>

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

New file
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >


<mapper namespace="com.panzhihua.service_grid.dao.ComActEasyPhotoTypeRelationMapper">

     <resultMap id="baseResult" type="com.panzhihua.service_grid.model.dos.ComActEasyPhotoTypeRelationDO">
        <result property="id" column="id"/>
        <result property="easyId" column="easy_id"/>
        <result property="easyTypeId" column="easy_type_id"/>
        <result property="createAt" column="create_at"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,easy_id,easy_type_id
    ]]>
    </sql>

    <select id="getEasyPhotoTypeRelationByEasyId" resultType="String">
        SELECT
            caept.`name`
        FROM
            com_act_easy_photo_type_relation AS caeptr
            LEFT JOIN com_act_easy_photo_type AS caept ON caept.id = caeptr.easy_type_id
        <where>
            <if test="easyId!=null">
                caeptr.easy_id = #{easyId}
            </if>
        </where>
        ORDER BY caeptr.create_at desc
    </select>


</mapper>

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

New file
@@ -0,0 +1,63 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >


<mapper namespace="com.panzhihua.service_grid.dao.EventApplicationAppReleaseMapper">

     <resultMap id="baseResult" type="com.panzhihua.service_grid.model.dos.EventApplicationAppReleaseDO">
        <result property="id" column="id"/>
        <result property="productId" column="product_id"/>
        <result property="productName" column="product_name"/>
        <result property="releaseNumber" column="release_number"/>
        <result property="action" column="action"/>
        <result property="url" column="url"/>
        <result property="createAt" column="create_at"/>
        <result property="createBy" column="create_by"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,product_id,product_name,release_number,action,url,create_at,create_by
    ]]>
    </sql>


    <select id="findByPage" resultType="com.panzhihua.common.model.vos.grid.EventApplicationAppReleaseVO"
        parameterType="com.panzhihua.common.model.dtos.grid.PageEventApplicationAppReleaseDTO">
        SELECT <include refid="columns" />
        FROM event_application_app_release
        <where>
           <if test="pageEventApplicationAppReleaseDTO.id!=null">
                AND id = #{pageEventApplicationAppReleaseDTO.id}
            </if>
           <if test="pageEventApplicationAppReleaseDTO.productId!=null">
                AND product_id = #{pageEventApplicationAppReleaseDTO.productId}
            </if>
           <if test="pageEventApplicationAppReleaseDTO.productName!=null">
                AND product_name = #{pageEventApplicationAppReleaseDTO.productName}
            </if>
           <if test="pageEventApplicationAppReleaseDTO.releaseNumber!=null">
                AND release_number = #{pageEventApplicationAppReleaseDTO.releaseNumber}
            </if>
           <if test="pageEventApplicationAppReleaseDTO.action!=null">
                AND action = #{pageEventApplicationAppReleaseDTO.action}
            </if>
           <if test="pageEventApplicationAppReleaseDTO.url!=null">
                AND url = #{pageEventApplicationAppReleaseDTO.url}
            </if>
           <if test="pageEventApplicationAppReleaseDTO.createAtBegin!=null">
                AND create_at &gt;= #{pageEventApplicationAppReleaseDTO.createAtBegin}
           </if>
           <if test="pageEventApplicationAppReleaseDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageEventApplicationAppReleaseDTO.createAtEnd}
           </if>
           <if test="pageEventApplicationAppReleaseDTO.createBy!=null">
                AND create_by = #{pageEventApplicationAppReleaseDTO.createBy}
            </if>
        </where>
        <if test="pageEventApplicationAppReleaseDTO.sortColumns!=null">
            ORDER BY ${pageEventApplicationAppReleaseDTO.sortColumns} ${pageEventApplicationAppReleaseDTO.sortType}
        </if>
    </select>

</mapper>

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

New file
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >


<mapper namespace="com.panzhihua.service_grid.dao.EventApplicationUserNoticeMapper">

     <resultMap id="baseResult" type="com.panzhihua.service_grid.model.dos.EventApplicationUserNoticeDO">
        <result property="id" column="id"/>
        <result property="productId" column="product_id"/>
        <result property="productName" column="product_name"/>
        <result property="action" column="action"/>
        <result property="content" column="content"/>
        <result property="createAt" column="create_at"/>
        <result property="createBy" column="create_by"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,product_id,product_name,action,content,create_at,create_by
    ]]>
    </sql>


    <select id="findByPage" resultType="com.panzhihua.common.model.vos.grid.EventApplicationUserNoticeVO"
        parameterType="com.panzhihua.common.model.dtos.grid.PageEventApplicationUserNoticeDTO">
        SELECT <include refid="columns" />
        FROM event_application_user_notice
        <where>
           <if test="pageEventApplicationUserNoticeDTO.id!=null">
                AND id = #{pageEventApplicationUserNoticeDTO.id}
            </if>
           <if test="pageEventApplicationUserNoticeDTO.productId!=null">
                AND product_id = #{pageEventApplicationUserNoticeDTO.productId}
            </if>
           <if test="pageEventApplicationUserNoticeDTO.productName!=null">
                AND product_name = #{pageEventApplicationUserNoticeDTO.productName}
            </if>
           <if test="pageEventApplicationUserNoticeDTO.action!=null">
                AND action = #{pageEventApplicationUserNoticeDTO.action}
            </if>
           <if test="pageEventApplicationUserNoticeDTO.content!=null">
                AND content = #{pageEventApplicationUserNoticeDTO.content}
            </if>
           <if test="pageEventApplicationUserNoticeDTO.createAtBegin!=null">
                AND create_at &gt;= #{pageEventApplicationUserNoticeDTO.createAtBegin}
           </if>
           <if test="pageEventApplicationUserNoticeDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageEventApplicationUserNoticeDTO.createAtEnd}
           </if>
           <if test="pageEventApplicationUserNoticeDTO.createBy!=null">
                AND create_by = #{pageEventApplicationUserNoticeDTO.createBy}
            </if>
        </where>
        <if test="pageEventApplicationUserNoticeDTO.sortColumns!=null">
            ORDER BY ${pageEventApplicationUserNoticeDTO.sortColumns} ${pageEventApplicationUserNoticeDTO.sortType}
        </if>
    </select>

</mapper>

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

New file
@@ -0,0 +1,173 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >


<mapper namespace="com.panzhihua.service_grid.dao.EventGridDataMapper">

     <resultMap id="baseResult" type="com.panzhihua.service_grid.model.dos.EventGridDataDO">
        <result property="id" column="id"/>
        <result property="type" column="type"/>
        <result property="zoneId" column="zone_id"/>
        <result property="gridStreetId" column="grid_street_id"/>
        <result property="gridCommunityId" column="grid_community_id"/>
        <result property="gridName" column="grid_name"/>
        <result property="mapLevel" column="map_level"/>
        <result property="area" column="area"/>
        <result property="lineColor" column="line_color"/>
        <result property="lineBroadband" column="line_broadband"/>
        <result property="fillColor" column="fill_color"/>
        <result property="remarks" column="remarks"/>
        <result property="data" column="data"/>
        <result property="createBy" column="create_by"/>
        <result property="createAt" column="create_at"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateAt" column="update_at"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,type,zone_id,grid_street_id,grid_community_id,grid_name,map_level,area,line_color,line_broadband,fill_color,remarks,data,create_by,create_at,update_by,update_at
    ]]>
    </sql>


    <select id="findByPage" resultType="com.panzhihua.common.model.vos.grid.EventGridDataVO"
        parameterType="com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO">
        SELECT <include refid="columns" />
        FROM event_grid_data
        <where>
           <if test="pageEventGridDataDTO.id!=null">
                AND id = #{pageEventGridDataDTO.id}
            </if>
           <if test="pageEventGridDataDTO.type!=null">
                AND type = #{pageEventGridDataDTO.type}
            </if>
           <if test="pageEventGridDataDTO.zoneId!=null">
                AND zone_id = #{pageEventGridDataDTO.zoneId}
            </if>
           <if test="pageEventGridDataDTO.gridStreetId!=null">
                AND grid_street_id = #{pageEventGridDataDTO.gridStreetId}
            </if>
           <if test="pageEventGridDataDTO.gridCommunityId!=null">
                AND grid_community_id = #{pageEventGridDataDTO.gridCommunityId}
            </if>
           <if test="pageEventGridDataDTO.gridName!=null">
                AND grid_name = #{pageEventGridDataDTO.gridName}
            </if>
           <if test="pageEventGridDataDTO.mapLevel!=null">
                AND map_level = #{pageEventGridDataDTO.mapLevel}
            </if>
           <if test="pageEventGridDataDTO.area!=null">
                AND area = #{pageEventGridDataDTO.area}
            </if>
           <if test="pageEventGridDataDTO.lineColor!=null">
                AND line_color = #{pageEventGridDataDTO.lineColor}
            </if>
           <if test="pageEventGridDataDTO.lineBroadband!=null">
                AND line_broadband = #{pageEventGridDataDTO.lineBroadband}
            </if>
           <if test="pageEventGridDataDTO.fillColor!=null">
                AND fill_color = #{pageEventGridDataDTO.fillColor}
            </if>
           <if test="pageEventGridDataDTO.remarks!=null">
                AND remarks = #{pageEventGridDataDTO.remarks}
            </if>
           <if test="pageEventGridDataDTO.data!=null">
                AND data = #{pageEventGridDataDTO.data}
            </if>
           <if test="pageEventGridDataDTO.createBy!=null">
                AND create_by = #{pageEventGridDataDTO.createBy}
            </if>
           <if test="pageEventGridDataDTO.createAtBegin!=null">
                AND create_at &gt;= #{pageEventGridDataDTO.createAtBegin}
           </if>
           <if test="pageEventGridDataDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageEventGridDataDTO.createAtEnd}
           </if>
           <if test="pageEventGridDataDTO.updateBy!=null">
                AND update_by = #{pageEventGridDataDTO.updateBy}
            </if>
           <if test="pageEventGridDataDTO.updateAtBegin!=null">
                AND update_at &gt;= #{pageEventGridDataDTO.updateAtBegin}
           </if>
           <if test="pageEventGridDataDTO.updateAtEnd!=null">
                AND update_at &lt;= #{pageEventGridDataDTO.updateAtEnd}
           </if>
        </where>
        <if test="pageEventGridDataDTO.sortColumns!=null">
            ORDER BY ${pageEventGridDataDTO.sortColumns} ${pageEventGridDataDTO.sortType}
        </if>
    </select>
    <select id="selectUserGrid" resultType="com.panzhihua.common.model.vos.grid.EventGridDataVO"
            parameterType="com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO">
        SELECT gd.id, gd.type, gd.zone_id, gd.grid_street_id, gd.grid_community_id, gd.grid_name, gd.map_level, gd.area, gd.line_color,
            gd.line_broadband, gd.fill_color, gd.remarks, gd.data, gd.create_by, gd.create_at, gd.update_by, gd.update_at
        FROM event_grid_data gd left join event_grid_member_relation gdr on gd.id = gdr.grid_id
        <where>
            <if test="pageEventGridDataDTO.userId!=null">
                AND gdr.grid_member_id = #{pageEventGridDataDTO.userId}
            </if>
            <if test="pageEventGridDataDTO.id!=null">
                AND gd.id = #{pageEventGridDataDTO.id}
            </if>
            <if test="pageEventGridDataDTO.type!=null">
                AND gd.type = #{pageEventGridDataDTO.type}
            </if>
            <if test="pageEventGridDataDTO.zoneId!=null">
                AND gd.zone_id = #{pageEventGridDataDTO.zoneId}
            </if>
            <if test="pageEventGridDataDTO.gridStreetId!=null">
                AND gd.grid_street_id = #{pageEventGridDataDTO.gridStreetId}
            </if>
            <if test="pageEventGridDataDTO.gridCommunityId!=null">
                AND gd.grid_community_id = #{pageEventGridDataDTO.gridCommunityId}
            </if>
            <if test="pageEventGridDataDTO.gridName!=null">
                AND gd.grid_name = #{pageEventGridDataDTO.gridName}
            </if>
            <if test="pageEventGridDataDTO.mapLevel!=null">
                AND gd.map_level = #{pageEventGridDataDTO.mapLevel}
            </if>
            <if test="pageEventGridDataDTO.area!=null">
                AND gd.area = #{pageEventGridDataDTO.area}
            </if>
            <if test="pageEventGridDataDTO.lineColor!=null">
                AND gd.line_color = #{pageEventGridDataDTO.lineColor}
            </if>
            <if test="pageEventGridDataDTO.lineBroadband!=null">
                AND gd.line_broadband = #{pageEventGridDataDTO.lineBroadband}
            </if>
            <if test="pageEventGridDataDTO.fillColor!=null">
                AND gd.fill_color = #{pageEventGridDataDTO.fillColor}
            </if>
            <if test="pageEventGridDataDTO.remarks!=null">
                AND gd.remarks = #{pageEventGridDataDTO.remarks}
            </if>
            <if test="pageEventGridDataDTO.data!=null">
                AND gd.data = #{pageEventGridDataDTO.data}
            </if>
            <if test="pageEventGridDataDTO.createBy!=null">
                AND gd.create_by = #{pageEventGridDataDTO.createBy}
            </if>
            <if test="pageEventGridDataDTO.createAtBegin!=null">
                AND gd.create_at >= #{pageEventGridDataDTO.createAtBegin}
            </if>
            <if test="pageEventGridDataDTO.createAtEnd!=null">
                AND gd.create_at &lt;= #{pageEventGridDataDTO.createAtEnd}
            </if>
            <if test="pageEventGridDataDTO.updateBy!=null">
                AND gd.update_by = #{pageEventGridDataDTO.updateBy}
            </if>
            <if test="pageEventGridDataDTO.updateAtBegin!=null">
                AND gd.update_at >= #{pageEventGridDataDTO.updateAtBegin}
            </if>
            <if test="pageEventGridDataDTO.updateAtEnd!=null">
                AND gd.update_at &lt;= #{pageEventGridDataDTO.updateAtEnd}
            </if>
        </where>
        <if test="pageEventGridDataDTO.sortColumns!=null">
            ORDER BY ${pageEventGridDataDTO.sortColumns} ${pageEventGridDataDTO.sortType}
        </if>
    </select>

</mapper>

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

New file
@@ -0,0 +1,85 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >


<mapper namespace="com.panzhihua.service_grid.dao.EventGridMemberGpsLogMapper">

     <resultMap id="baseResult" type="com.panzhihua.service_grid.model.dos.EventGridMemberGpsLogDO">
        <result property="id" column="id"/>
        <result property="gridStreetId" column="grid_street_id"/>
        <result property="gridCommunityId" column="grid_community_id"/>
        <result property="gridId" column="grid_id"/>
        <result property="gridName" column="grid_name"/>
        <result property="gridMemberId" column="grid_member_id"/>
        <result property="lngLat" column="lng_lat"/>
        <result property="positionStation" column="position_station"/>
        <result property="createBy" column="create_by"/>
        <result property="createAt" column="create_at"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,grid_street_id,grid_community_id,grid_id,grid_name,grid_member_id,lng_lat,position_station,create_by,create_at
    ]]>
    </sql>


    <select id="findByPage" resultType="com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogVO"
        parameterType="com.panzhihua.common.model.dtos.grid.PageEventGridMemberGpsLogDTO">
        SELECT <include refid="columns" />
        FROM event_grid_member_gps_log
        <where>
           <if test="pageEventGridMemberGpsLogDTO.id!=null">
                AND id = #{pageEventGridMemberGpsLogDTO.id}
            </if>
           <if test="pageEventGridMemberGpsLogDTO.gridStreetId!=null">
                AND grid_street_id = #{pageEventGridMemberGpsLogDTO.gridStreetId}
            </if>
           <if test="pageEventGridMemberGpsLogDTO.gridCommunityId!=null">
                AND grid_community_id = #{pageEventGridMemberGpsLogDTO.gridCommunityId}
            </if>
           <if test="pageEventGridMemberGpsLogDTO.gridId!=null">
                AND grid_id = #{pageEventGridMemberGpsLogDTO.gridId}
            </if>
           <if test="pageEventGridMemberGpsLogDTO.gridName!=null">
                AND grid_name = #{pageEventGridMemberGpsLogDTO.gridName}
            </if>
           <if test="pageEventGridMemberGpsLogDTO.gridMemberId!=null">
                AND grid_member_id = #{pageEventGridMemberGpsLogDTO.gridMemberId}
            </if>
           <if test="pageEventGridMemberGpsLogDTO.lngLat!=null">
                AND lng_lat = #{pageEventGridMemberGpsLogDTO.lngLat}
            </if>
           <if test="pageEventGridMemberGpsLogDTO.positionStation!=null">
                AND position_station = #{pageEventGridMemberGpsLogDTO.positionStation}
            </if>
           <if test="pageEventGridMemberGpsLogDTO.createBy!=null">
                AND create_by = #{pageEventGridMemberGpsLogDTO.createBy}
            </if>
           <if test="pageEventGridMemberGpsLogDTO.createAtBegin!=null">
                AND create_at &gt;= #{pageEventGridMemberGpsLogDTO.createAtBegin}
           </if>
           <if test="pageEventGridMemberGpsLogDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageEventGridMemberGpsLogDTO.createAtEnd}
           </if>
        </where>
        <if test="pageEventGridMemberGpsLogDTO.sortColumns!=null">
            ORDER BY ${pageEventGridMemberGpsLogDTO.sortColumns} ${pageEventGridMemberGpsLogDTO.sortType}
        </if>
    </select>

    <select id="getTrajectoryByApp" resultType="com.panzhihua.common.model.vos.grid.EventMapTrajectoryVO">
        SELECT
            id,
            lng_lat
        FROM
            event_grid_member_gps_log
        WHERE
            create_at BETWEEN DATE_FORMAT( CURDATE(), '%Y-%m-%d %H:%i:%s' )
            AND NOW()
            AND grid_member_id = #{userId}
        ORDER BY
            create_at ASC
    </select>

</mapper>

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

New file
@@ -0,0 +1,73 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >


<mapper namespace="com.panzhihua.service_grid.dao.EventGridMemberRelationMapper">

     <resultMap id="baseResult" type="com.panzhihua.service_grid.model.dos.EventGridMemberRelationDO">
        <result property="id" column="id"/>
        <result property="gridStreetId" column="grid_street_id"/>
        <result property="gridCommunityId" column="grid_community_id"/>
        <result property="gridId" column="grid_id"/>
        <result property="gridName" column="grid_name"/>
        <result property="gridMemberId" column="grid_member_id"/>
        <result property="createBy" column="create_by"/>
        <result property="createAt" column="create_at"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,grid_street_id,grid_community_id,grid_id,grid_name,grid_member_id,create_by,create_at
    ]]>
    </sql>


    <select id="findByPage" resultType="com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO"
        parameterType="com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO">
        SELECT <include refid="columns" />
        FROM event_grid_member_relation
        <where>
           <if test="pageEventGridMemberRelationDTO.id!=null">
                AND id = #{pageEventGridMemberRelationDTO.id}
            </if>
           <if test="pageEventGridMemberRelationDTO.gridStreetId!=null">
                AND grid_street_id = #{pageEventGridMemberRelationDTO.gridStreetId}
            </if>
           <if test="pageEventGridMemberRelationDTO.gridCommunityId!=null">
                AND grid_community_id = #{pageEventGridMemberRelationDTO.gridCommunityId}
            </if>
           <if test="pageEventGridMemberRelationDTO.gridId!=null">
                AND grid_id = #{pageEventGridMemberRelationDTO.gridId}
            </if>
           <if test="pageEventGridMemberRelationDTO.gridName!=null">
                AND grid_name = #{pageEventGridMemberRelationDTO.gridName}
            </if>
           <if test="pageEventGridMemberRelationDTO.gridMemberId!=null">
                AND grid_member_id = #{pageEventGridMemberRelationDTO.gridMemberId}
            </if>
           <if test="pageEventGridMemberRelationDTO.createBy!=null">
                AND create_by = #{pageEventGridMemberRelationDTO.createBy}
            </if>
           <if test="pageEventGridMemberRelationDTO.createAtBegin!=null">
                AND create_at &gt;= #{pageEventGridMemberRelationDTO.createAtBegin}
           </if>
           <if test="pageEventGridMemberRelationDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageEventGridMemberRelationDTO.createAtEnd}
           </if>
        </where>
        <if test="pageEventGridMemberRelationDTO.sortColumns!=null">
            ORDER BY ${pageEventGridMemberRelationDTO.sortColumns} ${pageEventGridMemberRelationDTO.sortType}
        </if>
    </select>

    <select id="getMapGridListByApp" resultType="com.panzhihua.common.model.vos.grid.EventMapGridVO">
        SELECT
            grid_id,
            grid_name
        FROM
            event_grid_member_relation
        WHERE
            grid_member_id = #{userId}
    </select>

</mapper>

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

New file
@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >


<mapper namespace="com.panzhihua.service_grid.dao.EventGridMemberWarnLogMapper">

     <resultMap id="baseResult" type="com.panzhihua.service_grid.model.dos.EventGridMemberWarnLogDO">
        <result property="id" column="id"/>
        <result property="gridStreetId" column="grid_street_id"/>
        <result property="gridCommunityId" column="grid_community_id"/>
        <result property="gridId" column="grid_id"/>
        <result property="gridName" column="grid_name"/>
        <result property="gridMemberId" column="grid_member_id"/>
        <result property="lngLat" column="lng_lat"/>
        <result property="content" column="content"/>
        <result property="createBy" column="create_by"/>
        <result property="createAt" column="create_at"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,grid_street_id,grid_community_id,grid_id,grid_name,grid_member_id,lng_lat,content,create_by,create_at
    ]]>
    </sql>


    <select id="findByPage" resultType="com.panzhihua.common.model.vos.grid.EventGridMemberWarnLogVO"
        parameterType="com.panzhihua.common.model.dtos.grid.PageEventGridMemberWarnLogDTO">
        SELECT <include refid="columns" />
        FROM event_grid_member_warn_log
        <where>
           <if test="pageEventGridMemberWarnLogDTO.id!=null">
                AND id = #{pageEventGridMemberWarnLogDTO.id}
            </if>
           <if test="pageEventGridMemberWarnLogDTO.gridStreetId!=null">
                AND grid_street_id = #{pageEventGridMemberWarnLogDTO.gridStreetId}
            </if>
           <if test="pageEventGridMemberWarnLogDTO.gridCommunityId!=null">
                AND grid_community_id = #{pageEventGridMemberWarnLogDTO.gridCommunityId}
            </if>
           <if test="pageEventGridMemberWarnLogDTO.gridId!=null">
                AND grid_id = #{pageEventGridMemberWarnLogDTO.gridId}
            </if>
           <if test="pageEventGridMemberWarnLogDTO.gridName!=null">
                AND grid_name = #{pageEventGridMemberWarnLogDTO.gridName}
            </if>
           <if test="pageEventGridMemberWarnLogDTO.gridMemberId!=null">
                AND grid_member_id = #{pageEventGridMemberWarnLogDTO.gridMemberId}
            </if>
           <if test="pageEventGridMemberWarnLogDTO.lngLat!=null">
                AND lng_lat = #{pageEventGridMemberWarnLogDTO.lngLat}
            </if>
           <if test="pageEventGridMemberWarnLogDTO.content!=null">
                AND content = #{pageEventGridMemberWarnLogDTO.content}
            </if>
           <if test="pageEventGridMemberWarnLogDTO.createBy!=null">
                AND create_by = #{pageEventGridMemberWarnLogDTO.createBy}
            </if>
           <if test="pageEventGridMemberWarnLogDTO.createAtBegin!=null">
                AND create_at &gt;= #{pageEventGridMemberWarnLogDTO.createAtBegin}
           </if>
           <if test="pageEventGridMemberWarnLogDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageEventGridMemberWarnLogDTO.createAtEnd}
           </if>
        </where>
        <if test="pageEventGridMemberWarnLogDTO.sortColumns!=null">
            ORDER BY ${pageEventGridMemberWarnLogDTO.sortColumns} ${pageEventGridMemberWarnLogDTO.sortType}
        </if>
    </select>

</mapper>

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

New file
@@ -0,0 +1,160 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >


<mapper namespace="com.panzhihua.service_grid.dao.EventMainMemberMapper">

     <resultMap id="baseResult" type="com.panzhihua.service_grid.model.dos.EventMainMemberDO">
        <result property="id" column="id"/>
        <result property="gridMemberStreet" column="grid_member_street"/>
        <result property="gridMemberCommunity" column="grid_member_community"/>
        <result property="gridMember" column="grid_member"/>
        <result property="gridMemberName" column="grid_member_name"/>
        <result property="gridMemberTele" column="grid_member_tele"/>
        <result property="visiterId" column="visiter_id"/>
        <result property="visiterName" column="visiter_name"/>
        <result property="visiterSex" column="visiter_sex"/>
        <result property="visiterTele" column="visiter_tele"/>
        <result property="visiterAddress" column="visiter_address"/>
        <result property="visiterAddressLatLng" column="visiter_address_lat_lng"/>
        <result property="visiterType" column="visiter_type"/>
        <result property="actOpara" column="act_opara"/>
        <result property="eventStatus" column="event_status"/>
        <result property="reporting" column="reporting"/>
        <result property="dellType" column="dell_type"/>
        <result property="dellUserId" column="dell_user_id"/>
        <result property="dellUserName" column="dell_user_name"/>
        <result property="dellDate" column="dell_date"/>
        <result property="dellDesc" column="dell_desc"/>
        <result property="invalid" column="invalid"/>
        <result property="urgent" column="urgent"/>
        <result property="urgentDell" column="urgent_dell"/>
        <result property="submitDate" column="submit_date"/>
        <result property="visiterConfig" column="visiter_config"/>
        <result property="createBy" column="create_by"/>
        <result property="createAt" column="create_at"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateAt" column="update_at"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,grid_member_street,grid_member_community,grid_member,grid_member_name,grid_member_tele,visiter_id,visiter_name,visiter_sex,visiter_tele,visiter_address,visiter_address_lat_lng,visiter_type,act_opara,event_status,reporting,dell_type,dell_user_id,dell_user_name,dell_date,dell_desc,invalid,urgent,urgent_dell,submit_date,visiter_config,create_by,create_at,update_by,update_at
    ]]>
    </sql>


    <select id="findByPage" resultType="com.panzhihua.common.model.vos.grid.EventMainMemberVO"
        parameterType="com.panzhihua.common.model.dtos.grid.PageEventMainMemberDTO">
        SELECT <include refid="columns" />
        FROM event_main_member
        <where>
           <if test="pageEventMainMemberDTO.id!=null">
                AND id = #{pageEventMainMemberDTO.id}
            </if>
           <if test="pageEventMainMemberDTO.gridMemberStreet!=null">
                AND grid_member_street = #{pageEventMainMemberDTO.gridMemberStreet}
            </if>
           <if test="pageEventMainMemberDTO.gridMemberCommunity!=null">
                AND grid_member_community = #{pageEventMainMemberDTO.gridMemberCommunity}
            </if>
           <if test="pageEventMainMemberDTO.gridMember!=null">
                AND grid_member = #{pageEventMainMemberDTO.gridMember}
            </if>
           <if test="pageEventMainMemberDTO.gridMemberName!=null">
                AND grid_member_name = #{pageEventMainMemberDTO.gridMemberName}
            </if>
           <if test="pageEventMainMemberDTO.gridMemberTele!=null">
                AND grid_member_tele = #{pageEventMainMemberDTO.gridMemberTele}
            </if>
           <if test="pageEventMainMemberDTO.visiterId!=null">
                AND visiter_id = #{pageEventMainMemberDTO.visiterId}
            </if>
           <if test="pageEventMainMemberDTO.visiterName!=null">
                AND visiter_name = #{pageEventMainMemberDTO.visiterName}
            </if>
           <if test="pageEventMainMemberDTO.visiterSex!=null">
                AND visiter_sex = #{pageEventMainMemberDTO.visiterSex}
            </if>
           <if test="pageEventMainMemberDTO.visiterTele!=null">
                AND visiter_tele = #{pageEventMainMemberDTO.visiterTele}
            </if>
           <if test="pageEventMainMemberDTO.visiterAddress!=null">
                AND visiter_address = #{pageEventMainMemberDTO.visiterAddress}
            </if>
           <if test="pageEventMainMemberDTO.visiterAddressLatLng!=null">
                AND visiter_address_lat_lng = #{pageEventMainMemberDTO.visiterAddressLatLng}
            </if>
           <if test="pageEventMainMemberDTO.visiterType!=null">
                AND visiter_type = #{pageEventMainMemberDTO.visiterType}
            </if>
           <if test="pageEventMainMemberDTO.actOpara!=null">
                AND act_opara = #{pageEventMainMemberDTO.actOpara}
            </if>
           <if test="pageEventMainMemberDTO.eventStatus!=null">
                AND event_status = #{pageEventMainMemberDTO.eventStatus}
            </if>
           <if test="pageEventMainMemberDTO.reporting!=null">
                AND reporting = #{pageEventMainMemberDTO.reporting}
            </if>
           <if test="pageEventMainMemberDTO.dellType!=null">
                AND dell_type = #{pageEventMainMemberDTO.dellType}
            </if>
           <if test="pageEventMainMemberDTO.dellUserId!=null">
                AND dell_user_id = #{pageEventMainMemberDTO.dellUserId}
            </if>
           <if test="pageEventMainMemberDTO.dellUserName!=null">
                AND dell_user_name = #{pageEventMainMemberDTO.dellUserName}
            </if>
           <if test="pageEventMainMemberDTO.dellDateBegin!=null">
                AND dell_date &gt;= #{pageEventMainMemberDTO.dellDateBegin}
           </if>
           <if test="pageEventMainMemberDTO.dellDateEnd!=null">
                AND dell_date &lt;= #{pageEventMainMemberDTO.dellDateEnd}
           </if>
           <if test="pageEventMainMemberDTO.dellDesc!=null">
                AND dell_desc = #{pageEventMainMemberDTO.dellDesc}
            </if>
           <if test="pageEventMainMemberDTO.invalid!=null">
                AND invalid = #{pageEventMainMemberDTO.invalid}
            </if>
           <if test="pageEventMainMemberDTO.urgent!=null">
                AND urgent = #{pageEventMainMemberDTO.urgent}
            </if>
           <if test="pageEventMainMemberDTO.urgentDell!=null">
                AND urgent_dell = #{pageEventMainMemberDTO.urgentDell}
            </if>
           <if test="pageEventMainMemberDTO.submitDateBegin!=null">
                AND submit_date &gt;= #{pageEventMainMemberDTO.submitDateBegin}
           </if>
           <if test="pageEventMainMemberDTO.submitDateEnd!=null">
                AND submit_date &lt;= #{pageEventMainMemberDTO.submitDateEnd}
           </if>
           <if test="pageEventMainMemberDTO.visiterConfig!=null">
                AND visiter_config = #{pageEventMainMemberDTO.visiterConfig}
            </if>
           <if test="pageEventMainMemberDTO.createBy!=null">
                AND create_by = #{pageEventMainMemberDTO.createBy}
            </if>
           <if test="pageEventMainMemberDTO.createAtBegin!=null">
                AND create_at &gt;= #{pageEventMainMemberDTO.createAtBegin}
           </if>
           <if test="pageEventMainMemberDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageEventMainMemberDTO.createAtEnd}
           </if>
           <if test="pageEventMainMemberDTO.updateBy!=null">
                AND update_by = #{pageEventMainMemberDTO.updateBy}
            </if>
           <if test="pageEventMainMemberDTO.updateAtBegin!=null">
                AND update_at &gt;= #{pageEventMainMemberDTO.updateAtBegin}
           </if>
           <if test="pageEventMainMemberDTO.updateAtEnd!=null">
                AND update_at &lt;= #{pageEventMainMemberDTO.updateAtEnd}
           </if>
        </where>
        <if test="pageEventMainMemberDTO.sortColumns!=null">
            ORDER BY ${pageEventMainMemberDTO.sortColumns} ${pageEventMainMemberDTO.sortType}
        </if>
    </select>

</mapper>

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

New file
@@ -0,0 +1,444 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >


<mapper namespace="com.panzhihua.service_grid.dao.EventMapper">

     <resultMap id="baseResult" type="com.panzhihua.service_grid.model.dos.EventDO">
        <result property="id" column="id"/>
        <result property="orderSn" column="order_sn"/>
        <result property="eventCategory" column="event_category"/>
        <result property="gridMemberStreet" column="grid_member_street"/>
        <result property="gridMemberCommunity" column="grid_member_community"/>
        <result property="gridId" column="grid_id"/>
        <result property="gridMemberId" column="grid_member_id"/>
        <result property="gridMemberName" column="grid_member_name"/>
        <result property="gridMemberTelephone" column="grid_member_telephone"/>
        <result property="eventTitle" column="event_title"/>
        <result property="propagandaType" column="propaganda_type"/>
        <result property="propagandaTime" column="propaganda_time"/>
        <result property="eventType" column="event_type"/>
        <result property="eventDes" column="event_des"/>
        <result property="propagandaObject" column="propaganda_object"/>
        <result property="propagandaNum" column="propaganda_num"/>
        <result property="communityProcess" column="community_process"/>
        <result property="happenTime" column="happen_time"/>
        <result property="happentAddress" column="happent_address"/>
        <result property="happentLatLng" column="happent_lat_lng"/>
        <result property="eventStatus" column="event_status"/>
        <result property="eventProcessStatus" column="event_process_status"/>
        <result property="processType" column="process_type"/>
        <result property="processUserId" column="process_user_id"/>
        <result property="processUserName" column="process_user_name"/>
        <result property="processDate" column="process_date"/>
        <result property="processDesc" column="process_desc"/>
        <result property="eventResource" column="event_resource"/>
        <result property="dangerLevel" column="danger_level"/>
        <result property="redCard" column="red_card"/>
        <result property="yellowCard" column="yellow_card"/>
        <result property="invalid" column="invalid"/>
        <result property="major" column="major"/>
        <result property="deathsNumber" column="deaths_number"/>
        <result property="injuriesNumber" column="injuries_number"/>
        <result property="difficult" column="difficult"/>
        <result property="urgent" column="urgent"/>
        <result property="urgentDell" column="urgent_dell"/>
        <result property="submitDate" column="submit_date"/>
        <result property="createBy" column="create_by"/>
        <result property="createAt" column="create_at"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateAt" column="update_at"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,order_sn,event_category,grid_member_street,grid_member_community,grid_id,grid_member_id,grid_member_name,grid_member_telephone,event_title,propaganda_type,propaganda_time,event_type,event_des,propaganda_object,propaganda_num,community_process,happen_time,happent_address,happent_lat_lng,event_status,event_process_status,process_type,process_user_id,process_user_name,process_date,process_desc,event_resource,danger_level,red_card,yellow_card,invalid,major,deaths_number,injuries_number,difficult,urgent,urgent_dell,submit_date,create_by,create_at,update_by,update_at
    ]]>
    </sql>


    <select id="findByPage" resultType="com.panzhihua.common.model.vos.grid.EventVO"
        parameterType="com.panzhihua.common.model.dtos.grid.PageEventDTO">
        SELECT <include refid="columns" />
        FROM event
        <where>
            event_status != 3
            <if test="pageEventDTO.eventDealStatus!=null">
            <choose>
                <!-- 待处理、待验证、已上报、已解决、草稿箱、已撤销 -->
                <when test="pageEventDTO.eventDealStatus==1">   <!--待处理-->
                    AND event_status =2 AND event_process_status = 1 AND process_type = 1
                </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>
           <if test="pageEventDTO.orderSn!=null">
                AND order_sn = #{pageEventDTO.orderSn}
            </if>
           <if test="pageEventDTO.eventCategory!=null">
                AND event_category = #{pageEventDTO.eventCategory}
            </if>
           <if test="pageEventDTO.gridMemberStreet!=null">
                AND grid_member_street = #{pageEventDTO.gridMemberStreet}
            </if>
           <if test="pageEventDTO.gridMemberCommunity!=null">
                AND grid_member_community = #{pageEventDTO.gridMemberCommunity}
            </if>
           <if test="pageEventDTO.gridId!=null">
                AND grid_id = #{pageEventDTO.gridId}
            </if>
           <if test="pageEventDTO.gridMemberId!=null">
                AND grid_member_id = #{pageEventDTO.gridMemberId}
            </if>
           <if test="pageEventDTO.gridMemberName!=null">
                AND grid_member_name = #{pageEventDTO.gridMemberName}
            </if>
           <if test="pageEventDTO.gridMemberTelephone!=null">
                AND grid_member_telephone = #{pageEventDTO.gridMemberTelephone}
            </if>
           <if test="pageEventDTO.eventTitle!=null">
                AND event_title = #{pageEventDTO.eventTitle}
            </if>
           <if test="pageEventDTO.propagandaType!=null">
                AND propaganda_type = #{pageEventDTO.propagandaType}
            </if>
           <if test="pageEventDTO.propagandaTimeBegin!=null">
                AND propaganda_time <![CDATA[>=]]> #{pageEventDTO.propagandaTimeBegin}
           </if>
           <if test="pageEventDTO.propagandaTimeEnd!=null">
                AND propaganda_time <![CDATA[<=]]> #{pageEventDTO.propagandaTimeEnd}
           </if>
           <if test="pageEventDTO.eventType!=null">
                AND event_type = #{pageEventDTO.eventType}
            </if>
           <if test="pageEventDTO.eventDes!=null">
                AND event_des = #{pageEventDTO.eventDes}
            </if>
           <if test="pageEventDTO.propagandaObject!=null">
                AND propaganda_object = #{pageEventDTO.propagandaObject}
            </if>
           <if test="pageEventDTO.propagandaNum!=null">
                AND propaganda_num = #{pageEventDTO.propagandaNum}
            </if>
           <if test="pageEventDTO.communityProcess!=null">
                AND community_process = #{pageEventDTO.communityProcess}
            </if>
           <if test="pageEventDTO.happenTimeBegin!=null">
                AND happen_time <![CDATA[>=]]> #{pageEventDTO.happenTimeBegin}
           </if>
           <if test="pageEventDTO.happenTimeEnd!=null">
                AND happen_time <![CDATA[<=]]> #{pageEventDTO.happenTimeEnd}
           </if>
           <if test="pageEventDTO.happentAddress!=null">
                AND happent_address = #{pageEventDTO.happentAddress}
            </if>
           <if test="pageEventDTO.happentLatLng!=null">
                AND happent_lat_lng = #{pageEventDTO.happentLatLng}
            </if>
           <if test="pageEventDTO.eventStatus!=null">
                AND event_status = #{pageEventDTO.eventStatus}
            </if>
           <if test="pageEventDTO.eventProcessStatus!=null">
                AND event_process_status = #{pageEventDTO.eventProcessStatus}
            </if>
           <if test="pageEventDTO.processType!=null">
                AND process_type = #{pageEventDTO.processType}
            </if>
           <if test="pageEventDTO.processUserId!=null">
                AND process_user_id = #{pageEventDTO.processUserId}
            </if>
           <if test="pageEventDTO.processUserName!=null">
                AND process_user_name = #{pageEventDTO.processUserName}
            </if>
           <if test="pageEventDTO.processDateBegin!=null">
                AND process_date <![CDATA[>=]]> #{pageEventDTO.processDateBegin}
           </if>
           <if test="pageEventDTO.processDateEnd!=null">
                AND process_date <![CDATA[<=]]> #{pageEventDTO.processDateEnd}
           </if>
           <if test="pageEventDTO.processDesc!=null">
                AND process_desc = #{pageEventDTO.processDesc}
            </if>
           <if test="pageEventDTO.eventResource!=null">
                AND event_resource = #{pageEventDTO.eventResource}
            </if>
           <if test="pageEventDTO.dangerLevel!=null">
                AND danger_level = #{pageEventDTO.dangerLevel}
            </if>
           <if test="pageEventDTO.redCard!=null">
                AND red_card = #{pageEventDTO.redCard}
            </if>
           <if test="pageEventDTO.yellowCard!=null">
                AND yellow_card = #{pageEventDTO.yellowCard}
            </if>
           <if test="pageEventDTO.invalid!=null">
                AND invalid = #{pageEventDTO.invalid}
            </if>
           <if test="pageEventDTO.major!=null">
                AND major = #{pageEventDTO.major}
            </if>
           <if test="pageEventDTO.deathsNumber!=null">
                AND deaths_number = #{pageEventDTO.deathsNumber}
            </if>
           <if test="pageEventDTO.injuriesNumber!=null">
                AND injuries_number = #{pageEventDTO.injuriesNumber}
            </if>
           <if test="pageEventDTO.difficult!=null">
                AND difficult = #{pageEventDTO.difficult}
            </if>
           <if test="pageEventDTO.urgent!=null">
                AND urgent = #{pageEventDTO.urgent}
            </if>
           <if test="pageEventDTO.urgentDell!=null">
                AND urgent_dell = #{pageEventDTO.urgentDell}
            </if>
           <if test="pageEventDTO.submitDateBegin!=null">
                AND submit_date <![CDATA[>=]]> #{pageEventDTO.submitDateBegin}
           </if>
           <if test="pageEventDTO.submitDateEnd!=null">
                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  <![CDATA[>=]]> #{pageEventDTO.createAtBegin}
           </if>
           <if test="pageEventDTO.createAtEnd!=null">
                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 <![CDATA[>=]]> #{pageEventDTO.updateAtBegin}
           </if>
           <if test="pageEventDTO.updateAtEnd!=null">
                AND update_at <![CDATA[<=]]> #{pageEventDTO.updateAtEnd}
           </if>
        </where>
        <if test="pageEventDTO.sortColumns!=null">
            ORDER BY ${pageEventDTO.sortColumns} ${pageEventDTO.sortType}
        </if>
    </select>
    <select id="findPublicityByPage" resultType="com.panzhihua.common.model.vos.grid.EventVO"
            parameterType="com.panzhihua.common.model.dtos.grid.PagePublicityEventDTO">
        SELECT <include refid="columns" />
        FROM event
        <where>
            event_status != 3 AND event_category = 2
            <if test="pagePublicityEventDTO.eventDealStatus!=null">
                <choose>
                    <!-- 待处理、待验证、已上报、已解决、草稿箱、已撤销 -->
                    <when test="pagePublicityEventDTO.eventDealStatus==1">   <!--已发布-->
                        AND event_status =2
                    </when>
                    <when test="pagePublicityEventDTO.eventDealStatus==5">   <!--草稿箱-->
                        AND event_status = 1
                    </when>
                    <when test="pagePublicityEventDTO.eventDealStatus==6">   <!--已撤销-->
                        AND event_status = 4
                    </when>
                    <otherwise>
                    </otherwise>
                </choose>
            </if>
            <if test="pagePublicityEventDTO.id!=null">
                AND id = #{pagePublicityEventDTO.id}
            </if>
            <if test="pagePublicityEventDTO.orderSn!=null">
                AND order_sn = #{pagePublicityEventDTO.orderSn}
            </if>
            <if test="pagePublicityEventDTO.eventCategory!=null">
                AND event_category = #{pagePublicityEventDTO.eventCategory}
            </if>
            <if test="pagePublicityEventDTO.gridMemberStreet!=null">
                AND grid_member_street = #{pagePublicityEventDTO.gridMemberStreet}
            </if>
            <if test="pagePublicityEventDTO.gridMemberCommunity!=null">
                AND grid_member_community = #{pagePublicityEventDTO.gridMemberCommunity}
            </if>
            <if test="pagePublicityEventDTO.gridId!=null">
                AND grid_id = #{pagePublicityEventDTO.gridId}
            </if>
            <if test="pagePublicityEventDTO.gridMemberId!=null">
                AND grid_member_id = #{pagePublicityEventDTO.gridMemberId}
            </if>
            <if test="pagePublicityEventDTO.gridMemberName!=null">
                AND grid_member_name = #{pagePublicityEventDTO.gridMemberName}
            </if>
            <if test="pagePublicityEventDTO.gridMemberTelephone!=null">
                AND grid_member_telephone = #{pagePublicityEventDTO.gridMemberTelephone}
            </if>
            <if test="pagePublicityEventDTO.eventTitle!=null">
                AND event_title = #{pagePublicityEventDTO.eventTitle}
            </if>
            <if test="pagePublicityEventDTO.propagandaType!=null">
                AND propaganda_type = #{pagePublicityEventDTO.propagandaType}
            </if>
            <if test="pagePublicityEventDTO.propagandaTimeBegin!=null">
                AND propaganda_time <![CDATA[>=]]> #{pagePublicityEventDTO.propagandaTimeBegin}
            </if>
            <if test="pagePublicityEventDTO.propagandaTimeEnd!=null">
                AND propaganda_time <![CDATA[<=]]> #{pagePublicityEventDTO.propagandaTimeEnd}
            </if>
            <if test="pagePublicityEventDTO.eventDes!=null">
                AND event_des = #{pagePublicityEventDTO.eventDes}
            </if>
            <if test="pagePublicityEventDTO.propagandaObject!=null">
                AND propaganda_object = #{pagePublicityEventDTO.propagandaObject}
            </if>
            <if test="pagePublicityEventDTO.propagandaNum!=null">
                AND propaganda_num = #{pagePublicityEventDTO.propagandaNum}
            </if>
            <if test="pagePublicityEventDTO.communityProcess!=null">
                AND community_process = #{pagePublicityEventDTO.communityProcess}
            </if>
            <if test="pagePublicityEventDTO.happenTimeBegin!=null">
                AND happen_time <![CDATA[>=]]> #{pagePublicityEventDTO.happenTimeBegin}
            </if>
            <if test="pagePublicityEventDTO.happenTimeEnd!=null">
                AND happen_time <![CDATA[<=]]> #{pagePublicityEventDTO.happenTimeEnd}
            </if>
            <if test="pagePublicityEventDTO.happentAddress!=null">
                AND happent_address = #{pagePublicityEventDTO.happentAddress}
            </if>
            <if test="pagePublicityEventDTO.happentLatLng!=null">
                AND happent_lat_lng = #{pagePublicityEventDTO.happentLatLng}
            </if>
            <if test="pagePublicityEventDTO.eventStatus!=null">
                AND event_status = #{pagePublicityEventDTO.eventStatus}
            </if>
            <if test="pagePublicityEventDTO.eventProcessStatus!=null">
                AND event_process_status = #{pagePublicityEventDTO.eventProcessStatus}
            </if>
            <if test="pagePublicityEventDTO.processType!=null">
                AND process_type = #{pagePublicityEventDTO.processType}
            </if>
            <if test="pagePublicityEventDTO.processUserId!=null">
                AND process_user_id = #{pagePublicityEventDTO.processUserId}
            </if>
            <if test="pagePublicityEventDTO.processUserName!=null">
                AND process_user_name = #{pagePublicityEventDTO.processUserName}
            </if>
            <if test="pagePublicityEventDTO.processDateBegin!=null">
                AND process_date <![CDATA[>=]]> #{pagePublicityEventDTO.processDateBegin}
            </if>
            <if test="pagePublicityEventDTO.processDateEnd!=null">
                AND process_date <![CDATA[<=]]> #{pagePublicityEventDTO.processDateEnd}
            </if>
            <if test="pagePublicityEventDTO.processDesc!=null">
                AND process_desc = #{pagePublicityEventDTO.processDesc}
            </if>
            <if test="pagePublicityEventDTO.eventResource!=null">
                AND event_resource = #{pagePublicityEventDTO.eventResource}
            </if>
            <if test="pagePublicityEventDTO.dangerLevel!=null">
                AND danger_level = #{pagePublicityEventDTO.dangerLevel}
            </if>
            <if test="pagePublicityEventDTO.redCard!=null">
                AND red_card = #{pagePublicityEventDTO.redCard}
            </if>
            <if test="pagePublicityEventDTO.yellowCard!=null">
                AND yellow_card = #{pagePublicityEventDTO.yellowCard}
            </if>
            <if test="pagePublicityEventDTO.invalid!=null">
                AND invalid = #{pagePublicityEventDTO.invalid}
            </if>
            <if test="pagePublicityEventDTO.major!=null">
                AND major = #{pagePublicityEventDTO.major}
            </if>
            <if test="pagePublicityEventDTO.deathsNumber!=null">
                AND deaths_number = #{pagePublicityEventDTO.deathsNumber}
            </if>
            <if test="pagePublicityEventDTO.injuriesNumber!=null">
                AND injuries_number = #{pagePublicityEventDTO.injuriesNumber}
            </if>
            <if test="pagePublicityEventDTO.difficult!=null">
                AND difficult = #{pagePublicityEventDTO.difficult}
            </if>
            <if test="pagePublicityEventDTO.urgent!=null">
                AND urgent = #{pagePublicityEventDTO.urgent}
            </if>
            <if test="pagePublicityEventDTO.urgentDell!=null">
                AND urgent_dell = #{pagePublicityEventDTO.urgentDell}
            </if>
            <if test="pagePublicityEventDTO.submitDateBegin!=null">
                AND submit_date <![CDATA[>=]]> #{pagePublicityEventDTO.submitDateBegin}
            </if>
            <if test="pagePublicityEventDTO.submitDateEnd!=null">
                AND submit_date <![CDATA[<=]]> #{pagePublicityEventDTO.submitDateEnd}
            </if>
            <if test="pagePublicityEventDTO.createBy!=null">
                AND create_by = #{pagePublicityEventDTO.createBy}
            </if>
            <if test="pagePublicityEventDTO.createAtBegin!=null">
                AND create_at  <![CDATA[>=]]> #{pagePublicityEventDTO.createAtBegin}
            </if>
            <if test="pagePublicityEventDTO.createAtEnd!=null">
                AND create_at <![CDATA[<=]]> #{pagePublicityEventDTO.createAtEnd}
            </if>
            <if test="pagePublicityEventDTO.updateBy!=null">
                AND update_by = #{pagePublicityEventDTO.updateBy}
            </if>
            <if test="pagePublicityEventDTO.updateAtBegin!=null">
                AND update_at <![CDATA[>=]]> #{pagePublicityEventDTO.updateAtBegin}
            </if>
            <if test="pagePublicityEventDTO.updateAtEnd!=null">
                AND update_at <![CDATA[<=]]> #{pagePublicityEventDTO.updateAtEnd}
            </if>
        </where>
        <if test="pagePublicityEventDTO.sortColumns!=null">
            ORDER BY ${pagePublicityEventDTO.sortColumns} ${pagePublicityEventDTO.sortType}
        </if>
    </select>

    <select id="getEventByGridId" resultType="com.panzhihua.common.model.vos.grid.ComMapGridEventVO">
        SELECT
            id,
            event_type AS type,
            event_title AS eventTitle,
            happent_address AS happentAddress,
            happent_lat_lng AS happentLatLng
        FROM
            `event`
        WHERE
            ( event_category = 1 OR event_category = 2 )
            AND event_process_status = 1
            AND event_status = 2
            AND grid_id = #{gridId}
            AND process_type = 1 UNION ALL
        SELECT
            id,
            IFNULL( NULL, 7 ) AS type,
            event_title AS eventTitle,
            happent_address AS happentAddress,
            happent_lat_lng AS happentLatLng
        FROM
            event_visiting_tasks
        WHERE
            event_status = 1
            AND dell_type = 1
            AND grid_id = #{gridId}
    </select>

</mapper>

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

New file
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >


<mapper namespace="com.panzhihua.service_grid.dao.EventResourceMapper">

     <resultMap id="baseResult" type="com.panzhihua.service_grid.model.dos.EventResourceDO">
        <result property="id" column="id"/>
        <result property="classification" column="classification"/>
        <result property="refId" column="ref_id"/>
        <result property="type" column="type"/>
        <result property="resourceName" column="resource_name"/>
        <result property="resourceSize" column="resource_size"/>
        <result property="url" column="url"/>
        <result property="createBy" column="create_by"/>
        <result property="createAt" column="create_at"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,classification,ref_id,type,resource_name,resource_size,url,create_by,create_at
    ]]>
    </sql>


    <select id="findByPage" resultType="com.panzhihua.common.model.vos.grid.EventResourceVO"
        parameterType="com.panzhihua.common.model.dtos.grid.PageEventResourceDTO">
        SELECT <include refid="columns" />
        FROM event_resource
        <where>
           <if test="pageEventResourceDTO.classification!=null">
                AND classification = #{pageEventResourceDTO.classification}
            </if>
           <if test="pageEventResourceDTO.id!=null">
                AND id = #{pageEventResourceDTO.id}
            </if>
            <if test="pageEventResourceDTO.refId!=null">
                AND ref_id = #{pageEventResourceDTO.refId}
            </if>
           <if test="pageEventResourceDTO.type!=null">
                AND type = #{pageEventResourceDTO.type}
            </if>
           <if test="pageEventResourceDTO.resourceName!=null">
                AND resource_name = #{pageEventResourceDTO.resourceName}
            </if>
           <if test="pageEventResourceDTO.resourceSize!=null">
                AND resource_size = #{pageEventResourceDTO.resourceSize}
            </if>
           <if test="pageEventResourceDTO.url!=null">
                AND url = #{pageEventResourceDTO.url}
            </if>
           <if test="pageEventResourceDTO.createBy!=null">
                AND create_by = #{pageEventResourceDTO.createBy}
            </if>
           <if test="pageEventResourceDTO.createAtBegin!=null">
                AND create_at &gt;= #{pageEventResourceDTO.createAtBegin}
           </if>
           <if test="pageEventResourceDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageEventResourceDTO.createAtEnd}
           </if>
        </where>
        <if test="pageEventResourceDTO.sortColumns!=null">
            ORDER BY ${pageEventResourceDTO.sortColumns} ${pageEventResourceDTO.sortType}
        </if>
    </select>

</mapper>

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

New file
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >


<mapper namespace="com.panzhihua.service_grid.dao.EventTransferRecordMapper">

     <resultMap id="baseResult" type="com.panzhihua.service_grid.model.dos.EventTransferRecordDO">
        <result property="id" column="id"/>
        <result property="eventId" column="event_id"/>
        <result property="fromType" column="from_type"/>
        <result property="fromId" column="from_id"/>
        <result property="fromName" column="from_name"/>
        <result property="toType" column="to_type"/>
        <result property="toId" column="to_id"/>
        <result property="toName" column="to_name"/>
        <result property="processResult" column="process_result"/>
        <result property="processDate" column="process_date"/>
        <result property="createAt" column="create_at"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,event_id,from_type,from_id,from_name,to_type,to_id,to_name,process_result,process_date,create_at
    ]]>
    </sql>


    <select id="findByPage" resultType="com.panzhihua.common.model.vos.grid.EventTransferRecordVO"
        parameterType="com.panzhihua.common.model.dtos.grid.PageEventTransferRecordDTO">
        SELECT <include refid="columns" />
        FROM event_transfer_record
        <where>
           <if test="pageEventTransferRecordDTO.id!=null">
                AND id = #{pageEventTransferRecordDTO.id}
            </if>
           <if test="pageEventTransferRecordDTO.eventId!=null">
                AND event_id = #{pageEventTransferRecordDTO.eventId}
            </if>
           <if test="pageEventTransferRecordDTO.fromType!=null">
                AND from_type = #{pageEventTransferRecordDTO.fromType}
            </if>
           <if test="pageEventTransferRecordDTO.from!=null">
                AND from_id = #{pageEventTransferRecordDTO.fromId}
            </if>
           <if test="pageEventTransferRecordDTO.fromName!=null">
                AND from_name = #{pageEventTransferRecordDTO.fromName}
            </if>
           <if test="pageEventTransferRecordDTO.toType!=null">
                AND to_type = #{pageEventTransferRecordDTO.toType}
            </if>
           <if test="pageEventTransferRecordDTO.to!=null">
                AND to_id = #{pageEventTransferRecordDTO.toId}
            </if>
           <if test="pageEventTransferRecordDTO.toName!=null">
                AND to_name = #{pageEventTransferRecordDTO.toName}
            </if>
           <if test="pageEventTransferRecordDTO.processResult!=null">
                AND process_result = #{pageEventTransferRecordDTO.processResult}
            </if>
           <if test="pageEventTransferRecordDTO.processDateBegin!=null">
                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 &gt;= #{pageEventTransferRecordDTO.createAtBegin}
           </if>
           <if test="pageEventTransferRecordDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageEventTransferRecordDTO.createAtEnd}
           </if>
        </where>
        <if test="pageEventTransferRecordDTO.sortColumns!=null">
            ORDER BY ${pageEventTransferRecordDTO.sortColumns} ${pageEventTransferRecordDTO.sortType}
        </if>
    </select>

</mapper>

Diff truncated after the above file
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventVisitingTasksMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/test/java/com/panzhihua/service_grid/dao/ApplicationAppReleaseMapperTest.java
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/config/SwaggerConfig.java