执法检查数据相关模块查询

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/MybatisGeneratorUtils.java

@@ -71,7 +71,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude("base_company_attach2");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("dem_enforce_inspect_record");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemEnforceInspectRecordController.java

@@ -0,0 +1,72 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemEnforceInspectRecord;
+import com.usky.fire.service.DemEnforceInspectRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 消防监督检查记录 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-22
+ */
+@RestController
+@RequestMapping("/demEnforceInspectRecord")
+public class DemEnforceInspectRecordController {
+
+    @Autowired
+    private DemEnforceInspectRecordService demEnforceInspectRecordService;
+
+    /**
+     * 执法检查数据-列表查询
+     *
+     * @param projectCode 项目编号
+     * @param companyName 单位编号
+     * @param pageNum     当前页
+     * @param pageSize    每页条数
+     * @return
+     */
+    @GetMapping("enforceInspectRecordList")
+    public ApiResult<CommonPage<Object>> enforceInspectRecordList(@RequestParam(value = "projectCode", required = false) String projectCode,
+                                                                  @RequestParam(value = "companyName", required = false) String companyName,
+                                                                  @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                  @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demEnforceInspectRecordService.enforceInspectRecordList(projectCode, companyName, pageNum, pageSize));
+    }
+
+    /**
+     * 执法检查数据-修改
+     *
+     * @param demEnforceInspectRecord
+     * @return
+     */
+    @Log(title = "执法检查数据-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateEnforceInspectRecord")
+    public ApiResult<Void> updateEnforceInspectRecord(@RequestBody DemEnforceInspectRecord demEnforceInspectRecord) {
+        demEnforceInspectRecordService.updateEnforceInspectRecord(demEnforceInspectRecord);
+        return ApiResult.success();
+    }
+
+    /**
+     * 执法检查数据-删除
+     *
+     * @param id 主键ID
+     * @return
+     */
+    @Log(title = "执法检查数据-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delEnforceInspectRecord")
+    public ApiResult<Void> delEnforceInspectRecord(@RequestParam(value = "id") Integer id) {
+        demEnforceInspectRecordService.delEnforceInspectRecord(id);
+        return ApiResult.success();
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DemEnforceInspectRecord.java

@@ -0,0 +1,376 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 消防监督检查记录
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemEnforceInspectRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * ID
+     */
+    private String projectId;
+
+    /**
+     * 项目编号
+     */
+    private String projectCode;
+
+    /**
+     * 检查描述
+     */
+    private String inspectDescript;
+
+    /**
+     * 检查形式类别
+     */
+    private Integer inspectType;
+
+    /**
+     * 检查形式名称
+     */
+    private String inspectName;
+
+    /**
+     * 文号1
+     */
+    private String documentNumber1;
+
+    /**
+     * 文号2
+     */
+    private String documentNumber2;
+
+    /**
+     * 文号3
+     */
+    private String documentNumber3;
+
+    /**
+     * 文号4
+     */
+    private String documentNumber4;
+
+    /**
+     * 文号
+     */
+    private String documentNumber;
+
+    /**
+     * 文书抬头
+     */
+    private String paperTitle;
+
+    /**
+     * 被查单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 被检查单位（场所）名称
+     */
+    private String companyName;
+
+    /**
+     * 单位地址
+     */
+    private String companyAddress;
+
+    /**
+     * 消防安全责任人姓名
+     */
+    private String fireDutyName;
+
+    /**
+     * 消防安全责任人电话
+     */
+    private String fireDutyPhone;
+
+    /**
+     * 消防安全管理人姓名
+     */
+    private String fireManageName;
+
+    /**
+     * 消防安全管理人电话
+     */
+    private String fireManagePhone;
+
+    /**
+     * 单位联系人
+     */
+    private String linkPerson;
+
+    /**
+     * 单位联系电话
+     */
+    private String linkPhone;
+
+    /**
+     * 单位性质编号
+     */
+    private Integer companyNatureCode;
+
+    /**
+     * 单位性质名称
+     */
+    private String companyNatureName;
+
+    /**
+     * 消防监督检查员
+     */
+    private String enforceInspectPerson;
+
+    /**
+     * 检查起始时间
+     */
+    private LocalDateTime inspectStartTime;
+
+    /**
+     * 检查结束时间
+     */
+    private LocalDateTime inspectEndTime;
+
+    /**
+     * 被检查单位随同检查人员
+     */
+    private String companyInspectPerson;
+
+    /**
+     * 被检查单位主管人员
+     */
+    private String companyManagePerson;
+
+    /**
+     * 消防许可及验收备案内容
+     */
+    private String allowRecordContent;
+
+    /**
+     * 消防安全管理内容
+     */
+    private String safeManageContent;
+
+    /**
+     * 建筑防火内容
+     */
+    private String fireProtectContent;
+
+    /**
+     * 安全疏散内容
+     */
+    private String safeEvacuatContent;
+
+    /**
+     * 消防控制室内容
+     */
+    private String fireControlContent;
+
+    /**
+     * 消防设施器材-火灾自动报警系统内容
+     */
+    private String fireSystemFacilities;
+
+    /**
+     * 消防设施器材-消防给水设施
+     */
+    private String waterSupplyFacilities;
+
+    /**
+     * 消防设施器材-自动灭火系统-自动喷水灭火系统
+     */
+    private String waterSprayFacilities;
+
+    /**
+     * 消防设施器材-自动灭火系统-其它自动灭火系统
+     */
+    private String autoFireFacilities;
+
+    /**
+     * 消防设施器材-其它设施器材
+     */
+    private String otherFacilities;
+
+    /**
+     * 其他消防安全管理
+     */
+    private String otherSafeManage;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 建筑面积
+     */
+    private String buildArea;
+
+    /**
+     * 建筑层数
+     */
+    private String buildFloor;
+
+    /**
+     * 建筑高度
+     */
+    private String buildHigh;
+
+    /**
+     * 违法行为
+     */
+    private String illegalAct;
+
+    /**
+     * 处理情况
+     */
+    private String handlingSituation;
+
+    /**
+     * 检查是否合格
+     */
+    private Integer inspectQualified;
+
+    /**
+     * 后续文书是否出过
+     */
+    private Integer subsequentPaper;
+
+    /**
+     * 是否复查
+     */
+    private Integer reviewSituation;
+
+    /**
+     * 审批人账号
+     */
+    private String approver;
+
+    /**
+     * 审批人姓名
+     */
+    private String approverName;
+
+    /**
+     * 审批时间
+     */
+    private LocalDateTime approvalTime;
+
+    /**
+     * 主管单位
+     */
+    private String competentUnit;
+
+    /**
+     * 创建人姓名
+     */
+    private String creatorName;
+
+    /**
+     * 创建IP
+     */
+    private String createIp;
+
+    /**
+     * 修改人姓名
+     */
+    private String updateName;
+
+    /**
+     * 修改IP
+     */
+    private String updateIp;
+
+    /**
+     * 版本号
+     */
+    private String versionNumber;
+
+    /**
+     * 使能标识
+     */
+    private Integer enable;
+
+    /**
+     * 备用字段1
+     */
+    private String alternateField1;
+
+    /**
+     * 备用字段2
+     */
+    private String alternateField2;
+
+    /**
+     * 备用字段3
+     */
+    private String alternateField3;
+
+    /**
+     * 备用字段4
+     */
+    private String alternateField4;
+
+    /**
+     * 备用字段5
+     */
+    private String alternateField5;
+
+    /**
+     * YXMJZRQ
+     */
+    private LocalDateTime yxmjzrq;
+
+    /**
+     * YTXJZRQ
+     */
+    private LocalDateTime ytxjzrq;
+
+    /**
+     * Row_Version
+     */
+    private String rowVersion;
+
+    /**
+     * frdb
+     */
+    private String frdb;
+
+    /**
+     * lawID
+     */
+    private String lawId;
+
+    /**
+     * BDP_AUDIT
+     */
+    private String bdpAudit;
+
+    /**
+     * unionKey
+     */
+    private String unionKey;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/DemEnforceInspectRecordMapper.java

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemEnforceInspectRecord;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 消防监督检查记录 Mapper 接口
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-22
+ */
+public interface DemEnforceInspectRecordMapper extends CrudMapper<DemEnforceInspectRecord> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemEnforceInspectRecordService.java

@@ -0,0 +1,41 @@
+package com.usky.fire.service;
+
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.domain.DemEnforceInspectRecord;
+
+/**
+ * <p>
+ * 消防监督检查记录 服务类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-22
+ */
+public interface DemEnforceInspectRecordService extends CrudService<DemEnforceInspectRecord> {
+
+    /**
+     * 执法检查数据-列表查询
+     *
+     * @param projectCode 项目编号
+     * @param companyName 单位编号
+     * @param pageNum     当前页
+     * @param pageSize    每页条数
+     * @return
+     */
+    CommonPage<Object> enforceInspectRecordList(String projectCode, String companyName, Integer pageNum, Integer pageSize);
+
+    /**
+     * 执法检查数据-修改
+     *
+     * @param demEnforceInspectRecord
+     */
+    void updateEnforceInspectRecord(DemEnforceInspectRecord demEnforceInspectRecord);
+
+    /**
+     * 执法检查数据-删除
+     *
+     * @param id 主键ID
+     */
+    void delEnforceInspectRecord(Integer id);
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemEnforceInspectRecordServiceImpl.java

@@ -0,0 +1,101 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.core.util.IpUtils;
+import com.usky.common.core.util.ServletUtils;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.fire.domain.DemEnforceInspectRecord;
+import com.usky.fire.mapper.DemEnforceInspectRecordMapper;
+import com.usky.fire.service.DemEnforceInspectRecordService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 消防监督检查记录 服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-22
+ */
+@Service
+public class DemEnforceInspectRecordServiceImpl extends AbstractCrudService<DemEnforceInspectRecordMapper, DemEnforceInspectRecord> implements DemEnforceInspectRecordService {
+
+    @Override
+    public CommonPage<Object> enforceInspectRecordList(String projectCode, String companyName, Integer pageNum, Integer pageSize) {
+        List<Object> list = new ArrayList<>();
+        IPage<DemEnforceInspectRecord> page = new Page<>(pageNum, pageSize);
+        LambdaQueryWrapper<DemEnforceInspectRecord> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemEnforceInspectRecord::getId, DemEnforceInspectRecord::getProjectCode, DemEnforceInspectRecord::getCompanyName,
+                DemEnforceInspectRecord::getCompanyAddress, DemEnforceInspectRecord::getInspectDescript, DemEnforceInspectRecord::getInspectName,
+                DemEnforceInspectRecord::getFireDutyName, DemEnforceInspectRecord::getFireDutyPhone, DemEnforceInspectRecord::getFireManageName,
+                DemEnforceInspectRecord::getFireManagePhone, DemEnforceInspectRecord::getCompanyNatureName, DemEnforceInspectRecord::getEnforceInspectPerson,
+                DemEnforceInspectRecord::getSafeManageContent, DemEnforceInspectRecord::getFireProtectContent, DemEnforceInspectRecord::getSafeEvacuatContent,
+                DemEnforceInspectRecord::getBuildArea, DemEnforceInspectRecord::getBuildFloor, DemEnforceInspectRecord::getBuildHigh,
+                DemEnforceInspectRecord::getIllegalAct, DemEnforceInspectRecord::getHandlingSituation, DemEnforceInspectRecord::getInspectQualified)
+                .eq(DemEnforceInspectRecord::getEnable, 0)
+                .like(StringUtils.isNotBlank(projectCode), DemEnforceInspectRecord::getProjectCode, projectCode)
+                .like(StringUtils.isNotBlank(companyName), DemEnforceInspectRecord::getCompanyName, companyName)
+                .orderByDesc(DemEnforceInspectRecord::getId);
+        page = this.page(page, queryWrapper);
+        if (CollectionUtils.isNotEmpty(page.getRecords())) {
+            for (int i = 0; i < page.getRecords().size(); i++) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("id", page.getRecords().get(i).getId());
+                map.put("projectCode", page.getRecords().get(i).getProjectCode());
+                map.put("companyName", page.getRecords().get(i).getCompanyName());
+                map.put("companyAddress", page.getRecords().get(i).getCompanyAddress());
+                map.put("inspectDescript", page.getRecords().get(i).getInspectDescript());
+                map.put("inspectName", page.getRecords().get(i).getInspectName());
+                map.put("fireDutyName", page.getRecords().get(i).getFireDutyName());
+                map.put("fireDutyPhone", page.getRecords().get(i).getFireDutyPhone());
+                map.put("fireManageName", page.getRecords().get(i).getFireManageName());
+                map.put("fireManagePhone", page.getRecords().get(i).getFireManagePhone());
+                map.put("companyNatureName", page.getRecords().get(i).getCompanyNatureName());
+                map.put("enforceInspectPerson", page.getRecords().get(i).getEnforceInspectPerson());
+                map.put("safeManageContent", page.getRecords().get(i).getSafeManageContent());
+                map.put("fireProtectContent", page.getRecords().get(i).getFireProtectContent());
+                map.put("safeEvacuatContent", page.getRecords().get(i).getSafeEvacuatContent());
+                map.put("buildArea", page.getRecords().get(i).getBuildArea());
+                map.put("buildFloor", page.getRecords().get(i).getBuildFloor());
+                map.put("buildHigh", page.getRecords().get(i).getBuildHigh());
+                map.put("illegalAct", page.getRecords().get(i).getIllegalAct());
+                map.put("handlingSituation", page.getRecords().get(i).getHandlingSituation());
+                map.put("inspectQualified", page.getRecords().get(i).getInspectQualified());
+                list.add(map);
+            }
+        }
+        return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
+    }
+
+    @Override
+    public void updateEnforceInspectRecord(DemEnforceInspectRecord demEnforceInspectRecord) {
+        String ipAddr = IpUtils.getIpAddr(ServletUtils.getRequest());
+        demEnforceInspectRecord.setUpdateIp(ipAddr);
+        demEnforceInspectRecord.setUpdateName(SecurityUtils.getLoginUser().getSysPerson().getFullName());
+        this.updateById(demEnforceInspectRecord);
+    }
+
+    @Override
+    public void delEnforceInspectRecord(Integer id) {
+        DemEnforceInspectRecord demEnforceInspectRecord = new DemEnforceInspectRecord();
+        String ipAddr = IpUtils.getIpAddr(ServletUtils.getRequest());
+        demEnforceInspectRecord.setUpdateName(SecurityUtils.getLoginUser().getSysPerson().getFullName());
+        demEnforceInspectRecord.setUpdateIp(ipAddr);
+        demEnforceInspectRecord.setId(id);
+        demEnforceInspectRecord.setEnable(1);
+        this.updateById(demEnforceInspectRecord);
+    }
+
+}

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemEnforceInspectRecordMapper.xml

