防火防汛接口开发

tangxiaobao

2021-07-29 e0e6e3e08a975e0fd9132ca5cf601c2223069373

防火防汛接口开发

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

@@ -1,6 +1,7 @@
package com.panzhihua.applets.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.vos.R;
@@ -8,10 +9,7 @@
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 org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@@ -55,5 +53,91 @@
        return communityService.addPatrolRecord(comSwPatrolRecordAddDTO);
    }

    /**
     * 根据巡查记录id查询详情
     *
     * @param patrolRecordId 巡查记录id
     * @return 巡查记录详情查询结果
     */
    @ApiOperation(value = "根据巡查记录id查询详情")
    @PostMapping("/detailPatrolRecord")
    public R detailPatrolRecord(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
        return communityService.detailPatrolRecord(patrolRecordId);
    }

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

    /**
     * 根据安全工作记录id查询详情
     *
     * @param safetyWorkRecordId 安全工作记录
     * @return 安全工作记录详情查询结果
     */
    @ApiOperation(value = "根据安全工作记录id查询详情")
    @PostMapping("/detailSafetyWorkRecord")
    public R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId) {
        return communityService.detailSafetyWorkRecord(safetyWorkRecordId);
    }

    /**
     * 分页查询隐患报告
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 隐患报告分页集合
     */
    @ApiOperation(value = "分页查询隐患报告")
    @PostMapping("/pageDangerReport")
    public R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
        Long communityId = this.getCommunityId();
        comSwPatrolRecordPageDTO.setCommunityId(communityId);
        return communityService.pageDangerReport(comSwPatrolRecordPageDTO);
    }

    /**
     * 根据隐患报告id查询详情
     *
     * @param dangerReportId 隐患报告id
     * @return 隐患报告详情查询结果
     */
    @ApiOperation(value = "根据隐患报告id查询详情")
    @PostMapping("/detailDangerReport")
    public R detailDangerReport(@RequestParam(value = "dangerReportId") Long dangerReportId) {
        return communityService.detailDangerReport(dangerReportId);
    }

    /**
     * 根据巡查记录id查询隐患报告详情
     *
     * @param patrolRecordId 巡查记录id
     * @return 隐患报告详情查询结果
     */
    @ApiOperation(value = "根据隐患报告id查询详情")
    @PostMapping("/detailDangerReportByPrId")
    public R detailDangerReportByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
        return communityService.detailDangerReportByPrId(patrolRecordId);
    }

    /**
     * 整改隐患报告
     *
     * @param comSwDangerReportRectifyDTO 隐患报告整改参数
     * @return 整改结果
     */
    @ApiOperation(value = "整改隐患报告")
    @PostMapping("/rectifyDangerReport")
    public R rectifyDangerReport(@RequestBody ComSwDangerReportRectifyDTO comSwDangerReportRectifyDTO){
        return communityService.rectifyDangerReport(comSwDangerReportRectifyDTO);
    }

}


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

@@ -10,10 +10,9 @@
@Getter
public enum SafeWordStatusEnum
{
    DCK(1, "待查看"),
    DCL(2, "待处理"),
    YCL(3, "已处理"),
    YZG(4, "已整改");
    DCL(1, "待处理"),
    YCL(2, "已处理"),
    YZG(3, "已整改");

    private final Integer code;
    private final String name;

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

New file
@@ -0,0 +1,64 @@
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;

/**
 *  隐患报告处理DTO
 */
@Data
@ApiModel("隐患报告处理DTO")
public class ComSwDangerReportHandleDTO implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * 隐患报告id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @ApiModelProperty("隐患报告id")
    private Long dangerReportId;

    /**
     * 社区id
     */
    @ApiModelProperty("社区id")
    private Long communityId;

    /**
     * 社区处理建议
     */
    @ApiModelProperty("社区处理建议")
    private String communitySuggestion;

    /**
     * 街道安全人员管理建议
     */
    @ApiModelProperty("街道安全人员管理建议")
    private String streetSuggestion;

    /**
     * 承办记录
     */
    @ApiModelProperty("承办记录")
    private String undertakeRecord;

    /**
     * 领导意见
     */
    @ApiModelProperty("领导意见")
    private String leaderSuggestion;

    /**
     * 指派人员
     */
    @ApiModelProperty("指派人员")
    private String assignPerson;

}

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

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

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;

/**
 *  隐患报告整改DTO
 */
@Data
@ApiModel("隐患报告整改DTO")
public class ComSwDangerReportRectifyDTO implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * 隐患报告id
     */
    @ApiModelProperty("隐患报告id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long dangerReportId;

    /**
     * 社区id
     */
    @ApiModelProperty("社区id")
    private Long communityId;

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

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

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

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

@@ -58,4 +58,10 @@
    @ApiModelProperty("巡查人员")
    private String patrolPerson;

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

}

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

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

import com.alibaba.excel.annotation.ExcelProperty;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;

import java.io.Serializable;

/**
 * @description: 批量导出隐患报告台账管理
 * @author: Null
 * @date: 2021/7/28 17:11
 */
@Data
public class ComSwDangerReportExcelVO implements Serializable {
    /**
     * 小区名称
     */
    @ExcelProperty(value = "安全隐患地址" ,index = 0)
    private String address;
    /**
     * 隐患简述
     */
    @ExcelProperty(value = "隐患简述" ,index = 1)
    private String dagerDescription;

    /**
     * 隐患类型
     */
    @ExcelProperty(value = "隐患类型" ,index = 2)
    private String dangerType;

    /**
     * 风险等级
     */
    @ExcelProperty(value = "风险等级" ,index = 3)
    private String dangerLevel;

    /**
     * 巡查人员
     */
    @ExcelProperty(value = "巡查人员" ,index = 4)
    private String patrolPerson;

    /**
     * 联系电话
     */
    @ExcelProperty(value = "联系电话" ,index = 5)
    private String patrolPersonPhone;

    /**
     * 备注
     */
    @ExcelProperty(value = "备注" ,index = 6)
    private String remark;

}


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

