Merge branch 'han' of uskycloud/usky-modules into master

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_street_town");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("dem_report_info");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

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

@@ -195,5 +195,16 @@ public class BaseCompanyController {
         return ApiResult.success(baseCompanyService.companyByNameSelect(companyName));
     }
 
+    /**
+     * 生成报告单位信息-列表查询
+     *
+     * @param companyIdList  单位IDlist
+     * @return
+     */
+    @PostMapping("reportCompanyList")
+    public ApiResult<List<BaseCompany>> reportCompanyList(@RequestBody List<String> companyIdList) {
+        return ApiResult.success(baseCompanyService.companySelect(companyIdList));
+    }
+
 }
 

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

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 报告数据表 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-02-28
+ */
+@Controller
+@RequestMapping("/demReportData")
+public class DemReportDataController {
+
+}
+

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

@@ -0,0 +1,75 @@
+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.BaseCompany;
+import com.usky.fire.domain.DemReportInfo;
+import com.usky.fire.service.DemReportInfoService;
+import com.usky.fire.service.vo.CompanyAddVO;
+import com.usky.fire.service.vo.CompanyDataVo;
+import com.usky.fire.service.vo.DemReportInfoIdVo;
+import com.usky.fire.service.vo.DemReportInfoVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 报告信息表 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-02
+ */
+@RestController
+@RequestMapping("/demReportInfo")
+public class DemReportInfoController {
+    @Autowired
+    private DemReportInfoService demReportInfoService;
+
+    /**
+     * 消防报告-历史报告列表查询
+     *
+     * @param companyId  单位ID
+     * @param sourceType  来源类型
+     * @param pageNum      当前页
+     * @param pageSize     每页条数
+     * @return
+     */
+    @GetMapping("reportInfoList")
+    public ApiResult<CommonPage<DemReportInfo>> reportInfoList(@RequestParam(value = "companyId", required = false) String companyId,
+                                                               @RequestParam(value = "sourceType", required = false) String sourceType,
+                                                               @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                               @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demReportInfoService.reportInfoList(companyId,sourceType,pageNum, pageSize));
+    }
+
+    /**
+     * 生成报告单位信息-列表查询
+     *
+     * @param demReportInfoVo
+     * @return
+     */
+    @PostMapping("reportInfoAdd")
+    public ApiResult<List<DemReportInfoVo>> reportInfoAdd(@RequestBody DemReportInfoVo demReportInfoVo) {
+        return ApiResult.success(demReportInfoService.reportInfoAdd(demReportInfoVo));
+    }
+
+    /**
+     * 消防报告-推送
+     *
+     * @param demReportInfoIdVo
+     * @return
+     */
+    @Log(title = "消防报告-推送", businessType = BusinessType.UPDATE)
+    @PutMapping("propelsReport")
+    public ApiResult<Void> propelsReport(@RequestBody DemReportInfoIdVo demReportInfoIdVo) {
+        demReportInfoService.propelsReport(demReportInfoIdVo);
+        return ApiResult.success();
+    }
+}
+

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

@@ -0,0 +1,101 @@
+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 han
+ * @since 2023-02-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemReportData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单位ID
+     */
+    private String companyId;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 消防安全风险提示
+     */
+    private String fireRisk;
+
+    /**
+     * 基本情况
+     */
+    private String baseSituation;
+
+    /**
+     * 存在问题
+     */
+    private String existProblem;
+
+    /**
+     * 整体指数分析
+     */
+    private String indexAnalysis;
+
+    /**
+     * 综合评分
+     */
+    private String overallScore;
+
+    /**
+     * 设备设施状况
+     */
+    private String equipmentState;
+
+    /**
+     * 设备统计
+     */
+    private String equipmentStatistic;
+
+    /**
+     * 监督执法情况
+     */
+    private String lawEnforce;
+
+    /**
+     * 火灾情况
+     */
+    private String fireSituation;
+
+    /**
+     * 统计时段
+     */
+    private String statisticPeriod;
+
+    /**
+     * 统计月份
+     */
+    private String statisticMonth;
+
+    /**
+     * 生成时间
+     */
+    private LocalDateTime createTime;
+
+
+}

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

@@ -0,0 +1,76 @@
+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 han
+ * @since 2023-03-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemReportInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单位ID
+     */
+    private String companyId;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 报告标题
+     */
+    private String reportName;
+
+    /**
+     * 报告路径
+     */
+    private String reportPath;
+
+    /**
+     * 报告生成时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 开始时间
+     */
+    private LocalDateTime startTime;
+
+    /**
+     * 结束时间
+     */
+    private LocalDateTime endTime;
+
+    /**
+     * 报告状态（0 未推送、1 已推送）
+     */
+    private Integer reportStatus;
+
+    /**
+     * 推送时间
+     */
+    private LocalDateTime sendTime;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemReportData;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 报告数据表 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-02-28
+ */
+public interface DemReportDataMapper extends CrudMapper<DemReportData> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemReportInfo;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 报告信息表 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-02
+ */
+public interface DemReportInfoMapper extends CrudMapper<DemReportInfo> {
+
+}

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

