Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-28 098b507166a2b23f0256d5c4f097e7f05f11e9be

Merge remote-tracking branch 'origin/test' into test

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java

New file
@@ -0,0 +1,59 @@
package com.panzhihua.applets.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

/**
 * @auther txb
 * @create 2021-07-23 14:38:38
 * @describe 社区》安全工作》巡查记录前端控制器
 */
@Slf4j
@Api(tags = {"社区管理/安全工作"})
@RestController
@RequestMapping("/patrolRecord")
public class ComSwPatrolRecordApi extends BaseController {

    @Resource
    private CommunityService communityService;

    /**
     * 分页查询巡查记录
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 分页集合
     */
    @ApiOperation(value = "分页查询巡查记录")
    @PostMapping("/pagePatrolRecord")
    public R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
        Long communityId = this.getCommunityId();
        comSwPatrolRecordPageDTO.setCommunityId(communityId);
        return communityService.pagePatrolRecord(comSwPatrolRecordPageDTO);
    }

    /**
     * 新增巡查记录
     * @param comSwPatrolRecordAddDTO 新增参数
     * @return 新增结果
     */
    @ApiOperation(value = "新增巡查记录")
    @PostMapping("/addPatrolRecord")
    public R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO){
        Long communityId = this.getCommunityId();
        comSwPatrolRecordAddDTO.setCommunityId(communityId);
        return communityService.addPatrolRecord(comSwPatrolRecordAddDTO);
    }

}


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcApiConstants.java

@@ -58,6 +58,10 @@
     */
    public static final String GRID_GET_EVENT_INFO_AREA_ID_URL = "http://171.217.92.33:53303/area/getAreaGridTreeByAreaId";
    /**
     * 通过AREAID获取辖区网格数据列表
     */
    public static final String GRID_GET_GRID_DATA_AREA_ID_URL = "http://171.217.92.33:53303/gridDefined/getGridInfoByAreaId";
    /**
     * 获取所有或者根据姓名和工号查询,分页
     */
    public static final String GRID_GET_GETALL_SEARCH_PAGE_URL = "http://171.217.92.33:53303/gridOperator/getAllOrSearchByPage?areaId=jhRxqEQp&limit=200&page=1";

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

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

import lombok.Getter;

/**
 * 婚姻状况
 * 
 * @author huanghongfa
 */
@Getter
public enum SafeWordDangerLevelEnum
{
    RED(1, "红色预警"),
    ORANGE(2, "橙色预警"),
    YELLOW(3, "黄色预警"),
    BLUE(4, "蓝色预警");

    private final Integer code;
    private final String name;

    SafeWordDangerLevelEnum(Integer code, String name)
    {
        this.code = code;
        this.name = name;
    }

    public static int getCodeByName(String name) {
        for (SafeWordDangerLevelEnum item : SafeWordDangerLevelEnum.values()) {
            if (item.name.equals(name)) {
                return item.getCode();
            }
        }
        return -1;
    }

    public static String getCnDescByName(Integer code) {
        for (SafeWordDangerLevelEnum item : SafeWordDangerLevelEnum.values()) {
            if (item.code.equals(code)) {
                return item.getName();
            }
        }
        return "其他";
    }

}

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

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

import lombok.Getter;

/**
 * 婚姻状况
 * 
 * @author huanghongfa
 */
@Getter
public enum SafeWordStatusEnum
{
    DCK(1, "待查看"),
    DCL(2, "待处理"),
    YCL(3, "已处理"),
    YZG(4, "已整改");

    private final Integer code;
    private final String name;

    SafeWordStatusEnum(Integer code, String name)
    {
        this.code = code;
        this.name = name;
    }

    public static int getCodeByName(String name) {
        for (SafeWordStatusEnum item : SafeWordStatusEnum.values()) {
            if (item.name.equals(name)) {
                return item.getCode();
            }
        }
        return -1;
    }