New file
@@ -0,0 +1,267 @@
package com.panzhihua.common.model.vos.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("隐患报告表")
public class ComSwDangerReportVO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 隐患报告id
     */
    @ApiModelProperty("隐患报告id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
     * 社区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 patrolPerson;

    /**
     * 巡查人员联系电话，多个以逗号隔开
     */
    @ApiModelProperty("巡查人员联系电话，多个以逗号隔开")
    private String patrolPersonPhone;

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

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

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

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

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

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

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

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

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

    /**
     * 隐患编号
     */
    @ApiModelProperty("隐患编号")
    private Integer dangerNo;

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

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

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

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

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

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

    /**
     * 整改人员联系电话，多个以逗号隔开
     */
    @ApiModelProperty("整改人员联系电话，多个以逗号隔开")
    private String rectifyPersonPhone;

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

    /**
     * 社区处理建议
     */
    @ApiModelProperty("社区处理建议")
    private String communitySuggestion;

    /**
     * 街道安全人员管理建议
     */
    @ApiModelProperty("街道安全人员管理建议")
    private String streetSuggestion;

    /**
     * 承办记录
     */
    @ApiModelProperty("承办记录")
    private String undertakeRecord;

    /**
     * 领导意见
     */
    @ApiModelProperty("领导意见")
    private String leaderSuggestion;

    /**
     * 指派人员
     */
    @ApiModelProperty("指派人员")
    private String assignPerson;

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

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

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

    /**
     * 是否指派
     */
    @ApiModelProperty("是否指派(1.是 0.否)")
    private Integer isAssign;



    /**
     * 巡查类型
     */
    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/vos/community/ComSwPatrolRecordStatisticsVO.java

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

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

/**
 * 巡查记录统计返回参数
 */
@Data
@ApiModel("巡查记录统计返回参数")
public class ComSwPatrolRecordStatisticsVO {

    /**
     * 巡查记录总数
     */
    @ApiModelProperty("巡查记录总数")
    private Long patrolRecordTotal;
    /**
     * 防火巡查
     */
    @ApiModelProperty("防火巡查")
    private Integer localTotal;
    /**
     * 防汛巡查
     */
    @ApiModelProperty("防汛巡查")
    private Integer outTotal;
    /**
     * 防疫巡查
     */
    @ApiModelProperty("防疫巡查")
    private Integer specialTotal;

}

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

@@ -210,6 +210,12 @@
    private Long createBy;

    /**
     * 安全记录/隐患报告显示按钮
     */
    @ApiModelProperty("安全记录/隐患报告显示按钮（1.查看安全工作记录 2.隐患报告待填写 3.查看隐患报告）")
    private Integer displayButton;

    /**
     * 巡查类型
     */
    public interface patrolType{

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

New file
@@ -0,0 +1,135 @@
package com.panzhihua.common.model.vos.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("安全工作记录表")
public class ComSwSafetyWorkRecordVO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 安全工作记录id
     */
    @ApiModelProperty("巡查记录id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
     * 社区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 patrolPerson;

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

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

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

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

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

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

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

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

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

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

@@ -3744,4 +3744,92 @@
     */
    @PostMapping("/patrolRecord/addPatrolRecord")
    R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO);

    /**
     * 根据巡查记录id查询详情
     *
     * @param patrolRecordId 巡查记录id
     * @return 巡查记录详情查询结果
     */
    @PostMapping("/patrolRecord/detail")
    R detailPatrolRecord(@RequestParam("patrolRecordId") Long patrolRecordId);

    /**
     * 分页查询安全工作记录
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 安全工作记录分页集合
     */
    @PostMapping("/patrolRecord/safetyWorkRecord/page")
    R pageSafetyWorkRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);

    /**
     * 根据安全工作记录id查询详情
     *
     * @param safetyWorkRecordId 安全工作记录
     * @return 安全工作记录详情查询结果
     */
    @PostMapping("/patrolRecord/safetyWorkRecord/detail")
    R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId);

    /**
     * 根据巡查记录id查询安全工作记录详情
     *
     * @param patrolRecordId 巡查记录id
     * @return 安全工作记录详情查询结果
     */
    @PostMapping("/patrolRecord/safetyWorkRecord/detailByPrId")
    R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId);

    /**
     * 分页查询隐患报告
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 隐患报告分页集合
     */
    @PostMapping("/patrolRecord/dangerReport/page")
    R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);

    /**
     * 根据隐患报告id查询详情
     *
     * @param dangerReportId 隐患报告id
     * @return 隐患报告详情查询结果
     */
    @PostMapping("/patrolRecord/dangerReport/detail")
    R detailDangerReport(@RequestParam(value = "dangerReportId") Long dangerReportId);

    /**
     * 根据巡查记录id查询隐患报告详情
     *
     * @param patrolRecordId 巡查记录id
     * @return 隐患报告详情查询结果
     */
    @PostMapping("/patrolRecord/dangerReport/detailByPrId")
    R detailDangerReportByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId);

    /**
     * 处理隐患报告
     *
     * @param comSwDangerReportHandleDTO 隐患报告处理参数
     * @return 处理结果
     */
    @PostMapping("/patrolRecord/dangerReport/handle")
    R handleDangerReport(@RequestBody ComSwDangerReportHandleDTO comSwDangerReportHandleDTO);

    /**
     * 整改隐患报告
     *
     * @param comSwDangerReportRectifyDTO 隐患报告整改参数
     * @return 整改结果
     */
    @PostMapping("/patrolRecord/dangerReport/rectify")
    R rectifyDangerReport(@RequestBody ComSwDangerReportRectifyDTO comSwDangerReportRectifyDTO);

    /**
     * 隐患报告台账导出
     *
     * @param dangerReportIds
     * @return
     */
    @PostMapping("/patrolRecord/dangerReport/export")
    R exportDangerReport(@RequestBody List<Long> dangerReportIds);
}

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

@@ -1,20 +1,34 @@
package com.panzhihua.community_backstage.api;

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONArray;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportHandleDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.dtos.community.ExportComMngCarExcelDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationTotalVO;
import com.panzhihua.common.model.vos.community.ComSwDangerReportExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
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;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.List;