@@ -48,6 +48,8 @@ public interface BaseCompanyService extends CrudService<BaseCompany> {
      *
      * @param companyName  单位名称
      * @param organization 组织机构编码
+     * @param streetTownName 街镇名称
+     * @param companyType 单位类型
      * @param pageNum      当前页
      * @param pageSize     每页条数
      * @return
@@ -132,4 +134,11 @@ public interface BaseCompanyService extends CrudService<BaseCompany> {
      * @param companyName 单位名称
      */
     List<CompanyDataVo> companyByNameSelect(String companyName);
+
+    /**
+     * 所有单位ID的查询
+     *
+     * @return
+     */
+    List<BaseCompany> companyIdByTypeList(String companyType);
 }

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

@@ -0,0 +1,27 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemReportData;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 报告数据表 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-02-28
+ */
+public interface DemReportDataService extends CrudService<DemReportData> {
+    /**
+     * 报告数据定时生成任务逻辑
+     */
+    void regularReportData();
+
+    /**
+     * 报告生成建筑信息JSON数据查询
+     *
+     * @param companyId 单位ID
+     * @return
+     */
+    Object buildStatistics(String companyId);
+}

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

@@ -0,0 +1,46 @@
+package com.usky.fire.service;
+
+import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.domain.DemReportInfo;
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.service.vo.DemReportInfoIdVo;
+import com.usky.fire.service.vo.DemReportInfoVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 报告信息表 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-02
+ */
+public interface DemReportInfoService extends CrudService<DemReportInfo> {
+    /**
+     * 消防报告-历史报告列表查询
+     *
+     * @param companyId  单位名称
+     * @param sourceType  来源类型
+     * @param pageNum      当前页
+     * @param pageSize     每页条数
+     * @return
+     */
+    CommonPage<DemReportInfo> reportInfoList(String companyId, String sourceType,Integer pageNum, Integer pageSize);
+
+    /**
+     * 生成报告单位信息-列表查询
+     *
+     * @param demReportInfoVo
+     * @return
+     */
+    List<DemReportInfoVo> reportInfoAdd(DemReportInfoVo demReportInfoVo);
+
+    /**
+     * 消防报告-推送
+     *
+     * @param demReportInfoIdVo
+     * @return
+     */
+    void propelsReport(DemReportInfoIdVo demReportInfoIdVo);
+}

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

@@ -1004,6 +1004,16 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
         }
         return list;
     }
+
+    @Override
+    public List<BaseCompany> companyIdByTypeList(String companyType) {
+        LambdaQueryWrapper<BaseCompany> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(BaseCompany::getId,BaseCompany::getCompanyId, BaseCompany::getCompanyCode)
+                .eq(BaseCompany::getEnable, 0)
+                .eq(StringUtils.isNotBlank(companyType), BaseCompany::getStreetTown, companyType);
+        List<BaseCompany> list = this.list(queryWrapper);
+        return list;
+    }
 }
 
 

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

@@ -0,0 +1,45 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.usky.fire.domain.BaseCompany;
+import com.usky.fire.domain.DemReportData;
+import com.usky.fire.mapper.DemReportDataMapper;
+import com.usky.fire.service.BaseCompanyService;
+import com.usky.fire.service.DemReportDataService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 报告数据表 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-02-28
+ */
+@Service
+public class DemReportDataServiceImpl extends AbstractCrudService<DemReportDataMapper, DemReportData> implements DemReportDataService {
+    @Autowired
+    private BaseCompanyService baseCompanyService;
+
+    @Override
+    public void regularReportData() {
+        List<BaseCompany> baseCompanies = baseCompanyService.companyIdByTypeList("1");
+        if (CollectionUtils.isNotEmpty(baseCompanies)) {
+            for (int i = 0; i < baseCompanies.size(); i++) {
+
+            }
+        }
+    }
+
+    @Override
+    public Object buildStatistics(String companyId) {
+        Map<String, Object> map = new HashMap<>();
+        return map;
+    }
+}

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