    public static String getCnDescByName(Integer code) {
        for (SafeWordStatusEnum item : SafeWordStatusEnum.values()) {
            if (item.code.equals(code)) {
                return item.getName();
            }
        }
        return "其他";
    }

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java

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

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-07-23 14:38:38
 * @describe 社区》安全工作》巡查记录实体类
 */

@Data
@ApiModel("新增巡查记录DTO")
public class ComSwPatrolRecordAddDTO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 社区id
     */
    @ApiModelProperty("社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;

    /**
     * 巡查时间
     */
    @ApiModelProperty("巡查时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date PatrolTime;

    /**
     * 天气
     */
    @ApiModelProperty("天气")
    private String weather;

    /**
     * 温度
     */
    @ApiModelProperty("温度")
    private String temperature;

    /**
     * 风
     */
    @ApiModelProperty("风")
    private String wind;

    /**
    * (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
    */
    @ApiModelProperty("巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)，多条以逗号隔开")
    private String patrolType;

    /**
    * 巡查领导
    */
    @ApiModelProperty("巡查领导")
    private String patrolLeader;

    /**
    * 巡查人员
    */
    @ApiModelProperty("巡查人员")
    private String patrolPerson;

    /**
     * 巡查地址
     */
    @ApiModelProperty("巡查地址")
    private String address;

    /**
    * 巡查记录
    */
    @ApiModelProperty("巡查记录")
    private String recordContent;

    /**
    * 发现记录
    */
    @ApiModelProperty("发现记录")
    private String findRecord;

    /**
    * 记录照片
    */
    @ApiModelProperty("记录照片")
    private String recordPhoto;

    /**
    * 备注
    */
    @ApiModelProperty("备注")
    private String remark;

    /**
    * 接班领导
    */
    @ApiModelProperty("接班领导")
    private String successionLeader;

    /**
    * 接班人员
    */
    @ApiModelProperty("接班人员")
    private String successionPerson;

    /**
    * 接班时间
    */
    @ApiModelProperty("接班时间")
    private Date successionTime;

    /**
    * 是否存在隐患（1是 、0否）
    */
    @ApiModelProperty("是否存在隐患（1是 、0否）")
    private Integer isHiddenDanger;

    /**
    * 隐患名称
    */
    @ApiModelProperty("隐患名称")
    private String dagerName;

    /**
    * 排查时间
    */
    @ApiModelProperty("排查时间")
    private Date checkTime;

    /**
    * 主体部门、单位或个人全称
    */
    @ApiModelProperty("主体部门、单位或个人全称")
    private String unitName;

    /**
    * 隐患简述
    */
    @ApiModelProperty("隐患简述")
    private String dagerDescription;

    /**
    * 是否立即整改（1是 、0否）
    */
    @ApiModelProperty("是否立即整改（1是 、0否）")
    private Integer isRectifyImmediately;

    /**
    * 采取措施
    */
    @ApiModelProperty("采取措施")
    private String takeSteps;

    /**
    * 采取措施照片
    */
    @ApiModelProperty("采取措施照片")
    private String stepsPhoto;

    /**
    * 整改人员
    */
    @ApiModelProperty("整改人员")
    private String rectifyPerson;


    /**
     * 创建人
     */
    @ApiModelProperty("创建人")
    private Long createBy;

    /**
     * 巡查类型
     */
    public interface patrolType{
        int huo = 1;
        int xun = 2;
        int yi = 3;
    }

    /**
     * 是否
     */
    public interface isOk{
        int yes = 1;
        int no = 0;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordPageDTO.java

File was renamed from springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordDTO.java
@@ -5,6 +5,7 @@
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
import com.panzhihua.common.model.helper.encrypt.EncryptQueryClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -12,10 +13,11 @@
import java.util.Date;

/**
 *  巡查记录DTO
 *  分页查询巡查记录DTO
 */
@Data
public class ComSwPatrolRecordDTO implements Serializable {
@ApiModel("分页查询巡查记录DTO")
public class ComSwPatrolRecordPageDTO implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
@@ -47,8 +49,8 @@
    /**
     * (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
     */
    @ApiModelProperty("巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)")
    private Integer patrolType;
    @ApiModelProperty("巡查类型(1.防火巡查2.防汛巡查3.防疫巡查),多条以逗号隔开")
    private String patrolType;

    /**
     * 巡查人员

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java

@@ -72,8 +72,8 @@
    /**
    * (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
    */
    @ApiModelProperty("巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)")
    private Integer patrolType;
    @ApiModelProperty("巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)，多条以逗号隔开")
    private String patrolType;

    /**
    * 巡查领导

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -42,6 +42,7 @@
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;

@@ -3730,9 +3731,17 @@

    /**
     * 分页查询巡查记录
     * @param comSwPatrolRecordDTO 查询参数
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 分页集合
     */
    @PostMapping("/patrolRecord/page")
    R pagePatrolRecord(@RequestBody ComSwPatrolRecordDTO comSwPatrolRecordDTO);
    R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);

    /**
     * 新增巡查记录
     * @param comSwPatrolRecordAddDTO 新增参数
     * @return 新增结果
     */
    @PostMapping("/patrolRecord/addPatrolRecord")
    R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSwPatrolRecordApi.java

@@ -1,12 +1,14 @@
package com.panzhihua.community_backstage.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,15 +32,28 @@

    /**
     * 分页查询巡查记录
     * @param comSwPatrolRecordDTO 查询参数
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 分页集合
     */
    @ApiOperation(value = "分页查询巡查记录")
    @PostMapping("/pagePatrolRecord")
    public R pagePatrolRecord(@RequestBody ComSwPatrolRecordDTO comSwPatrolRecordDTO){
    public R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
        Long communityId = this.getCommunityId();
        comSwPatrolRecordDTO.setCommunityId(communityId);
        return communityService.pagePatrolRecord(comSwPatrolRecordDTO);
        comSwPatrolRecordPageDTO.setCommunityId(communityId);
        return communityService.pagePatrolRecord(comSwPatrolRecordPageDTO);
    }

    /**
     * 新增巡查记录
     * @param comSwPatrolRecordAddDTO 新增参数
     * @return 新增结果
     */
    @ApiOperation(value = "新增巡查记录")
    @PostMapping("/addPatrolRecord")
    public R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO){
        Long communityId = this.getCommunityId();
        comSwPatrolRecordAddDTO.setCommunityId(communityId);
        return communityService.addPatrolRecord(comSwPatrolRecordAddDTO);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java

@@ -881,14 +881,14 @@
        return R.ok();
    }

    @ApiOperation(value = "实有资产Excel")
    @ApiOperation(value = "社区资产导出数据")
    @PostMapping("/assets/export")
    public R exportRealAssets(@RequestBody ExportRealAssetsExcelDTO exportRealAssetsExcelDTO) {
        exportRealAssetsExcelDTO.setCommunityId(this.getCommunityId());
        String url = excelUrl;
//        String uuid = UUID.randomUUID().toString().replace("-", "");
//        String name = uuid + ".xlsx";
        String name = "实有资产导出数据.xlsx";
        String name = "社区资产导出数据.xlsx";
        String ftpUrl = "/mnt/data/web/excel/";
//        用户搜索了就下载搜索的用户否则下载所有用户
        R r = communityService.exportRealAssets(exportRealAssetsExcelDTO);
@@ -906,7 +906,7 @@
                    InputStream inputStream = null;
                    try {
                        excelWriter = EasyExcel.write(fileName, ComMngRealAssetsExcelVO.class).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).registerWriteHandler(new CustomSheetWriteHandler()).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet("实有单位导出").build();
                        WriteSheet writeSheet = EasyExcel.writerSheet("社区资产导出").build();
                        excelWriter.write(eexcelUserDTOS, writeSheet);
                        excelWriter.finish();
                        File file = new File(fileName);

 springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java

@@ -114,7 +114,26 @@
    }

    /**
     * description 获取指定区域网格列表
     * description 获取指定区域网格列表,树形结构。不包括具体的网格数据。
     *
     * @param areaId 区域ID
     * @return String 事件信息
     * @author manailin
     * @date 2021/6/10 17:00
     */
    @ApiOperation(value = "获取指定区域网格树形列表，不包括具体的网格数据")
    @GetMapping("lc/grid/tree")
    public R getGridTreeByAreaId(String areaId) {
        try {
            return R.ok(lcApiService.getGridTreeByAreaId(areaId));
        } catch (Exception e) {
            log.error("获取指定区域网格列表出现错误：{}", e.getMessage());
        }
        return R.ok(Collections.emptyList());
    }

    /**
     * description 获取指定区域网格数据列表
     *
     * @param areaId 区域ID
     * @return String 事件信息
@@ -123,16 +142,14 @@
     */
    @ApiOperation(value = "获取指定区域网格列表")
    @GetMapping("lc/grid/list")
    public R getGridListByAreaId(String areaId) {
    public R getGridDataListByAreaId(String areaId) {
        try {
            return R.ok(lcApiService.getGridListByAreaId(areaId));
            return R.ok(lcApiService.getGridDataListByAreaId(areaId));
        } catch (Exception e) {
            log.error("获取指定区域网格列表出现错误：{}", e.getMessage());
        }
        return R.ok(Collections.emptyList());
    }


    /**
     * description 流动人口 走访详情
     *

 springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java

@@ -77,9 +77,18 @@
     * @author manailin
     * @date 2021/6/10 17:00
     */
    List<LcGridData> getGridListByAreaId(String areaId);
    List<LcGridData> getGridTreeByAreaId(String areaId);

    /**
     * description 获取指定区域网格列表,直接返回网格列表
     *
     * @param areaId 区域ID
     * @return String 事件信息
     * @author manailin
     * @date 2021/6/10 17:00
     */
    List<LcGridData> getGridDataListByAreaId(String areaId);
    /**
     * description 获取所有或者根据姓名和工号查询,分页
     *
     * @param areaId 区域ID

 springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java

@@ -150,10 +150,20 @@
    }

    @Override
    public List<LcGridData> getGridListByAreaId(String areaId) {
    public List<LcGridData> getGridTreeByAreaId(String areaId) {
        HttpRequest request = HttpUtil.createPost(LcApiConstants.GRID_GET_EVENT_INFO_AREA_ID_URL);
        request.auth(getAuthToken());
        request.form("areaId", areaId);
        request.form("level", 4);
        HttpResponse result = request.execute();
        return JSONArray.parseArray(result.body(), LcGridData.class);
    }

    @Override
    public List<LcGridData> getGridDataListByAreaId(String areaId) {
        HttpRequest request = HttpUtil.createPost(LcApiConstants.GRID_GET_GRID_DATA_AREA_ID_URL);
        request.auth(getAuthToken());
        request.form("areaId", areaId);
        HttpResponse result = request.execute();
        return JSONArray.parseArray(result.body(), LcGridData.class);
    }

 springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImplTest.java

@@ -184,7 +184,17 @@
    @Test
    void getGridListByAreaId() {
        //jhRxqEQp 代表西区
        List<LcGridData> list = lcApiService.getGridListByAreaId("jhRxqEQp");
        List<LcGridData> list = lcApiService.getGridTreeByAreaId("jhRxqEQp");
        String pretty = JSONArray.toJSONString(list, SerializerFeature.PrettyFormat, SerializerFeature.WriteMapNullValue,
                SerializerFeature.WriteDateUseDateFormat);
        log.info(pretty);
    }


    @Test
    void getGridDataListByAreaId() {
        //jhRxqEQp 代表西区
        List<LcGridData> list = lcApiService.getGridDataListByAreaId("2Fxq97CC");
        String pretty = JSONArray.toJSONString(list, SerializerFeature.PrettyFormat, SerializerFeature.WriteMapNullValue,
                SerializerFeature.WriteDateUseDateFormat);
        log.info(pretty);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java

@@ -1,10 +1,11 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComSwPatrolRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,16 +24,27 @@
public class ComSwPatrolRecordApi {

    @Resource
    private ComSwPatrolRecordService comMngPopulationService;
    private ComSwPatrolRecordService comSwPatrolRecordService;

    /**
     * 分页查询巡查记录
     * @param comSwPatrolRecordDTO 查询参数
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 分页集合
     */
    @PostMapping("/page")
    public R pagePatrolRecord(@RequestBody ComSwPatrolRecordDTO comSwPatrolRecordDTO){
        return comMngPopulationService.pagePatrolRecord(comSwPatrolRecordDTO);
    public R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
        return comSwPatrolRecordService.pagePatrolRecord(comSwPatrolRecordPageDTO);
    }

    /**
     * 新增巡查记录
     * @param comSwPatrolRecordAddDTO 新增参数
     * @return 新增结果
     */
    @PostMapping("/addPatrolRecord")
    @Transactional(rollbackFor = Exception.class)
    public R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO){
        return comSwPatrolRecordService.addPatrolRecord(comSwPatrolRecordAddDTO);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwDangerReportDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComSwDangerReportDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @auther txb
 * @create 2021-07-27 14:31:04
 * @describe mapper类
 */
@Mapper
public interface ComSwDangerReportDAO extends BaseMapper<ComSwDangerReportDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwPatrolRecordDAO.java

@@ -3,9 +3,7 @@
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.community.ComMngPopulationDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordDTO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
import com.panzhihua.service_community.model.dos.ComSwPatrolRecordDO;
import org.apache.ibatis.annotations.Mapper;
@@ -20,47 +18,10 @@
@Mapper
public interface ComSwPatrolRecordDAO extends BaseMapper<ComSwPatrolRecordDO> {

    @Select("<script> " +
            "SELECT " +
            "cspr.id, " +
            "cspr.community_id AS communityId, " +
            "cspr.patrol_time AS patrolTime, " +
            "cspr.weather," +
            "cspr.temperature," +
            "cspr.wind," +
            "cspr.patrol_type AS patrolType, " +
            "cspr.patrol_person AS patrolPerson, " +
            "cspr.address, " +
            "cspr.record_content AS recordContent, " +
            "cspr.find_record AS findRecord, " +
            "cspr.record_photo AS recordPhoto, " +
            "cspr.remark, " +
            "cspr.succession_person AS successionPerson, " +
            "cspr.succession_time AS successionTime, " +
            "cspr.create_at AS createAt, " +
            "cspr.create_by AS createBy, " +
            "csprr.report_id AS reportId " +
            "FROM " +
            "com_sw_patrol_record as cspr " +
            "left join com_sw_patrol_record_report as csprr on csprr.patrol_record_id = cspr.id " +
            "<where>" +
            "<if test='comSwPatrolRecordDTO.communityId != null and comSwPatrolRecordDTO.communityId != &quot;&quot;'>" +
            "AND cspr.community_id = #{comSwPatrolRecordDTO.communityId} " +
            " </if> " +
            "<if test='comSwPatrolRecordDTO.patrolPerson != null and comSwPatrolRecordDTO.patrolPerson != &quot;&quot;'>" +
            "AND cspr.patrol_person LIKE concat('%',#{comSwPatrolRecordDTO.patrolPerson},'%') " +
            " </if> " +
            "<if test='comSwPatrolRecordDTO.patrolType != null and comSwPatrolRecordDTO.patrolType != &quot;&quot;'>" +
            "AND cspr.patrol_type = #{comSwPatrolRecordDTO.patrolType} " +
            " </if> " +
            "<if test='comSwPatrolRecordDTO.patrolAtBegin != null '>" +
            "AND cspr.patrol_time <![CDATA[ >= ]]> #{comSwPatrolRecordDTO.patrolTime}  " +
            " </if> " +
            "<if test='comSwPatrolRecordDTO.patrolAtEnd != null '>" +
            "AND cspr.patrol_time <![CDATA[ <= ]]> #{comSwPatrolRecordDTO.patrolTime}  " +
            " </if> " +
            " </where>" +
            " order by cspr.create_at desc" +
            "</script>")
    IPage<ComSwPatrolRecordVO> pagePatrolRecord(Page page, @Param("comSwPatrolRecordDTO") ComSwPatrolRecordDTO comSwPatrolRecordDTO);
    /**
     * 分页查询巡查记录
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 分页集合
     */
    IPage<ComSwPatrolRecordVO> pagePatrolRecord(Page page, @Param("comSwPatrolRecordDTO") ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwPatrolRecordReportDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComSwPatrolRecordReportDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @auther txb
 * @create 2021-07-27 15:08:24
 * @describe 社区》安全工作》巡查记录-报告关系表mapper类
 */
@Mapper
public interface ComSwPatrolRecordReportDAO extends BaseMapper<ComSwPatrolRecordReportDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwSafetyWorkRecordDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComSwSafetyWorkRecordDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @auther txb
 * @create 2021-07-27 14:30:41
 * @describe mapper类
 */
@Mapper
public interface ComSwSafetyWorkRecordDAO extends BaseMapper<ComSwSafetyWorkRecordDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwDangerReportDO.java

New file
@@ -0,0 +1,162 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-07-27 14:31:04
 * @describe 实体类
 */

@Data
@TableName("com_sw_danger_report")
public class ComSwDangerReportDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
    * 主键id
    */
    @TableId(type = IdType.INPUT)
    private Long id;

    /**
    * 隐患编号
    */
    private Integer dangerNo;

    /**
    * 隐患名称
    */
    private String dangerName;

    /**
    * 隐患类型（1.火灾隐患 2.汛情隐患 3.疫情隐患）
    */
    private String dangerType;

    /**
    * 状态（1.待查看 2.待处理 3.待整改 4.已整改）
    */
    private String status;

    /**
    * 风险等级（1.红色预警 2.橙色预警 3.黄色预警 4.蓝色预警）
    */
    private String dangerLevel;

    /**
    * 排查时间
    */
    private Date checkTime;

    /**
    * 主体部门、单位或个人全称
    */
    private String unitName;

    /**
    * 隐患简述
    */
    private String dagerDescription;

    /**
    * 是否立即整改（1是 、0否）
    */
    private Integer isRectifyImmediately;

    /**
    * 采取措施
    */
    private String takeSteps;

    /**
    * 采取措施照片
    */
    private String stepsPhoto;

    /**
    * 整改人员
    */
    private String rectifyPerson;

    /**
    * 整改时间
    */
    private Date rectifyTime;

    /**
    * 社区处理建议
    */
    private String communitySuggestion;

    /**
    * 街道安全人员管理建议
    */
    private String streetSuggestion;

    /**
    * 承办记录
    */
    private String undertakeRecord;

    /**
    * 备注
    */
    private String remark;

    /**
    * 创建时间
    */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
    * 创建人
    */
    private Long createBy;

    /**
    * 更新时间
    */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Date updateAt;

    /**
    * 修改人
    */
    private Long updateBy;

@Override
public String toString() {
        return "ComSwDangerReportDO{" +
                "id=" + id +
                ", dangerNo=" + dangerNo +
                ", dangerName=" + dangerName +
                ", dangerType=" + dangerType +
                ", status=" + status +
                ", dangerLevel=" + dangerLevel +
                ", checkTime=" + checkTime +
                ", unitName=" + unitName +
                ", dagerDescription=" + dagerDescription +
                ", isRectifyImmediately=" + isRectifyImmediately +
                ", takeSteps=" + takeSteps +
                ", stepsPhoto=" + stepsPhoto +
                ", rectifyPerson=" + rectifyPerson +
                ", rectifyTime=" + rectifyTime +
                ", communitySuggestion=" + communitySuggestion +
                ", streetSuggestion=" + streetSuggestion +
                ", undertakeRecord=" + undertakeRecord +
                ", remark=" + remark +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
        }
        }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwPatrolRecordDO.java

@@ -51,9 +51,9 @@
    private String wind;

    /**
    * (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
    * 巡查类型(1.防火巡查2.防汛巡查3.防疫巡查),多条以逗号隔开
    */
    private Integer patrolType;
    private String patrolType;

    /**
    * 巡查领导
@@ -110,45 +110,6 @@
    */
    private Integer isHiddenDanger;

    /**
    * 隐患名称
    */
    private String dagerName;

    /**
    * 排查时间
    */
    private Date checkTime;

    /**
    * 主体部门、单位或个人全称
    */
    private String unitName;

    /**
    * 隐患简述
    */
    private String dagerDescription;

    /**
    * 是否立即整改（1是 、0否）
    */
    private Integer isRectifyImmediately;

    /**
    * 采取措施
    */
    private String takeSteps;

    /**
    * 采取措施照片
    */
    private String stepsPhoto;

    /**
    * 整改人员
    */
    private String rectifyPerson;

    /**
    * 创建时间
@@ -164,7 +125,7 @@
    /**
    * 更新时间
    */
    @TableField(fill = FieldFill.UPDATE)
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Date updateAt;

    /**
@@ -192,14 +153,6 @@
                ", successionPerson=" + successionPerson +
                ", successionTime=" + successionTime +
                ", isHiddenDanger=" + isHiddenDanger +
                ", dagerName=" + dagerName +
                ", checkTime=" + checkTime +
                ", unitName=" + unitName +
                ", dagerDescription=" + dagerDescription +
                ", isRectifyImmediately=" + isRectifyImmediately +
                ", takeSteps=" + takeSteps +
                ", stepsPhoto=" + stepsPhoto +
                ", rectifyPerson=" + rectifyPerson +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwPatrolRecordReportDO.java

New file
@@ -0,0 +1,72 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-07-27 15:08:24
 * @describe 社区》安全工作》巡查记录-报告关系表实体类
 */

@Data
@TableName("com_sw_patrol_record_report")
public class ComSwPatrolRecordReportDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
    * id
    */
    @TableId(type = IdType.INPUT)
    private Long id;

    /**
    * 巡查记录id
    */
    private Long patrolRecordId;

    /**
    * 报告id
    */
    private Long reportId;

    /**
    * 创建时间
    */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
    * 创建人
    */
    private Long createBy;

    /**
    * 更新时间
    */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Date updateAt;

    /**
    * 修改人
    */
    private Long updateBy;

@Override
public String toString() {
        return "ComSwPatrolRecordReportDO{" +
                "id=" + id +
                ", patrolRecordId=" + patrolRecordId +
                ", reportId=" + reportId +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
        }
        }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwSafetyWorkRecordDO.java

New file
@@ -0,0 +1,66 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-07-27 14:30:41
 * @describe 实体类
 */

@Data
@TableName("com_sw_safety_work_record")
public class ComSwSafetyWorkRecordDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
    * 主键id
    */
    @TableId(type = IdType.INPUT)
    private Long id;

    /**
    * 备注
    */
    private String remark;

    /**
    * 创建时间
    */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
    * 创建人
    */
    private Long createBy;

    /**
    * 更新时间
    */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Date updateAt;

    /**
    * 修改人
    */
    private Long updateBy;

@Override
public String toString() {
        return "ComSwSafetyWorkRecordDO{" +
                "id=" + id +
                ", remark=" + remark +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
        }
        }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSwDangerReportService.java

New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComSwDangerReportDO;

/**
 * @auther txb
 * @create 2021-07-27 14:31:04
 * @describe 服务类
 */
public interface ComSwDangerReportService extends IService<ComSwDangerReportDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSwPatrolRecordService.java

@@ -1,10 +1,12 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComSwPatrolRecordDO;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * @auther txb
@@ -15,8 +17,15 @@

    /**
     * 分页查询巡查记录
     * @param comSwPatrolRecordDTO 查询参数
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 分页集合
     */
    R pagePatrolRecord(ComSwPatrolRecordDTO comSwPatrolRecordDTO);
    R pagePatrolRecord(ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);

    /**
     * 新增巡查记录
     * @param comSwPatrolRecordAddDTO 新增参数
     * @return 新增结果
     */
    R addPatrolRecord(ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSwSafetyWorkRecordService.java

New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComSwSafetyWorkRecordDO;

/**
 * @auther txb
 * @create 2021-07-27 14:30:41
 * @describe 服务类
 */
public interface ComSwSafetyWorkRecordService extends IService<ComSwSafetyWorkRecordDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java

New file
@@ -0,0 +1,19 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComSwDangerReportDAO;
import com.panzhihua.service_community.model.dos.ComSwDangerReportDO;
import com.panzhihua.service_community.service.ComSwDangerReportService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * @auther txb
 * @create 2021-07-27 14:31:04
 * @describe 服务实现类
 */
@Slf4j
@Service
public class ComSwDangerReportServiceImpl extends ServiceImpl<ComSwDangerReportDAO, ComSwDangerReportDO> implements ComSwDangerReportService {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java

@@ -3,16 +3,27 @@
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.community.ComSwPatrolRecordDTO;
import com.panzhihua.common.enums.SafeWordStatusEnum;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.service_community.dao.ComSwDangerReportDAO;
import com.panzhihua.service_community.dao.ComSwPatrolRecordDAO;
import com.panzhihua.service_community.dao.ComSwPatrolRecordReportDAO;
import com.panzhihua.service_community.dao.ComSwSafetyWorkRecordDAO;
import com.panzhihua.service_community.model.dos.ComSwDangerReportDO;
import com.panzhihua.service_community.model.dos.ComSwPatrolRecordDO;
import com.panzhihua.service_community.model.dos.ComSwPatrolRecordReportDO;
import com.panzhihua.service_community.model.dos.ComSwSafetyWorkRecordDO;
import com.panzhihua.service_community.service.ComSwPatrolRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;

/**
 * @auther txb
@@ -26,11 +37,20 @@
    @Resource
    private ComSwPatrolRecordDAO comSwPatrolRecordDAO;

    @Resource
    private ComSwSafetyWorkRecordDAO comSwSafetyWorkRecordDAO;

    @Resource
    private ComSwDangerReportDAO comSwDangerReportDAO;

    @Resource
    private ComSwPatrolRecordReportDAO comSwPatrolRecordReportDAO;

    @Override
    public R pagePatrolRecord(ComSwPatrolRecordDTO comSwPatrolRecordDTO) {
    public R pagePatrolRecord(ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
        Page page = new Page<>();
        Long pageNum = comSwPatrolRecordDTO.getPageNum();
        Long pageSize = comSwPatrolRecordDTO.getPageSize();
        Long pageNum = comSwPatrolRecordPageDTO.getPageNum();
        Long pageSize = comSwPatrolRecordPageDTO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1L;
        }
@@ -40,7 +60,46 @@
        page.setSize(pageSize);
        page.setCurrent(pageNum);

        IPage<ComSwPatrolRecordVO> iPage = comSwPatrolRecordDAO.pagePatrolRecord(page, comSwPatrolRecordDTO);
        IPage<ComSwPatrolRecordVO> iPage = comSwPatrolRecordDAO.pagePatrolRecord(page, comSwPatrolRecordPageDTO);
        return R.ok(iPage);
    }

    @Override
    public R addPatrolRecord(ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO) {
        //巡查记录
        ComSwPatrolRecordDO comSwPatrolRecordDO = new ComSwPatrolRecordDO();
        BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwPatrolRecordDO);
        Long patrolRecordId = Snowflake.getId();
        comSwPatrolRecordDO.setId(patrolRecordId);
        comSwPatrolRecordDAO.insert(comSwPatrolRecordDO);
        //巡查记录和关联报告信息
        ComSwPatrolRecordReportDO comSwPatrolRecordReportDO = new ComSwPatrolRecordReportDO();
        Long patrolRecordReport = Snowflake.getId();
        comSwPatrolRecordReportDO.setId(patrolRecordReport);
        comSwPatrolRecordReportDO.setPatrolRecordId(patrolRecordId);
        if (comSwPatrolRecordAddDTO.getIsHiddenDanger().intValue() == ComSwPatrolRecordAddDTO.isOk.yes) {
            //如果存在安全隐患，自动生成安全隐患报告
            ComSwDangerReportDO comSwDangerReportDO = new ComSwDangerReportDO();
            BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwDangerReportDO);
            Long dangerReportId = Snowflake.getId();
            comSwDangerReportDO.setId(dangerReportId);
            comSwPatrolRecordReportDO.setReportId(dangerReportId);
            comSwDangerReportDO.setDangerType(comSwPatrolRecordAddDTO.getPatrolType());
            if (comSwPatrolRecordAddDTO.getIsRectifyImmediately().intValue() == ComSwPatrolRecordAddDTO.isOk.yes) {
                comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.YZG.getCode()));
            }
            comSwDangerReportDO.setRectifyTime(new Date());
            comSwDangerReportDAO.insert(comSwDangerReportDO);
        }else {
            //不存在安全隐患，生成安全工作记录
            ComSwSafetyWorkRecordDO comSwSafetyWorkRecordDO = new ComSwSafetyWorkRecordDO();
            BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwSafetyWorkRecordDO);
            Long safetyWorkRecord = Snowflake.getId();
            comSwSafetyWorkRecordDO.setId(safetyWorkRecord);
            comSwPatrolRecordReportDO.setReportId(safetyWorkRecord);
            comSwSafetyWorkRecordDAO.insert(comSwSafetyWorkRecordDO);
        }
        comSwPatrolRecordReportDAO.insert(comSwPatrolRecordReportDO);
        return R.ok();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwSafetyWorkRecordServiceImpl.java

New file
@@ -0,0 +1,19 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComSwSafetyWorkRecordDAO;
import com.panzhihua.service_community.model.dos.ComSwSafetyWorkRecordDO;
import com.panzhihua.service_community.service.ComSwSafetyWorkRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * @auther txb
 * @create 2021-07-27 14:30:41
 * @describe 服务实现类
 */
@Slf4j
@Service
public class ComSwSafetyWorkRecordServiceImpl extends ServiceImpl<ComSwSafetyWorkRecordDAO, ComSwSafetyWorkRecordDO> implements ComSwSafetyWorkRecordService {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwDangerReportMapper.xml

New file
@@ -0,0 +1,36 @@
<?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_community.dao.ComSwDangerReportDAO">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComSwDangerReportDO">
                <id column="id" property="id" />
                <result column="danger_no" property="dangerNo" />
                <result column="danger_name" property="dangerName" />
                <result column="danger_type" property="dangerType" />
                <result column="status" property="status" />
                <result column="danger_level" property="dangerLevel" />
                <result column="check_time" property="checkTime" />
                <result column="unit_name" property="unitName" />
                <result column="dager_description" property="dagerDescription" />
                <result column="is_rectify_immediately" property="isRectifyImmediately" />
                <result column="take_steps" property="takeSteps" />
                <result column="steps_photo" property="stepsPhoto" />
                <result column="rectify_person" property="rectifyPerson" />
                <result column="rectify_time" property="rectifyTime" />
                <result column="community_suggestion" property="communitySuggestion" />
                <result column="street_suggestion" property="streetSuggestion" />
                <result column="undertake_record" property="undertakeRecord" />
                <result column="remark" property="remark" />
                <result column="create_at" property="createAt" />
                <result column="create_by" property="createBy" />
                <result column="update_at" property="updateAt" />
                <result column="update_by" property="updateBy" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
    id, danger_no, danger_name, danger_type, status, danger_level, check_time, unit_name, dager_description, is_rectify_immediately, take_steps, steps_photo, rectify_person, rectify_time, community_suggestion, street_suggestion, undertake_record, remark, create_at, create_by, update_at, update_by
    </sql>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwPatrolRecordMapper.xml

New file
@@ -0,0 +1,79 @@
<?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_community.dao.ComSwPatrolRecordDAO">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComSwPatrolRecordDO">
                <id column="id" property="id" />
                <result column="community_id" property="communityId" />
                <result column="patrol_time" property="patrolTime" />
                <result column="weather" property="weather" />
                <result column="temperature" property="temperature" />
                <result column="wind" property="wind" />
                <result column="patrol_type" property="patrolType" />
                <result column="patrol_leader" property="patrolLeader" />
                <result column="patrol_person" property="patrolPerson" />
                <result column="address" property="address" />
                <result column="record_content" property="recordContent" />
                <result column="find_record" property="findRecord" />
                <result column="record_photo" property="recordPhoto" />
                <result column="remark" property="remark" />
                <result column="succession_leader" property="successionLeader" />
                <result column="succession_person" property="successionPerson" />
                <result column="succession_time" property="successionTime" />
                <result column="is_hidden_danger" property="isHiddenDanger" />
                <result column="create_at" property="createAt" />
                <result column="create_by" property="createBy" />
                <result column="update_at" property="updateAt" />
                <result column="update_by" property="updateBy" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
    id, community_id, patrol_time, weather, temperature, wind, patrol_type, patrol_leader, patrol_person, address, record_content, find_record, record_photo, remark, succession_leader, succession_person, succession_time, is_hidden_danger, create_at, create_by, update_at, update_by
    </sql>

    <select id="pagePatrolRecord" resultType="com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO">
        SELECT
        cspr.id,
        cspr.community_id AS communityId,
        cspr.patrol_time AS patrolTime,
        cspr.weather,
        cspr.temperature,
        cspr.wind,
        cspr.patrol_type AS patrolType,
        cspr.patrol_person AS patrolPerson,
        cspr.address,
        cspr.record_content AS recordContent,
        cspr.find_record AS findRecord,
        cspr.record_photo AS recordPhoto,
        cspr.remark,
        cspr.succession_person AS successionPerson,
        cspr.succession_time AS successionTime,
        cspr.create_at AS createAt,
        cspr.create_by AS createBy,
        csprr.report_id AS reportId
        FROM
        com_sw_patrol_record as cspr
        left join com_sw_patrol_record_report as csprr on csprr.patrol_record_id = cspr.id
        <where>
            <if test='comSwPatrolRecordDTO.communityId != null and comSwPatrolRecordDTO.communityId != &quot;&quot;'>
                AND cspr.community_id = #{comSwPatrolRecordDTO.communityId}
            </if>
            <if test='comSwPatrolRecordDTO.patrolPerson != null and comSwPatrolRecordDTO.patrolPerson != &quot;&quot;'>
                AND cspr.patrol_person LIKE concat('%',#{comSwPatrolRecordDTO.patrolPerson},'%')
            </if>
            <if test='comSwPatrolRecordDTO.patrolType != null and comSwPatrolRecordDTO.patrolType != &quot;&quot;'>
                AND cspr.patrol_type = #{comSwPatrolRecordDTO.patrolType}
            </if>
            <if test='comSwPatrolRecordDTO.patrolAtBegin != null '>
                AND cspr.patrol_time <![CDATA[ >= ]]> #{comSwPatrolRecordDTO.patrolTime}
            </if>
            <if test='comSwPatrolRecordDTO.patrolAtEnd != null '>
                AND cspr.patrol_time <![CDATA[ <= ]]> #{comSwPatrolRecordDTO.patrolTime}
            </if>
        </where>
        order by cspr.create_at desc
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwPatrolRecordReportMapper.xml

New file
@@ -0,0 +1,21 @@
<?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_community.dao.ComSwPatrolRecordReportDAO">

        <!-- 通用查询映射结果 -->
        <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComSwPatrolRecordReportDO">
                    <id column="id" property="id" />
                    <result column="patrol_record_id" property="patrolRecordId" />
                    <result column="report_id" property="reportId" />
                    <result column="create_at" property="createAt" />
                    <result column="create_by" property="createBy" />
                    <result column="update_at" property="updateAt" />
                    <result column="update_by" property="updateBy" />
        </resultMap>

        <!-- 通用查询结果列 -->
        <sql id="Base_Column_List">
        id, patrol_record_id, report_id, create_at, create_by, update_at, update_by
    </sql>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwSafetyWorkRecordMapper.xml

New file
@@ -0,0 +1,20 @@
<?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_community.dao.ComSwSafetyWorkRecordDAO">

        <!-- 通用查询映射结果 -->
        <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComSwSafetyWorkRecordDO">
                    <id column="id" property="id" />
                    <result column="remark" property="remark" />
                    <result column="create_at" property="createAt" />
                    <result column="create_by" property="createBy" />
                    <result column="update_at" property="updateAt" />
                    <result column="update_by" property="updateBy" />
        </resultMap>

        <!-- 通用查询结果列 -->
        <sql id="Base_Column_List">
        id, remark, create_at, create_by, update_at, update_by
    </sql>

</mapper>