/**
 * @auther txb
@@ -29,6 +43,22 @@

    @Resource
    private CommunityService communityService;

    // 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("${excel.userurl}")
    private String excelUrl;


    /**
     * 分页查询巡查记录
@@ -56,5 +86,170 @@
        return communityService.addPatrolRecord(comSwPatrolRecordAddDTO);
    }

    /**
     * 根据巡查记录id查询详情
     *
     * @param patrolRecordId 巡查记录id
     * @return 巡查记录详情查询结果
     */
    @ApiOperation(value = "根据巡查记录id查询详情")
    @PostMapping("/detailPatrolRecord")
    public R detailPatrolRecord(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
        return communityService.detailPatrolRecord(patrolRecordId);
    }

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

    /**
     * 根据安全工作记录id查询详情
     *
     * @param safetyWorkRecordId 安全工作记录
     * @return 安全工作记录详情查询结果
     */
    @ApiOperation(value = "根据安全工作记录id查询详情")
    @PostMapping("/detailSafetyWorkRecord")
    public R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId) {
        return communityService.detailSafetyWorkRecord(safetyWorkRecordId);
    }

    /**
     * 根据巡查记录id查询安全工作记录详情
     *
     * @param patrolRecordId 巡查记录id
     * @return 安全工作记录详情查询结果
     */
    @ApiOperation(value = "根据巡查记录id查询安全工作记录详情")
    @PostMapping("/detailSafetyWorkRecordByPrId")
    public R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
        return communityService.detailSafetyWorkRecordByPrId(patrolRecordId);
    }

    /**
     * 分页查询隐患报告
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 隐患报告分页集合
     */
    @ApiOperation(value = "分页查询隐患报告")
    @PostMapping("/pageDangerReport")
    public R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
        Long communityId = this.getCommunityId();
        comSwPatrolRecordPageDTO.setCommunityId(communityId);
        return communityService.pageDangerReport(comSwPatrolRecordPageDTO);
    }

    /**
     * 根据隐患报告id查询详情
     *
     * @param dangerReportId 隐患报告id
     * @return 隐患报告详情查询结果
     */
    @ApiOperation(value = "根据隐患报告id查询详情")
    @PostMapping("/detailDangerReport")
    public R detailDangerReport(@RequestParam(value = "dangerReportId") Long dangerReportId) {
        return communityService.detailDangerReport(dangerReportId);
    }

    /**
     * 根据巡查记录id查询隐患报告详情
     *
     * @param patrolRecordId 巡查记录id
     * @return 隐患报告详情查询结果
     */
    @ApiOperation(value = "根据隐患报告id查询详情")
    @PostMapping("/detailDangerReportByPrId")
    public R detailDangerReportByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
        return communityService.detailDangerReportByPrId(patrolRecordId);
    }

    /**
     * 处理隐患报告
     *
     * @param comSwDangerReportHandleDTO 隐患报告处理参数
     * @return 处理结果
     */
    @ApiOperation(value = "处理隐患报告")
    @PostMapping("/handleDangerReport")
    public R handleDangerReport(@RequestBody ComSwDangerReportHandleDTO comSwDangerReportHandleDTO){
        return communityService.handleDangerReport(comSwDangerReportHandleDTO);
    }

    /**
     * 导出台账-隐患报告
     *
     * @param dangerReportIds 隐患报告ids
     * @return 隐患报告导出结果
     */
    @ApiOperation(value = "导出台账-隐患报告")
    @PostMapping("/danger/export")
    public R exportComMngCar(@RequestBody List<Long> dangerReportIds) {
        String url = excelUrl;
        String name = "隐患报告台账导出数据.xlsx";
        String ftpUrl = "/mnt/data/web/excel/";
        //导出勾选了的隐患报告，不勾选则导出本页数据
        R r = communityService.exportDangerReport(dangerReportIds);
        if (R.isOk(r)) {
            List<ComSwDangerReportExcelVO> comSwDangerReportExcelVOS = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComSwDangerReportExcelVO.class);
            try {
                SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
                sftp.login();
                boolean existDir = sftp.isExistDir(ftpUrl + name);
                if (!existDir) {
                    String property = System.getProperty("user.dir");
                    String fileName = property + File.separator + name;
                    // 这里 需要指定写用哪个class去写
                    ExcelWriter excelWriter = null;
                    InputStream inputStream = null;
                    try {
                        excelWriter = EasyExcel.write(fileName, ComSwDangerReportExcelVO.class).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).registerWriteHandler(new CustomSheetWriteHandler()).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet("隐患报告台账导出数据").build();
                        excelWriter.write(comSwDangerReportExcelVOS, writeSheet);
                        excelWriter.finish();
                        File file = new File(fileName);
                        inputStream = new FileInputStream(file);
                        sftp.uploadMore(ftpUrl, name, inputStream);
                        sftp.logout();
                        inputStream.close();
                        String absolutePath = file.getAbsolutePath();
                        boolean delete = file.delete();
                        log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                    } finally {
                        // 千万别忘记finish 会帮忙关闭流
                        if (inputStream != null) {
                            inputStream.close();
                        }
                        if (excelWriter != null) {
                            excelWriter.finish();
                        }
                    }
                }
                return R.ok(url + name);
            } catch (Exception e) {
                e.printStackTrace();
                log.error("文件传输失败【{}】", e.getMessage());
                return R.fail();
            }
        }
        return R.fail("未查询到隐患报告");
    }

    @ApiOperation(value = "巡查记录统计接口", response = ComMngPopulationTotalVO.class)
    @PostMapping("/statistics")
    public R getPopulationTotalByAdmin() {
        //获取登陆用户绑定社区id
        Long communityId = this.getLoginUserInfo().getCommunityId();
        return communityService.getPopulationTotalByAdmin(communityId);
    }

}


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

@@ -9,9 +9,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.jcraft.jsch.SftpException;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.enums.PopulIsOkEnum;
import com.panzhihua.common.enums.PopulPoliticalOutlookEnum;
import com.panzhihua.common.enums.PopulSexEnum;
import com.panzhihua.common.listen.*;
@@ -21,17 +19,13 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.ComMngTagVO;
import com.panzhihua.common.model.vos.user.ComMngUserTagVO;
import com.panzhihua.common.model.vos.user.InputUserInfoVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.FileUtil;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.community_backstage.easyexcel.UploadEexcelUserDTOListener;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import com.panzhihua.community_backstage.model.dto.ExcelExportDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;

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