@@ -0,0 +1,91 @@
+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.fire.domain.DemReportInfo;
+import com.usky.fire.mapper.DemReportInfoMapper;
+import com.usky.fire.service.DemReportInfoService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.fire.service.vo.CompanyDataVo;
+import com.usky.fire.service.vo.DemReportInfoIdVo;
+import com.usky.fire.service.vo.DemReportInfoVo;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 报告信息表 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-02
+ */
+@Service
+public class DemReportInfoServiceImpl extends AbstractCrudService<DemReportInfoMapper, DemReportInfo> implements DemReportInfoService {
+    @Override
+    public CommonPage<DemReportInfo> reportInfoList(String companyId,String sourceType,Integer pageNum, Integer pageSize) {
+        IPage<DemReportInfo> page = new Page<>(pageNum, pageSize);
+        LambdaQueryWrapper<DemReportInfo> queryWrapper = Wrappers.lambdaQuery();
+        if ("2".equals(sourceType)){
+            queryWrapper.eq(StringUtils.isNotBlank(companyId), DemReportInfo::getCompanyId, companyId)
+                    .eq(DemReportInfo::getReportStatus, 1)
+                    .orderByDesc(DemReportInfo::getId);
+        }else {
+            queryWrapper.eq(StringUtils.isNotBlank(companyId), DemReportInfo::getCompanyId, companyId)
+                    .orderByDesc(DemReportInfo::getId);
+        }
+        page = this.page(page, queryWrapper);
+        return ToCommonPage(page);
+    }
+
+    @Override
+    public List<DemReportInfoVo> reportInfoAdd(DemReportInfoVo demReportInfoVo) {
+        List<DemReportInfoVo> list = new ArrayList<>();
+        List<CompanyDataVo> companyList = demReportInfoVo.getCompanyList();
+        if (CollectionUtils.isNotEmpty(companyList)) {
+            for (int i = 0; i < companyList.size(); i++) {
+                DemReportInfo demReportInfo = new DemReportInfo();
+                demReportInfo.setCompanyId(companyList.get(i).getCompanyId());
+                demReportInfo.setReportName(demReportInfoVo.getReportName());
+                demReportInfo.setCreateTime(LocalDateTime.now());
+                demReportInfo.setStartTime(demReportInfoVo.getStartTime());
+                demReportInfo.setEndTime(demReportInfoVo.getEndTime());
+                demReportInfo.setReportStatus(0);
+                this.save(demReportInfo);
+                int ID = demReportInfo.getId();
+                DemReportInfoVo demReportInfoVo1 = new DemReportInfoVo();
+                demReportInfoVo1.setId(ID);
+                demReportInfoVo1.setCompanyName(companyList.get(i).getCompanyName());
+                demReportInfoVo1.setCompanyId(companyList.get(i).getCompanyId());
+                list.add(demReportInfoVo1);
+            }
+        }
+        return list;
+    }
+
+    @Transactional
+    @Override
+    public void propelsReport(DemReportInfoIdVo demReportInfoIdVo) {
+        List<Integer> reportInfoIdList = demReportInfoIdVo.getReportIdList();
+        if (CollectionUtils.isNotEmpty(reportInfoIdList)) {
+            for (int i = 0; i < reportInfoIdList.size(); i++) {
+                DemReportInfo demReportInfo = new DemReportInfo();
+                demReportInfo.setId(reportInfoIdList.get(i));
+                demReportInfo.setReportStatus(1);
+                demReportInfo.setSendTime(LocalDateTime.now());
+                this.updateById(demReportInfo);
+            }
+        }
+    }
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemReportInfoIdVo.java

@@ -0,0 +1,31 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.usky.fire.domain.BaseBuild;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DemReportInfoIdVo implements Serializable {
+    /**
+     * 报告Id集合
+     */
+    private List<Integer> reportIdList;
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemReportInfoVo.java

@@ -0,0 +1,63 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.usky.fire.domain.BaseBuild;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DemReportInfoVo implements Serializable {
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 报告标题
+     */
+    private String reportName;
+
+    /**
+     * 开始时间
+     */
+    private LocalDateTime startTime;
+
+    /**
+     * 结束时间
+     */
+    private LocalDateTime endTime;
+
+    /**
+     * 单位ID
+     */
+    private String companyId;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+
+    /**
+     * 单位清单集合
+     */
+    private List<CompanyDataVo> companyList;
+
+}

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

@@ -0,0 +1,24 @@
+<?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.DemReportDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemReportData">
+        <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
+        <result column="company_code" property="companyCode" />
+        <result column="fire_risk" property="fireRisk" />
+        <result column="base_situation" property="baseSituation" />
+        <result column="exist_problem" property="existProblem" />
+        <result column="index_analysis" property="indexAnalysis" />
+        <result column="overall_score" property="overallScore" />
+        <result column="equipment_state" property="equipmentState" />
+        <result column="equipment_statistic" property="equipmentStatistic" />
+        <result column="law_enforce" property="lawEnforce" />
+        <result column="fire_situation" property="fireSituation" />
+        <result column="statistic_period" property="statisticPeriod" />
+        <result column="statistic_month" property="statisticMonth" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,19 @@
+<?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.DemReportInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemReportInfo">
+        <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
+        <result column="company_code" property="companyCode" />
+        <result column="report_name" property="reportName" />
+        <result column="report_path" property="reportPath" />
+        <result column="create_time" property="createTime" />
+        <result column="start_time" property="startTime" />
+        <result column="end_time" property="endTime" />
+        <result column="report_status" property="reportStatus" />
+        <result column="send_time" property="sendTime" />
+    </resultMap>
+
+</mapper>