@@ -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.usky.fire.mapper.DemEnforceInspectRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemEnforceInspectRecord">
+        <id column="id" property="id" />
+        <result column="project_id" property="projectId" />
+        <result column="project_code" property="projectCode" />
+        <result column="inspect_descript" property="inspectDescript" />
+        <result column="inspect_type" property="inspectType" />
+        <result column="inspect_name" property="inspectName" />
+        <result column="document_number1" property="documentNumber1" />
+        <result column="document_number2" property="documentNumber2" />
+        <result column="document_number3" property="documentNumber3" />
+        <result column="document_number4" property="documentNumber4" />
+        <result column="document_number" property="documentNumber" />
+        <result column="paper_title" property="paperTitle" />
+        <result column="company_code" property="companyCode" />
+        <result column="company_name" property="companyName" />
+        <result column="company_address" property="companyAddress" />
+        <result column="fire_duty_name" property="fireDutyName" />
+        <result column="fire_duty_phone" property="fireDutyPhone" />
+        <result column="fire_manage_name" property="fireManageName" />
+        <result column="fire_manage_phone" property="fireManagePhone" />
+        <result column="link_person" property="linkPerson" />
+        <result column="link_phone" property="linkPhone" />
+        <result column="company_nature_code" property="companyNatureCode" />
+        <result column="company_nature_name" property="companyNatureName" />
+        <result column="enforce_inspect_person" property="enforceInspectPerson" />
+        <result column="inspect_start_time" property="inspectStartTime" />
+        <result column="inspect_end_time" property="inspectEndTime" />
+        <result column="company_inspect_person" property="companyInspectPerson" />
+        <result column="company_manage_person" property="companyManagePerson" />
+        <result column="allow_record_content" property="allowRecordContent" />
+        <result column="safe_manage_content" property="safeManageContent" />
+        <result column="fire_protect_content" property="fireProtectContent" />
+        <result column="safe_evacuat_content" property="safeEvacuatContent" />
+        <result column="fire_control_content" property="fireControlContent" />
+        <result column="fire_system_facilities" property="fireSystemFacilities" />
+        <result column="water_supply_facilities" property="waterSupplyFacilities" />
+        <result column="water_spray_facilities" property="waterSprayFacilities" />
+        <result column="auto_fire_facilities" property="autoFireFacilities" />
+        <result column="other_facilities" property="otherFacilities" />
+        <result column="other_safe_manage" property="otherSafeManage" />
+        <result column="remark" property="remark" />
+        <result column="build_area" property="buildArea" />
+        <result column="build_floor" property="buildFloor" />
+        <result column="build_high" property="buildHigh" />
+        <result column="illegal_act" property="illegalAct" />
+        <result column="handling_situation" property="handlingSituation" />
+        <result column="inspect_qualified" property="inspectQualified" />
+        <result column="subsequent_paper" property="subsequentPaper" />
+        <result column="review_situation" property="reviewSituation" />
+        <result column="approver" property="approver" />
+        <result column="approver_name" property="approverName" />
+        <result column="approval_time" property="approvalTime" />
+        <result column="competent_unit" property="competentUnit" />
+        <result column="creator_name" property="creatorName" />
+        <result column="create_ip" property="createIp" />
+        <result column="update_name" property="updateName" />
+        <result column="update_ip" property="updateIp" />
+        <result column="version_number" property="versionNumber" />
+        <result column="enable" property="enable" />
+        <result column="alternate_field1" property="alternateField1" />
+        <result column="alternate_field2" property="alternateField2" />
+        <result column="alternate_field3" property="alternateField3" />
+        <result column="alternate_field4" property="alternateField4" />
+        <result column="alternate_field5" property="alternateField5" />
+        <result column="yxmjzrq" property="yxmjzrq" />
+        <result column="ytxjzrq" property="ytxjzrq" />
+        <result column="row_version" property="rowVersion" />
+        <result column="frdb" property="frdb" />
+        <result column="law_id" property="lawId" />
+        <result column="bdp_audit" property="bdpAudit" />
+        <result column="union_key" property="unionKey" />
+    </resultMap>
+
+</mapper>