@@ -1,17 +1,20 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.dtos.community.ComSwDangerReportHandleDTO;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
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.dao.ComSwSafetyWorkRecordDAO;
import com.panzhihua.service_community.service.ComSwDangerReportService;
import com.panzhihua.service_community.service.ComSwPatrolRecordService;
import com.panzhihua.service_community.service.ComSwSafetyWorkRecordService;
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;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

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

/**
 * @auther txb
@@ -26,10 +29,16 @@
    @Resource
    private ComSwPatrolRecordService comSwPatrolRecordService;

    @Resource
    private ComSwSafetyWorkRecordService comSwSafetyWorkRecordService;

    @Resource
    private ComSwDangerReportService comSwDangerReportService;

    /**
     * 分页查询巡查记录
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 分页集合
     * @return 巡查记录分页集合
     */
    @PostMapping("/page")
    public R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
@@ -47,5 +56,113 @@
        return comSwPatrolRecordService.addPatrolRecord(comSwPatrolRecordAddDTO);
    }

    /**
     * 根据巡查记录id查询详情
     *
     * @param patrolRecordId 巡查记录id
     * @return 巡查记录详情查询结果
     */
    @PostMapping("/detail")
    public R detailPatrolRecord(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
        return comSwPatrolRecordService.detailPatrolRecord(patrolRecordId);
    }

    /**
     * 分页查询安全工作记录
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 安全工作记录分页集合
     */
    @PostMapping("/safetyWorkRecord/page")
    public R pageSafetyWorkRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
        return comSwSafetyWorkRecordService.pageSafetyWorkRecord(comSwPatrolRecordPageDTO);
    }

    /**
     * 根据安全工作记录id查询详情
     *
     * @param safetyWorkRecordId 安全工作记录
     * @return 安全工作记录详情查询结果
     */
    @PostMapping("/safetyWorkRecord/detail")
    public R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId) {
        return comSwSafetyWorkRecordService.detailSafetyWorkRecord(safetyWorkRecordId);
    }

    /**
     * 根据巡查记录id查询安全工作记录详情
     *
     * @param patrolRecordId 巡查记录id
     * @return 安全工作记录详情查询结果
     */
    @PostMapping("/safetyWorkRecord/detailByPrId")
    public R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
        return comSwSafetyWorkRecordService.detailSafetyWorkRecordByPrId(patrolRecordId);
    }

    /**
     * 分页查询隐患报告
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 隐患报告分页集合
     */
    @PostMapping("/dangerReport/page")
    public R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
        return comSwDangerReportService.pageDangerReport(comSwPatrolRecordPageDTO);
    }

    /**
     * 根据隐患报告id查询详情
     *
     * @param dangerReportId 隐患报告id
     * @return 隐患报告详情查询结果
     */
    @PostMapping("/dangerReport/detail")
    public R detailDangerReport(@RequestParam(value = "dangerReportId") Long dangerReportId) {
        return comSwDangerReportService.detailDangerReport(dangerReportId);
    }

    /**
     * 根据巡查记录id查询隐患报告详情
     *
     * @param patrolRecordId 巡查记录id
     * @return 隐患报告详情查询结果
     */
    @PostMapping("/dangerReport/detailByPrId")
    public R detailDangerReportByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
        return comSwDangerReportService.detailDangerReportByPrId(patrolRecordId);
    }

    /**
     * 处理隐患报告
     *
     * @param comSwDangerReportHandleDTO 隐患报告处理参数
     * @return 处理结果
     */
    @PostMapping("/dangerReport/handle")
    public R handleDangerReport(@RequestBody ComSwDangerReportHandleDTO comSwDangerReportHandleDTO){
        return comSwDangerReportService.handleDangerReport(comSwDangerReportHandleDTO);
    }

    /**
     * 整改隐患报告
     *
     * @param comSwDangerReportRectifyDTO 隐患报告整改参数
     * @return 整改结果
     */
    @PostMapping("/dangerReport/rectify")
    public R rectifyDangerReport(@RequestBody ComSwDangerReportRectifyDTO comSwDangerReportRectifyDTO){
        return comSwDangerReportService.rectifyDangerReport(comSwDangerReportRectifyDTO);
    }

    /**
     * 隐患报告台账导出
     *
     * @param dangerReportIds
     * @return
     */
    @PostMapping("/dangerReport/export")
    public R exportDangerReport(@RequestBody List<Long> dangerReportIds){
        return comSwDangerReportService.exportDangerReport(dangerReportIds);
    }

}


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

@@ -1,8 +1,18 @@
package com.panzhihua.service_community.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.community.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComSwDangerReportExcelVO;
import com.panzhihua.common.model.vos.community.ComSwDangerReportVO;
import com.panzhihua.common.model.vos.community.ComSwSafetyWorkRecordVO;
import com.panzhihua.service_community.model.dos.ComSwDangerReportDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * @auther txb
@@ -12,4 +22,26 @@
@Mapper
public interface ComSwDangerReportDAO extends BaseMapper<ComSwDangerReportDO> {

    /**
     * 分页查询隐患报告
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 隐患报告分页集合
     */
    IPage<ComSwDangerReportVO> pageDangerReport(Page page, @Param("comSwPatrolRecordDTO") ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);

    /**
     * 根据隐患报告id查询详情
     *
     * @param dangerReportId 隐患报告id
     * @return 隐患报告详情查询结果
     */
    ComSwDangerReportVO detailDangerReport(@Param("dangerReportId") Long dangerReportId);

    /**
     * 根据隐患报告id批量查询详情
     *
     * @param dangerReportIds 隐患报告ids
     * @return
     */
    List<ComSwDangerReportExcelVO> exportDangerReport(@Param("dangerReportIds") List<Long> dangerReportIds);
}

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

@@ -1,8 +1,14 @@
package com.panzhihua.service_community.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.community.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
import com.panzhihua.common.model.vos.community.ComSwSafetyWorkRecordVO;
import com.panzhihua.service_community.model.dos.ComSwSafetyWorkRecordDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * @auther txb
@@ -12,4 +18,11 @@
@Mapper
public interface ComSwSafetyWorkRecordDAO extends BaseMapper<ComSwSafetyWorkRecordDO> {

    /**
     * 分页查询安全工作记录
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 安全工作记录分页集合
     */
    IPage<ComSwSafetyWorkRecordVO> pageSafetyWorkRecord(Page page, @Param("comSwPatrolRecordDTO") ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);

}

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

@@ -41,7 +41,7 @@
    private String dangerType;

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

@@ -106,6 +106,16 @@
    private String undertakeRecord;

    /**
     * 领导意见
     */
    private String leaderSuggestion;

    /**
     * 指派人员
     */
    private String assignPerson;

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

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

@@ -1,7 +1,16 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportHandleDTO;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComSwDangerReportDO;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;

/**
 * @auther txb
@@ -10,4 +19,50 @@
 */
public interface ComSwDangerReportService extends IService<ComSwDangerReportDO> {

    /**
     * 分页查询隐患报告
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 隐患报告分页集合
     */
    R pageDangerReport(ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);

    /**
     * 根据隐患报告id查询详情
     *
     * @param dangerReportId 隐患报告id
     * @return 隐患报告详情查询结果
     */
    R detailDangerReport(Long dangerReportId);

    /**
     * 根据巡查记录id查询隐患报告详情
     *
     * @param patrolRecordId 巡查记录id
     * @return 隐患报告详情查询结果
     */
    R detailDangerReportByPrId(Long patrolRecordId);

    /**
     * 处理隐患报告
     *
     * @param comSwDangerReportHandleDTO 隐患报告处理参数
     * @return 处理结果
     */
    R handleDangerReport(ComSwDangerReportHandleDTO comSwDangerReportHandleDTO);

    /**
     * 整改隐患报告
     *
     * @param comSwDangerReportRectifyDTO 隐患报告整改参数
     * @return 整改结果
     */
    R rectifyDangerReport(ComSwDangerReportRectifyDTO comSwDangerReportRectifyDTO);

    /**
     * 隐患报告台账导出
     *
     * @param dangerReportIds
     * @return
     */
    R exportDangerReport(List<Long> dangerReportIds);
}

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

@@ -7,6 +7,7 @@
import com.panzhihua.service_community.model.dos.ComSwPatrolRecordDO;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * @auther txb
@@ -17,6 +18,7 @@

    /**
     * 分页查询巡查记录
     *
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 分页集合
     */
@@ -24,8 +26,17 @@

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

    /**
     * 根据巡查记录id查询详情
     *
     * @param patrolRecordId 巡查记录id
     * @return 巡查记录详情查询结果
     */
    R detailPatrolRecord(Long patrolRecordId);
}

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

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

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

/**
 * @auther txb
@@ -10,4 +15,26 @@
 */
public interface ComSwSafetyWorkRecordService extends IService<ComSwSafetyWorkRecordDO> {

    /**
     * 分页查询安全工作记录
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 安全工作记录分页集合
     */
    R pageSafetyWorkRecord(ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);

    /**
     * 根据安全工作记录id查询详情
     *
     * @param safetyWorkRecordId 安全工作记录
     * @return 安全工作记录详情查询结果
     */
    R detailSafetyWorkRecord(Long safetyWorkRecordId);

    /**
     * 根据巡查记录id查询安全工作记录详情
     *
     * @param patrolRecordId 巡查记录id
     * @return 安全工作记录详情查询结果
     */
    R detailSafetyWorkRecordByPrId(Long patrolRecordId);
}

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

@@ -1,11 +1,37 @@
package com.panzhihua.service_community.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.enums.SafeWordStatusEnum;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportHandleDTO;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
import com.panzhihua.common.model.vos.community.ComSwDangerReportExcelVO;
import com.panzhihua.common.model.vos.community.ComSwDangerReportVO;
import com.panzhihua.common.model.vos.community.ComSwSafetyWorkRecordVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.StringUtils;
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.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.ComSwDangerReportService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

/**
 * @auther txb
@@ -16,4 +42,134 @@
@Service
public class ComSwDangerReportServiceImpl extends ServiceImpl<ComSwDangerReportDAO, ComSwDangerReportDO> implements ComSwDangerReportService {

    @Resource
    private ComSwDangerReportDAO comSwDangerReportDAO;

    @Resource
    private ComSwPatrolRecordDAO comSwPatrolRecordDAO;

    @Resource
    private ComSwPatrolRecordReportDAO comSwPatrolRecordReportDAO;

    @Resource
    private UserService userService;

    @Override
    public R pageDangerReport(ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
        Page page = new Page<>();
        Long pageNum = comSwPatrolRecordPageDTO.getPageNum();
        Long pageSize = comSwPatrolRecordPageDTO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1L;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10L;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);

        IPage<ComSwDangerReportVO> iPage = comSwDangerReportDAO.pageDangerReport(page, comSwPatrolRecordPageDTO);
        if (!iPage.getRecords().isEmpty()) {
            iPage.getRecords().forEach(comSwDangerReportVO -> {
                if (StringUtils.isNotEmpty(comSwDangerReportVO.getAssignPerson())) {
                    comSwDangerReportVO.setIsAssign(ComSwDangerReportVO.isOk.no);
                }else {
                    comSwDangerReportVO.setIsAssign(ComSwDangerReportVO.isOk.yes);
                }
                List<String> patrolUserIds = Arrays.asList(comSwDangerReportVO.getPatrolPerson().split(","));
                List<String> patrolPhones = new ArrayList<>();
                for (String userId : patrolUserIds) {
                    LoginUserInfoVO loginUserInfoVO = userService.getUserInfoByUserId(userId).getData();
                    patrolPhones.add(loginUserInfoVO.getPhone());
                }
                comSwDangerReportVO.setPatrolPersonPhone(StringUtils.join(patrolPhones,","));

                List<String> rectifyUserIds = Arrays.asList(comSwDangerReportVO.getRectifyPerson().split(","));
                List<String> rectifyPhones = new ArrayList<>();
                for (String userId : rectifyUserIds) {
                    LoginUserInfoVO loginUserInfoVO = userService.getUserInfoByUserId(userId).getData();
                    rectifyPhones.add(loginUserInfoVO.getPhone());
                }
                comSwDangerReportVO.setRectifyPersonPhone(StringUtils.join(rectifyPhones,","));
            });
        }
        return R.ok(iPage);
    }

    @Override
    public R detailDangerReport(Long dangerReportId) {
        ComSwDangerReportDO comSwDangerReportDO = comSwDangerReportDAO.selectById(dangerReportId);
        if (null == comSwDangerReportDO) {
            return R.fail("该隐患报告不存在");
        }
        ComSwDangerReportVO comSwDangerReportVO = new ComSwDangerReportVO();
        ComSwPatrolRecordReportDO comSwPatrolRecordReportDO = comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>().lambda().eq(ComSwPatrolRecordReportDO::getReportId, dangerReportId));
        if (null != comSwPatrolRecordReportDO) {
            ComSwPatrolRecordDO comSwPatrolRecordDO = comSwPatrolRecordDAO.selectById(comSwPatrolRecordReportDO.getPatrolRecordId());
            BeanUtils.copyProperties(comSwPatrolRecordDO, comSwDangerReportVO);
        }
        BeanUtils.copyProperties(comSwDangerReportDO, comSwDangerReportVO);
        return R.ok(comSwDangerReportVO);
    }

    @Override
    public R detailDangerReportByPrId(Long patrolRecordId) {
        ComSwPatrolRecordDO comSwPatrolRecordDO = comSwPatrolRecordDAO.selectById(patrolRecordId);
        ComSwDangerReportVO comSwDangerReportVO = new ComSwDangerReportVO();
        ComSwPatrolRecordReportDO comSwPatrolRecordReportDO = comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>().lambda().eq(ComSwPatrolRecordReportDO::getPatrolRecordId, patrolRecordId));
        if (null != comSwPatrolRecordReportDO) {
            ComSwDangerReportDO comSwDangerReportDO = comSwDangerReportDAO.selectById(comSwPatrolRecordReportDO.getReportId());
            if (null == comSwDangerReportDO) {
                return R.fail("该隐患报告不存在");
            }
            BeanUtils.copyProperties(comSwDangerReportDO, comSwDangerReportVO);
        }
        BeanUtils.copyProperties(comSwPatrolRecordDO, comSwDangerReportVO);
        return R.ok(comSwDangerReportVO);
    }

    @Override
    public R handleDangerReport(ComSwDangerReportHandleDTO comSwDangerReportHandleDTO) {
        ComSwDangerReportDO comSwDangerReportDO = comSwDangerReportDAO.selectById(comSwDangerReportHandleDTO.getDangerReportId());
        if (null == comSwDangerReportDO) {
            return R.fail("该隐患报告不存在");
        }
        BeanUtils.copyProperties(comSwDangerReportHandleDTO, comSwDangerReportDO);
        comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.YCL.getCode()));
        int update = comSwDangerReportDAO.updateById(comSwDangerReportDO);
        if (update > 0) {
            return R.ok();
        }
        return R.fail("处理失败");
    }

    @Override
    public R rectifyDangerReport(ComSwDangerReportRectifyDTO comSwDangerReportRectifyDTO) {
        ComSwDangerReportDO comSwDangerReportDO = comSwDangerReportDAO.selectById(comSwDangerReportRectifyDTO.getDangerReportId());
        if (null == comSwDangerReportDO) {
            return R.fail("该隐患报告不存在");
        }
        BeanUtils.copyProperties(comSwDangerReportRectifyDTO, comSwDangerReportDO);
        comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.YZG.getCode()));
        int update = comSwDangerReportDAO.updateById(comSwDangerReportDO);
        if (update > 0) {
            return R.ok();
        }
        return R.fail("整改失败");
    }

    @Override
    public R exportDangerReport(List<Long> dangerReportIds) {
        List<ComSwDangerReportExcelVO> list = comSwDangerReportDAO.exportDangerReport(dangerReportIds);
        list.forEach(comSwDangerReportExcelVO -> {
            List<String> patrolUserIds = Arrays.asList(comSwDangerReportExcelVO.getPatrolPerson().split(","));
            List<String> patrolPhones = new ArrayList<>();
            for (String userId : patrolUserIds) {
                LoginUserInfoVO loginUserInfoVO = userService.getUserInfoByUserId(userId).getData();
                patrolPhones.add(loginUserInfoVO.getPhone());
            }
            comSwDangerReportExcelVO.setPatrolPersonPhone(StringUtils.join(patrolPhones,","));
        });
        return R.ok(list);
    }
}

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

@@ -1,5 +1,6 @@
package com.panzhihua.service_community.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;
@@ -7,16 +8,15 @@
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.ComMngRealAssetsVO;
import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.utlis.StringUtils;
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.model.dos.*;
import com.panzhihua.service_community.service.ComSwPatrolRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -85,7 +85,7 @@
            comSwDangerReportDO.setId(dangerReportId);
            comSwPatrolRecordReportDO.setReportId(dangerReportId);
            comSwDangerReportDO.setDangerType(comSwPatrolRecordAddDTO.getPatrolType());
            if (comSwPatrolRecordAddDTO.getIsRectifyImmediately().intValue() == ComSwPatrolRecordAddDTO.isOk.yes) {
            if (comSwPatrolRecordAddDTO.getIsRectifyImmediately().intValue() == ComSwPatrolRecordAddDTO.isOk.yes && StringUtils.isNotEmpty(comSwPatrolRecordAddDTO.getTakeSteps())) {
                comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.YZG.getCode()));
            }
            comSwDangerReportDO.setRectifyTime(new Date());
@@ -102,4 +102,29 @@
        comSwPatrolRecordReportDAO.insert(comSwPatrolRecordReportDO);
        return R.ok();
    }

    @Override
    public R detailPatrolRecord(Long patrolRecordId) {
        ComSwPatrolRecordDO comSwPatrolRecordDO = comSwPatrolRecordDAO.selectById(patrolRecordId);
        if (null == comSwPatrolRecordDO) {
            return R.fail("该巡查记录不存在");
        }
        ComSwPatrolRecordVO comSwPatrolRecordVO = new ComSwPatrolRecordVO();
        BeanUtils.copyProperties(comSwPatrolRecordDO, comSwPatrolRecordVO);
        ComSwPatrolRecordReportDO comSwPatrolRecordReportDO = comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>().lambda().eq(ComSwPatrolRecordReportDO::getPatrolRecordId, patrolRecordId));
        if (null != comSwPatrolRecordReportDO) {
            if (comSwPatrolRecordVO.getIsHiddenDanger().equals(ComSwPatrolRecordVO.isOk.yes)) {
                if (null != comSwDangerReportDAO.selectById(comSwPatrolRecordReportDO.getReportId())) {
                    comSwPatrolRecordVO.setDisplayButton(3);
                }else {
                    comSwPatrolRecordVO.setDisplayButton(2);
                }
            }else{
                if (null != comSwSafetyWorkRecordDAO.selectById(comSwPatrolRecordReportDO.getReportId())) {
                    comSwPatrolRecordVO.setDisplayButton(1);
                }
            }
        }
        return R.ok(comSwPatrolRecordVO);
    }
}

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

@@ -1,11 +1,25 @@
package com.panzhihua.service_community.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.community.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
import com.panzhihua.common.model.vos.community.ComSwSafetyWorkRecordVO;
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.ComSwPatrolRecordDO;
import com.panzhihua.service_community.model.dos.ComSwPatrolRecordReportDO;
import com.panzhihua.service_community.model.dos.ComSwSafetyWorkRecordDO;
import com.panzhihua.service_community.service.ComSwSafetyWorkRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

/**
 * @auther txb
@@ -16,4 +30,60 @@
@Service
public class ComSwSafetyWorkRecordServiceImpl extends ServiceImpl<ComSwSafetyWorkRecordDAO, ComSwSafetyWorkRecordDO> implements ComSwSafetyWorkRecordService {

    @Resource
    private ComSwSafetyWorkRecordDAO comSwSafetyWorkRecordDAO;

    @Resource
    private ComSwPatrolRecordDAO comSwPatrolRecordDAO;

    @Resource
    private ComSwPatrolRecordReportDAO comSwPatrolRecordReportDAO;

    @Override
    public R pageSafetyWorkRecord(ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
        Page page = new Page<>();
        Long pageNum = comSwPatrolRecordPageDTO.getPageNum();
        Long pageSize = comSwPatrolRecordPageDTO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1L;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10L;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);

        IPage<ComSwSafetyWorkRecordVO> iPage = comSwSafetyWorkRecordDAO.pageSafetyWorkRecord(page, comSwPatrolRecordPageDTO);
        return R.ok(iPage);
    }

    @Override
    public R detailSafetyWorkRecord(Long safetyWorkRecordId) {
        ComSwSafetyWorkRecordDO swSafetyWorkRecordDO = comSwSafetyWorkRecordDAO.selectById(safetyWorkRecordId);
        if (null == swSafetyWorkRecordDO) {
            return R.fail("该安全工作记录不存在");
        }
        ComSwPatrolRecordReportDO comSwPatrolRecordReportDO = comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>().lambda().eq(ComSwPatrolRecordReportDO::getReportId, safetyWorkRecordId));
        ComSwSafetyWorkRecordVO comSwSafetyWorkRecordVO = new ComSwSafetyWorkRecordVO();
        if (null != comSwPatrolRecordReportDO) {
            ComSwPatrolRecordDO comSwPatrolRecordDO = comSwPatrolRecordDAO.selectById(comSwPatrolRecordReportDO.getPatrolRecordId());
            BeanUtils.copyProperties(comSwPatrolRecordDO, comSwSafetyWorkRecordVO);
        }
        return R.ok(comSwSafetyWorkRecordVO);
    }

    @Override
    public R detailSafetyWorkRecordByPrId(Long patrolRecordId) {
        ComSwPatrolRecordDO comSwPatrolRecordDO = comSwPatrolRecordDAO.selectById(patrolRecordId);
        ComSwPatrolRecordReportDO comSwPatrolRecordReportDO = comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>().lambda().eq(ComSwPatrolRecordReportDO::getPatrolRecordId, patrolRecordId));
        if (null != comSwPatrolRecordReportDO) {
            ComSwSafetyWorkRecordDO comSwSafetyWorkRecordDO = comSwSafetyWorkRecordDAO.selectById(comSwPatrolRecordReportDO.getReportId());
            if (null == comSwSafetyWorkRecordDO) {
                return R.fail("该安全工作记录不存在");
            }
        }
        ComSwSafetyWorkRecordVO comSwSafetyWorkRecordVO = new ComSwSafetyWorkRecordVO();
        BeanUtils.copyProperties(comSwPatrolRecordDO, comSwSafetyWorkRecordVO);
        return R.ok(comSwSafetyWorkRecordVO);
    }
}

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

@@ -21,6 +21,8 @@
                <result column="community_suggestion" property="communitySuggestion" />
                <result column="street_suggestion" property="streetSuggestion" />
                <result column="undertake_record" property="undertakeRecord" />
                <result column="leader_suggestion" property="leaderSuggestion" />
                <result column="assign_person" property="assignPerson" />
                <result column="remark" property="remark" />
                <result column="create_at" property="createAt" />
                <result column="create_by" property="createBy" />
@@ -33,4 +35,123 @@
    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>

    <select id="pageDangerReport" resultType="com.panzhihua.common.model.vos.community.ComSwDangerReportVO">
        SELECT
            csdr.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.create_at AS createAt,
            cspr.create_by AS createBy,
            csdr.remark,
            csdr.danger_name AS dangerName,
            csdr.check_time AS checkTime,
            csdr.unit_name AS unitName,
            csdr.dager_description AS dagerDescription,
            csdr.danger_no AS dangerNo,
            csdr.danger_type AS dangerType,
            csdr.status,
            csdr.danger_level AS dangerLevel,
            csdr.take_steps AS takeSteps,
            csdr.steps_photo AS stepsPhoto,
            csdr.rectify_person AS rectifyPerson,
            csdr.rectify_time AS rectifyTime,
            csdr.community_suggestion AS communitySuggestion,
            csdr.street_suggestion AS streetSuggestion,
            csdr.undertake_record AS undertakeRecord,
            csdr.leader_suggestion AS leaderSuggestion,
            csdr.assign_person AS assignPerson
        FROM
            com_sw_danger_report as csdr
                left join com_sw_patrol_record_report as csprr on csprr.report_id = csdr.id
                left join com_sw_patrol_record as cspr on csprr.patrol_record_id = cspr.id
        <where>
            <if test='comSwPatrolRecordDTO.communityId != null and comSwPatrolRecordDTO.communityId != ""'>
                AND cspr.community_id = #{comSwPatrolRecordDTO.communityId}
            </if>
            <if test='comSwPatrolRecordDTO.patrolPerson != null and comSwPatrolRecordDTO.patrolPerson != ""'>
                AND cspr.patrol_person LIKE concat('%',#{comSwPatrolRecordDTO.patrolPerson},'%')
            </if>
            <if test='comSwPatrolRecordDTO.patrolType != null and comSwPatrolRecordDTO.patrolType != ""'>
                AND cspr.patrol_type = #{comSwPatrolRecordDTO.patrolType}
            </if>
            <if test='comSwPatrolRecordDTO.status != null and comSwPatrolRecordDTO.status != ""'>
                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 csdr.create_at desc
    </select>

    <select id="detailDangerReport" resultType="com.panzhihua.common.model.vos.community.ComSwDangerReportVO">
        SELECT
        csdr.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.create_at AS createAt,
        cspr.create_by AS createBy,
        csdr.remark,
        csdr.danger_name AS dangerName,
        csdr.check_time AS checkTime,
        csdr.unit_name AS unitName,
        csdr.dager_description AS dagerDescription,
        csdr.danger_no AS dangerNo,
        csdr.danger_type AS dangerType,
        csdr.status,
        csdr.danger_level AS dangerLevel,
        csdr.take_steps AS takeSteps,
        csdr.steps_photo AS stepsPhoto,
        csdr.rectify_person AS rectifyPerson,
        csdr.rectify_time AS rectifyTime,
        csdr.community_suggestion AS communitySuggestion,
        csdr.street_suggestion AS streetSuggestion,
        csdr.undertake_record AS undertakeRecord,
        csdr.leader_suggestion AS leaderSuggestion,
        csdr.assign_person AS assignPerson
        FROM
        com_sw_danger_report as csdr
        left join com_sw_patrol_record_report as csprr on csprr.report_id = csdr.id
        left join com_sw_patrol_record as cspr on csprr.patrol_record_id = cspr.id
        where csdr.id = #{dangerReportId}
    </select>

    <select id="exportDangerReport" resultType="com.panzhihua.common.model.vos.community.ComSwDangerReportExcelVO" parameterType="java.util.List">
        SELECT
            cspr.patrol_person AS patrolPerson,
            cspr.address,
            csdr.remark,
            csdr.dager_description AS dagerDescription,
            csdr.danger_type AS dangerType,
            csdr.danger_level AS dangerLevel
        FROM
            com_sw_danger_report as csdr
                left join com_sw_patrol_record_report as csprr on csprr.report_id = csdr.id
                left join com_sw_patrol_record as cspr on csprr.patrol_record_id = cspr.id
        where csdr.id in
        <foreach collection="dangerReportIds" item="item" open="(" close=")" separator=",">
            #{item}
        </foreach>
    </select>
</mapper>

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

@@ -35,35 +35,35 @@

    <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
            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
            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;'>
            <if test='comSwPatrolRecordDTO.communityId != null and comSwPatrolRecordDTO.communityId != ""'>
                AND cspr.community_id = #{comSwPatrolRecordDTO.communityId}
            </if>
            <if test='comSwPatrolRecordDTO.patrolPerson != null and comSwPatrolRecordDTO.patrolPerson != &quot;&quot;'>
            <if test='comSwPatrolRecordDTO.patrolPerson != null and comSwPatrolRecordDTO.patrolPerson != ""'>
                AND cspr.patrol_person LIKE concat('%',#{comSwPatrolRecordDTO.patrolPerson},'%')
            </if>
            <if test='comSwPatrolRecordDTO.patrolType != null and comSwPatrolRecordDTO.patrolType != &quot;&quot;'>
            <if test='comSwPatrolRecordDTO.patrolType != null and comSwPatrolRecordDTO.patrolType != ""'>
                AND cspr.patrol_type = #{comSwPatrolRecordDTO.patrolType}
            </if>
            <if test='comSwPatrolRecordDTO.patrolAtBegin != null '>

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

@@ -2,20 +2,20 @@
<!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>
    <!-- 通用查询映射结果 -->
    <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 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

@@ -2,19 +2,61 @@
<!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>
    <!-- 通用查询映射结果 -->
    <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 id="Base_Column_List">
    id, remark, create_at, create_by, update_at, update_by
    </sql>

    <select id="pageSafetyWorkRecord" resultType="com.panzhihua.common.model.vos.community.ComSwSafetyWorkRecordVO">
        SELECT
        csswr.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,
        csswr.remark,
        cspr.create_at AS createAt,
        cspr.create_by AS createBy
        FROM
        com_sw_safety_work_record as csswr
        left join com_sw_patrol_record_report as csprr on csprr.report_id = csswr.id
        left join com_sw_patrol_record as cspr on csprr.patrol_record_id = cspr.id
        <where>
            <if test='comSwPatrolRecordDTO.communityId != null and comSwPatrolRecordDTO.communityId != ""'>
                AND cspr.community_id = #{comSwPatrolRecordDTO.communityId}
            </if>
            <if test='comSwPatrolRecordDTO.patrolPerson != null and comSwPatrolRecordDTO.patrolPerson != ""'>
                AND cspr.patrol_person LIKE concat('%',#{comSwPatrolRecordDTO.patrolPerson},'%')
            </if>
            <if test='comSwPatrolRecordDTO.patrolType != null and comSwPatrolRecordDTO.patrolType != ""'>
                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 csswr.create_at desc
    </select>


</mapper>