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

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BaseBuildAttachController.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-03-23
+ */
+@Controller
+@RequestMapping("/baseBuildAttach")
+public class BaseBuildAttachController {
+
+}
+

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

@@ -0,0 +1,43 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.BaseBuildExtinguish;
+import com.usky.fire.service.BaseBuildExtinguishService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 厂房灭火器 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-23
+ */
+@RestController
+@RequestMapping("/baseBuildExtinguish")
+public class BaseBuildExtinguishController {
+    @Autowired
+    private BaseBuildExtinguishService baseBuildExtinguishService;
+
+    /**
+     * 灭火器-删除
+     *
+     * @param id 主键ID
+     * @return
+     */
+    @Log(title = "灭火器-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delBaseBuildExtinguish")
+    public ApiResult<Void> delBaseBuildExtinguish(@RequestParam(value = "id") Integer id) {
+        baseBuildExtinguishService.delBaseBuildExtinguish(id);
+        return ApiResult.success();
+    }
+}
+

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

@@ -91,5 +91,16 @@ public class BscEnterpriseAutonomyController {
     public ApiResult<List<Map<String, Object>>> streetDynamic() {
         return ApiResult.success(bscEnterpriseAutonomyService.streetDynamic());
     }
+
+    /**
+     * 企业自主管理-重点单位撒点-数据查询
+     *
+     * @param companyId 单位ID
+     * @return
+     */
+    @GetMapping("scatterData")
+    public ApiResult<List<Map<String, Object>>> scatterData(@RequestParam(value = "companyId", required = false) String companyId) {
+        return ApiResult.success(bscEnterpriseAutonomyService.scatterData(companyId));
+    }
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemReportGradeController.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-03-24
+ */
+@Controller
+@RequestMapping("/demReportGrade")
+public class DemReportGradeController {
+
+}
+

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

@@ -83,6 +83,11 @@ public class BaseBuild implements Serializable {
      */
     private Integer buildStructure;
 
+    /**
+     * 防火涂层
+     */
+    private Integer fireproofCoat;
+
     /**
      * 建筑高度
      */
@@ -167,4 +172,19 @@ public class BaseBuild implements Serializable {
      * 删除标识
      */
     private String deleteFlag;
+
+    /**
+     * 消防设施系统;0、无 1、有
+     */
+    private String fireFacilitySystem;
+
+    /**
+     * 其他系统;0、无 1、有
+     */
+    private String otherSystem;
+
+    /**
+     * 其他设施
+     */
+    private String otherFacilities;
 }

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

@@ -0,0 +1,76 @@
+package com.usky.fire.domain;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 厂房建筑外联表
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseBuildAttach implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 建筑ID
+     */
+    private Integer buildId;
+
+    /**
+     * 甲类危险品生产数量（吨/月）
+     */
+    private BigDecimal hazardousProduceA;
+
+    /**
+     * 乙类危险品生产数量（吨/月）
+     */
+    private BigDecimal hazardousProduceB;
+
+    /**
+     * 丙类危险品生产数量（吨/月）
+     */
+    private BigDecimal hazardousProduceC;
+
+    /**
+     * 丁戊类危险品生产数量（吨/月）
+     */
+    private BigDecimal hazardousProduceD;
+
+    /**
+     * 甲类危险品存储数量（吨）
+     */
+    private BigDecimal hazardousStorageA;
+
+    /**
+     * 乙类危险品存储数量（吨）
+     */
+    private BigDecimal hazardousStorageB;
+
+    /**
+     * 丙类危险品存储数量（吨）
+     */
+    private BigDecimal hazardousStorageC;
+
+    /**
+     * 丁戊类危险品存储数量（吨）
+     */
+    private BigDecimal hazardousStorageD;
+
+
+}

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

@@ -0,0 +1,49 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 厂房灭火器
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseBuildExtinguish implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 建筑ID
+     */
+    private Integer buildId;
+
+    /**
+     * 灭火器类型;1、水基型灭火器 2、干粉灭火器 3、洁净气体灭火器 4、二氧化碳灭火器 5、泡沫灭火器 6、其他灭火器
+     */
+    private Integer extinguishType;
+
+    /**
+     * 灭火器数量
+     */
+    private Integer extinguishNum;
+
+    /**
+     * 删除标识
+     */
+    private String deleteFlag;
+
+}

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

@@ -247,5 +247,10 @@ public class BaseCompanyAttach1 implements Serializable {
      */
     private String construction;
 
+    /**
+     * 产证
+     */
+    private String birthCert;
+
 
 }

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

@@ -0,0 +1,81 @@
+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-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemReportGrade implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单位ID
+     */
+    private String companyId;
+
+    /**
+     * 总评分
+     */
+    private Integer totalGrade;
+
+    /**
+     * 建筑整体指数评分
+     */
+    private Integer buildIntegrity;
+
+    /**
+     * 设施状况指数评分
+     */
+    private Integer facilityStatus;
+
+    /**
+     * 自主管理指数评分
+     */
+    private Integer selfManage;
+
+    /**
+     * 监督执法指数评分
+     */
+    private Integer lawEnforce;
+
+    /**
+     * 火灾风险指数评分
+     */
+    private Integer fireRisk;
+
+    /**
+     * 统计时段
+     */
+    private String statisticPeriod;
+
+    /**
+     * 统计月份
+     */
+    private String statisticMonth;
+
+    /**
+     * 生成时间
+     */
+    private LocalDateTime createTime;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.BaseBuildAttach;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 厂房建筑外联表 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-23
+ */
+public interface BaseBuildAttachMapper extends CrudMapper<BaseBuildAttach> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.BaseBuildExtinguish;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 厂房灭火器 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-23
+ */
+public interface BaseBuildExtinguishMapper extends CrudMapper<BaseBuildExtinguish> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemReportGrade;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 报告评分 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-24
+ */
+public interface DemReportGradeMapper extends CrudMapper<DemReportGrade> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.BaseBuildAttach;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 厂房建筑外联表 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-23
+ */
+public interface BaseBuildAttachService extends CrudService<BaseBuildAttach> {
+
+}

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

@@ -0,0 +1,21 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.BaseBuildExtinguish;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 厂房灭火器 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-23
+ */
+public interface BaseBuildExtinguishService extends CrudService<BaseBuildExtinguish> {
+    /**
+     * 灭火器-删除
+     *
+     * @param id 主键ID
+     */
+    void delBaseBuildExtinguish(Integer id);
+}

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

@@ -33,4 +33,14 @@ public interface BaseDeviceStatusService extends CrudService<BaseDeviceStatus> {
      */
     int deviceStatusCount(String companyId, Integer deviceStatus);
 
+    /**
+     * 根据设备状态及设备类型查询设备数量
+     *
+     * @param companyId    单位ID
+     * @param deviceStatus 设备状态（0：离线、1：正常、2：故障、3：告警）
+     * @param deviceType 设备状态（0：离线、1：正常、2：故障、3：告警）
+     * @return
+     */
+    int deviceStatusByTypeCount(String companyId, Integer deviceStatus, Integer deviceType);
+
 }

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

@@ -98,4 +98,12 @@ public interface BscEnterpriseAutonomyService extends CrudService<BscEnterpriseA
     int alarmCount(List<String> companyIdList, Integer handlingStatus, String startDate, String endDate);
 
     List<Map<String, Object>> streetDynamic();
+
+    /**
+     * 企业自主管理-重点单位撒点-数据查询
+     *
+     * @param companyId 单位ID
+     * @return
+     */
+    List<Map<String, Object>> scatterData(String companyId);
 }

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

@@ -0,0 +1,16 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemReportGrade;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 报告评分 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-24
+ */
+public interface DemReportGradeService extends CrudService<DemReportGrade> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.usky.fire.service.impl;
+
+import com.usky.fire.domain.BaseBuildAttach;
+import com.usky.fire.mapper.BaseBuildAttachMapper;
+import com.usky.fire.service.BaseBuildAttachService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 厂房建筑外联表 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-23
+ */
+@Service
+public class BaseBuildAttachServiceImpl extends AbstractCrudService<BaseBuildAttachMapper, BaseBuildAttach> implements BaseBuildAttachService {
+
+}

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

@@ -0,0 +1,29 @@
+package com.usky.fire.service.impl;
+
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.fire.domain.BaseBuildExtinguish;
+import com.usky.fire.mapper.BaseBuildExtinguishMapper;
+import com.usky.fire.service.BaseBuildExtinguishService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 厂房灭火器 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-23
+ */
+@Service
+public class BaseBuildExtinguishServiceImpl extends AbstractCrudService<BaseBuildExtinguishMapper, BaseBuildExtinguish> implements BaseBuildExtinguishService {
+    @Override
+    public void delBaseBuildExtinguish(Integer id) {
+        BaseBuildExtinguish baseBuildExtinguish = new BaseBuildExtinguish();
+        baseBuildExtinguish.setId(id);
+        baseBuildExtinguish.setDeleteFlag("1");
+        this.updateById(baseBuildExtinguish);
+    }
+}

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

@@ -58,6 +58,12 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
     @Autowired
     private BaseBuildService baseBuildService;
 
+    @Autowired
+    private BaseBuildAttachService baseBuildAttachService;
+
+    @Autowired
+    private BaseBuildExtinguishService baseBuildExtinguishService;
+
     @Override
     public List<BaseCompany> userCompanySelect() {
         List<String> companyIdList = baseUserCompanyService.companyIdList();
@@ -567,6 +573,7 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
                 }
 
                 map.put("companyTypeName", companyTypeName);
+                map.put("companyId", list1.get(i).getCompanyId());
                 map.put("linkPhone", list1.get(i).getLinkPhone());
                 map.put("address", list1.get(i).getAddress());
                 map.put("longitude", null);
@@ -816,7 +823,7 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
         BaseCompany baseCompany = companyAddVO.getBaseCompany();
         BaseCompanyAttach1 baseCompanyAttach1 = companyAddVO.getBaseCompanyAttach1();
         BaseCompanyPerson baseCompanyPerson = companyAddVO.getBaseCompanyPerson();
-        List<BaseBuild> list;
+        List<BaseBuildAddVO> list;
         list = companyAddVO.getBaseBuildList();
         if (StringUtils.isNotBlank(baseCompany.getCompanyId())) {
             LambdaQueryWrapper<BaseCompany> queryWrapper = Wrappers.lambdaQuery();
@@ -880,20 +887,49 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
             baseCompanyPersonService.updateById(baseCompanyPerson);
             if (CollectionUtils.isNotEmpty(list)) {
                 for (int j = 0; j < list.size(); j++) {
-                    if (null!=list.get(j).getId()) {
-                        BaseBuild baseBuild;
-                        baseBuild = list.get(j);
+                    BaseBuild baseBuild = list.get(j).getBaseBuild();
+                    BaseBuildAttach baseBuildAttach = list.get(j).getBaseBuildAttach();
+                    List<BaseBuildExtinguish> list4 = list.get(j).getBaseBuildExtinguishList();
+                    if (null!=baseBuild.getId()) {
                         baseBuild.setUpdateTime(LocalDateTime.now());
                         baseBuild.setDeleteFlag("0");
                         baseBuildService.updateById(baseBuild);
+                        if (null!=baseBuildAttach.getId()) {
+                            baseBuildAttachService.updateById(baseBuildAttach);
+                        }else {
+                            baseBuildAttach.setBuildId(baseBuild.getId());
+                            baseBuildAttachService.save(baseBuildAttach);
+                        }
+                        if (CollectionUtils.isNotEmpty(list4)) {
+                            for (int k = 0; k < list4.size(); k++) {
+                                BaseBuildExtinguish baseBuildExtinguish = list4.get(k);
+                                if (null!=baseBuildExtinguish.getId()) {
+                                    baseBuildExtinguishService.updateById(baseBuildExtinguish);
+                                }else {
+                                    baseBuildExtinguish.setBuildId(baseBuild.getId());
+                                    baseBuildExtinguishService.save(baseBuildExtinguish);
+                                }
+
+                            }
+                        }
                     }else {
-                        BaseBuild baseBuild;
-                        baseBuild = list.get(j);
                         baseBuild.setCreateTime(LocalDateTime.now());
                         baseBuild.setCreator("123");
                         baseBuild.setCompanyId(baseCompany.getCompanyId());
                         baseBuild.setDeleteFlag("0");
                         baseBuildService.save(baseBuild);
+                        Integer buildId = baseBuild.getId();
+                        if (null!=baseBuildAttach){
+                            baseBuildAttach.setBuildId(buildId);
+                            baseBuildAttachService.save(baseBuildAttach);
+                        }
+                        if (CollectionUtils.isNotEmpty(list4)) {
+                            for (int k = 0; k < list4.size(); k++) {
+                                BaseBuildExtinguish baseBuildExtinguish = list4.get(k);
+                                baseBuildExtinguish.setBuildId(buildId);
+                                baseBuildExtinguishService.save(baseBuildExtinguish);
+                            }
+                        }
                     }
                 }
             }
@@ -912,13 +948,24 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
             baseCompanyPersonService.save(baseCompanyPerson);
             if (CollectionUtils.isNotEmpty(list)) {
                 for (int j = 0; j < list.size(); j++) {
-                    BaseBuild baseBuild;
-                    baseBuild = list.get(j);
+                    BaseBuild baseBuild = list.get(j).getBaseBuild();
+                    BaseBuildAttach baseBuildAttach = list.get(j).getBaseBuildAttach();
+                    List<BaseBuildExtinguish> list4 = list.get(j).getBaseBuildExtinguishList();
                     baseBuild.setCreateTime(LocalDateTime.now());
                     baseBuild.setCreator(companyAddVO.getBaseCompanyPerson().getFireManageName());
                     baseBuild.setCompanyId(uuidStr.replaceAll("-",""));
                     baseBuild.setDeleteFlag("0");
                     baseBuildService.save(baseBuild);
+                    Integer buildId = baseBuild.getId();
+                    baseBuildAttach.setBuildId(buildId);
+                    baseBuildAttachService.save(baseBuildAttach);
+                    if (CollectionUtils.isNotEmpty(list4)) {
+                        for (int k = 0; k < list4.size(); k++) {
+                            BaseBuildExtinguish baseBuildExtinguish = list4.get(k);
+                            baseBuildExtinguish.setBuildId(buildId);
+                            baseBuildExtinguishService.save(baseBuildExtinguish);
+                        }
+                    }
                 }
             }
         }
@@ -942,11 +989,13 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
             List<BaseCompanyAttach1> list2 = new ArrayList<>();
             List<BaseCompanyPerson> list3 = new ArrayList<>();
             List<BaseBuild> list4 = new ArrayList<>();
+            List<BaseBuildAttach> list5 = new ArrayList<>();
+            List<BaseBuildExtinguish> list6 = new ArrayList<>();
             if (CollectionUtils.isNotEmpty(companyIdList)) {
                 LambdaQueryWrapper<BaseCompanyAttach1> queryWrapper1 = Wrappers.lambdaQuery();
                 queryWrapper1.select(BaseCompanyAttach1::getId, BaseCompanyAttach1::getEmployeeNum,
                         BaseCompanyAttach1::getBuildArea, BaseCompanyAttach1::getCoverArea, BaseCompanyAttach1::getFixedAssets,
-                        BaseCompanyAttach1::getCompanyId)
+                        BaseCompanyAttach1::getCompanyId,BaseCompanyAttach1::getBirthCert)
                         .in(BaseCompanyAttach1::getCompanyId, companyIdList);
                 list2 = baseCompanyAttach1Service.list(queryWrapper1);
                 LambdaQueryWrapper<BaseCompanyPerson> queryWrapper2 = Wrappers.lambdaQuery();
@@ -959,11 +1008,41 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
                 queryWrapper3.select(BaseBuild::getId, BaseBuild::getBuildName, BaseBuild::getAddress,
                         BaseBuild::getBuildStructure,BaseBuild::getAboveFloor,BaseBuild::getUnderFloor,
                         BaseBuild::getBuildArea,BaseBuild::getUnderSpace,BaseBuild::getUseCharacter,
-                        BaseBuild::getCompleteYear,BaseBuild::getBuildHigh,
+                        BaseBuild::getCompleteYear,BaseBuild::getBuildHigh,BaseBuild::getFireFacilitySystem,
+                        BaseBuild::getOtherSystem,BaseBuild::getOtherFacilities,BaseBuild::getFireproofCoat,
                         BaseBuild::getCompanyId)
                         .in(BaseBuild::getCompanyId, companyIdList)
                         .eq(BaseBuild::getDeleteFlag, 0);
                 list4 = baseBuildService.list(queryWrapper3);
+                List<Integer> buildIdList = new ArrayList<>();
+                List<Integer> buildIdList1 = new ArrayList<>();
+                if (CollectionUtils.isNotEmpty(list4)) {
+                    for (int i = 0; i < list4.size(); i++) {
+                        if (list4.get(i).getUseCharacter()==19 || list4.get(i).getUseCharacter()==20){
+                            buildIdList.add(list4.get(i).getId());
+                        }
+                        buildIdList1.add(list4.get(i).getId());
+                    }
+                }
+                if (CollectionUtils.isNotEmpty(buildIdList)) {
+                    LambdaQueryWrapper<BaseBuildAttach> queryWrapper4 = Wrappers.lambdaQuery();
+                    queryWrapper4.select(BaseBuildAttach::getId, BaseBuildAttach::getBuildId,
+                            BaseBuildAttach::getHazardousProduceA,
+                            BaseBuildAttach::getHazardousProduceB,BaseBuildAttach::getHazardousProduceC,
+                            BaseBuildAttach::getHazardousProduceD,BaseBuildAttach::getHazardousStorageA,
+                            BaseBuildAttach::getHazardousStorageB,BaseBuildAttach::getHazardousStorageC,BaseBuildAttach::getHazardousStorageD)
+                            .in(BaseBuildAttach::getBuildId, buildIdList);
+                    list5 = baseBuildAttachService.list(queryWrapper4);
+                }
+                if (CollectionUtils.isNotEmpty(buildIdList1)) {
+                    LambdaQueryWrapper<BaseBuildExtinguish> queryWrapper5 = Wrappers.lambdaQuery();
+                    queryWrapper5.select(BaseBuildExtinguish::getId, BaseBuildExtinguish::getBuildId,
+                            BaseBuildExtinguish::getExtinguishNum,
+                            BaseBuildExtinguish::getExtinguishType)
+                            .in(BaseBuildExtinguish::getBuildId, buildIdList1)
+                            .eq(BaseBuildExtinguish::getDeleteFlag, 0);;
+                    list6 = baseBuildExtinguishService.list(queryWrapper5);
+                }
             }
             for (int i = 0; i < list1.size(); i++) {
                 CompanyDataVo companyDataVo = new CompanyDataVo();
@@ -981,6 +1060,7 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
                         companyDataVo.setCoverArea(list2.get(j).getCoverArea());
                         companyDataVo.setBuildArea(list2.get(j).getBuildArea());
                         companyDataVo.setFixedAssets(list2.get(j).getFixedAssets());
+                        companyDataVo.setBirthCert(list2.get(j).getBirthCert());
                     }
                 }
                 for (int j = 0; j < list3.size(); j++) {
@@ -992,11 +1072,25 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
                         companyDataVo.setFireManagePhone(list3.get(j).getFireManagePhone());
                     }
                 }
-                List<BaseBuild> list5 = new ArrayList<>();
+                List<BaseBuildAddVO> list7 = new ArrayList<>();
+                List<BaseBuildExtinguish> list8 = new ArrayList<>();
                 for (int j = 0; j < list4.size(); j++) {
                     if (list1.get(i).getCompanyId().equals(list4.get(j).getCompanyId())) {
-                        list5.add(list4.get(j));
-                        companyDataVo.setBaseBuildList(list5);
+                        BaseBuildAddVO baseBuildAddVO = new BaseBuildAddVO();
+                        baseBuildAddVO.setBaseBuild(list4.get(j));
+                        for (int k = 0; k < list5.size(); k++) {
+                            if (list4.get(j).getId()==list5.get(k).getBuildId()){
+                                baseBuildAddVO.setBaseBuildAttach(list5.get(k));
+                            }
+                        }
+                        for (int l = 0; l < list6.size(); l++) {
+                            if (list4.get(j).getId()==list6.get(l).getBuildId()){
+                                list8.add(list6.get(l));
+                                baseBuildAddVO.setBaseBuildExtinguishList(list8);
+                            }
+                        }
+                        list7.add(baseBuildAddVO);
+                        companyDataVo.setBaseBuildList(list7);
                     }
                 }
                 list.add(companyDataVo);

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

@@ -1,15 +1,19 @@
 package com.usky.fire.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.fire.domain.BaseDevice;
 import com.usky.fire.domain.BaseDeviceStatus;
 import com.usky.fire.mapper.BaseDeviceStatusMapper;
+import com.usky.fire.service.BaseDeviceService;
 import com.usky.fire.service.BaseDeviceStatusService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -23,6 +27,9 @@ import java.util.List;
 @Service
 public class BaseDeviceStatusServiceImpl extends AbstractCrudService<BaseDeviceStatusMapper, BaseDeviceStatus> implements BaseDeviceStatusService {
 
+    @Autowired
+    private BaseDeviceService baseDeviceService;
+
     @Override
     public List<BaseDeviceStatus> deviceStatusData(String deviceCode) {
         LambdaQueryWrapper<BaseDeviceStatus> queryWrapper = Wrappers.lambdaQuery();
@@ -40,4 +47,24 @@ public class BaseDeviceStatusServiceImpl extends AbstractCrudService<BaseDeviceS
         return count;
     }
 
+    @Override
+    public int deviceStatusByTypeCount(String companyId, Integer deviceStatus, Integer deviceType) {
+        LambdaQueryWrapper<BaseDevice> queryWrapper2 = Wrappers.lambdaQuery();
+        queryWrapper2.select(BaseDevice::getId, BaseDevice::getDeviceCode)
+                .eq(StringUtils.isNotBlank(companyId),BaseDevice::getCompanyId, companyId)
+                .eq(BaseDevice::getDeviceType, deviceType);
+        List<BaseDevice> list2 = baseDeviceService.list(queryWrapper2);
+        List<String> deviceCodeList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(list2)) {
+            for (int j = 0; j < list2.size(); j++) {
+                deviceCodeList.add(list2.get(j).getDeviceCode());
+            }
+        }
+        LambdaQueryWrapper<BaseDeviceStatus> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(deviceStatus != null, BaseDeviceStatus::getDeviceStatus, deviceStatus)
+                .in(BaseDeviceStatus::getDeviceCode, deviceCodeList);
+        int count = this.count(queryWrapper);
+        return count;
+    }
+
 }

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

@@ -87,6 +87,15 @@ public class BscEnterpriseAutonomyServiceImpl extends AbstractCrudService<BscEnt
     @Autowired
     private AlarmVideoService alarmVideoService;
 
+    @Autowired
+    private DemReportGradeService demReportGradeService;
+
+    @Autowired
+    private DemFireReformService demFireReformService;
+
+    @Autowired
+    private DemReformReviewService demReformReviewService;
+
 
     @Override
     public Object enterprise(String moduleType, String dataType, String streetTown){
@@ -844,4 +853,85 @@ public class BscEnterpriseAutonomyServiceImpl extends AbstractCrudService<BscEnt
         }
         return list;
     }
+    @Override
+    public List<Map<String, Object>> scatterData(String companyId) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        List<BaseCompany> list2 = new ArrayList<>();
+        LambdaQueryWrapper<BaseCompany> queryWrapper1 = Wrappers.lambdaQuery();
+        queryWrapper1.select(BaseCompany::getId, BaseCompany::getCompanyName, BaseCompany::getCompanyType,
+                BaseCompany::getLinkPhone,BaseCompany::getAddress,
+                BaseCompany::getCompanyId)
+                .eq(BaseCompany::getCompanyId, companyId);
+        list2 = baseCompanyService.list(queryWrapper1);
+        List<DemReportGrade> list3 = new ArrayList<>();
+        LambdaQueryWrapper<DemReportGrade> queryWrapper2 = Wrappers.lambdaQuery();
+        queryWrapper2.select(DemReportGrade::getId, DemReportGrade::getCompanyId, DemReportGrade::getTotalGrade,
+                DemReportGrade::getBuildIntegrity,DemReportGrade::getFacilityStatus,
+                DemReportGrade::getSelfManage,DemReportGrade::getLawEnforce,DemReportGrade::getFireRisk)
+                .eq(DemReportGrade::getCompanyId, companyId)
+                .orderByDesc(DemReportGrade::getId).last(" limit 1");
+        list3 = demReportGradeService.list(queryWrapper2);
+        List<DemFireReform> list4 = new ArrayList<>();
+        LambdaQueryWrapper<DemFireReform> queryWrapper3 = Wrappers.lambdaQuery();
+        queryWrapper3.select(DemFireReform::getId, DemFireReform::getCompanyId, DemFireReform::getReformPart,
+                DemFireReform::getSendTime,DemFireReform::getReformStatus,
+                DemFireReform::getLimitTime,DemFireReform::getReformCode)
+                .eq(DemFireReform::getCompanyId, companyId)
+                .orderByDesc(DemFireReform::getId).last(" limit 1");;
+        list4 = demFireReformService.list(queryWrapper3);
+        List<DemReformReview> list5 = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(list4)) {
+            LambdaQueryWrapper<DemReformReview> queryWrapper4 = Wrappers.lambdaQuery();
+            queryWrapper4.select(DemReformReview::getId, DemReformReview::getReformId, DemReformReview::getReformTime,
+                    DemReformReview::getReviewTime)
+                    .eq(DemReformReview::getReformId, list4.get(0).getId())
+                    .orderByDesc(DemReformReview::getId).last(" limit 1");;
+            list5 = demReformReviewService.list(queryWrapper4);
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("companyName", list2.get(0).getCompanyName());
+        map.put("companyType", list2.get(0).getCompanyType());
+        map.put("linkPhone", list2.get(0).getLinkPhone());
+        map.put("address", list2.get(0).getAddress());
+        if (CollectionUtils.isNotEmpty(list3)) {
+            map.put("totalGrade", list3.get(0).getTotalGrade());
+            map.put("buildIntegrity", list3.get(0).getBuildIntegrity());
+            map.put("facilityStatus", list3.get(0).getFacilityStatus());
+            map.put("selfManage", list3.get(0).getSelfManage());
+            map.put("lawEnforce", list3.get(0).getLawEnforce());
+            map.put("fireRisk", list3.get(0).getFireRisk());
+        }else {
+            map.put("totalGrade", 0);
+            map.put("buildIntegrity", 0);
+            map.put("facilityStatus", 0);
+            map.put("selfManage", 0);
+            map.put("lawEnforce", 0);
+            map.put("fireRisk", 0);
+        }
+        if (CollectionUtils.isNotEmpty(list4)) {
+            map.put("reformCode", list4.get(0).getReformCode());
+            map.put("limitTime", list4.get(0).getLimitTime());
+            Object data = null;
+            data = list4.get(0).getReformPart();
+            JSONObject jsonObject = JSONObject.parseObject(data.toString());
+            map.put("reformPart", jsonObject);
+            map.put("receivedTime", list4.get(0).getSendTime());
+            map.put("reformStatus", list4.get(0).getReformStatus());
+        }else {
+            map.put("reformCode", "");
+            map.put("limitTime", "");
+            map.put("reformPart", null);
+            map.put("receivedTime", "");
+            map.put("reformStatus", "");
+        }
+        if (CollectionUtils.isNotEmpty(list5)) {
+            map.put("reformTime", list5.get(0).getReformTime());
+            map.put("reviewTime", list5.get(0).getReviewTime());
+        }else {
+            map.put("reformTime", "");
+            map.put("reviewTime", "");
+        }
+        list.add(map);
+        return list;
+    }
 }

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

@@ -1,26 +1,24 @@
 package com.usky.fire.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.usky.fire.domain.BaseCompany;
-import com.usky.fire.domain.DemReportData;
-import com.usky.fire.domain.DemReportInfo;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.fire.domain.*;
 import com.usky.fire.mapper.DemReportDataMapper;
-import com.usky.fire.service.BaseCompanyService;
-import com.usky.fire.service.DemReportDataService;
+import com.usky.fire.service.*;
 import com.usky.common.mybatis.core.AbstractCrudService;
-import com.usky.fire.service.DemReportInfoService;
 import com.usky.fire.service.config.pdf.MyHeaderFooter;
 import com.usky.fire.service.config.pdf.Watermark;
+import com.usky.fire.service.vo.DemReportDataVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
 import java.io.FileOutputStream;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+
 import com.itextpdf.text.*;
 import com.itextpdf.text.pdf.*;
 import com.itextpdf.text.pdf.draw.DottedLineSeparator;
@@ -28,6 +26,7 @@ import com.itextpdf.text.pdf.draw.LineSeparator;
 
 import java.io.File;
 import java.io.FileOutputStream;
+import java.util.List;
 
 /**
  * <p>
@@ -45,6 +44,12 @@ public class DemReportDataServiceImpl extends AbstractCrudService<DemReportDataM
     @Autowired
     private DemReportInfoService demReportInfoService;
 
+    @Autowired
+    private BaseDeviceService baseDeviceService;
+
+    @Autowired
+    private BaseDeviceStatusService baseDeviceStatusService;
+
     @Override
     public void regularReportData() {
         try {
@@ -56,7 +61,8 @@ public class DemReportDataServiceImpl extends AbstractCrudService<DemReportDataM
                     Document document = new Document(PageSize.A4);// 建立一个Document对象
 
 // 2.建立一个书写器(Writer)与document对象关联
-                    File file = new File("/var/www/usky-file/202303/"+now.get(Calendar.YEAR)+now.get(Calendar.MONTH)+baseCompanies.get(i).getCompanyId()+".pdf");
+                    File file =
+                            new File("/var/www/usky-file/"+now.get(Calendar.YEAR)+"0"+now.get(Calendar.MONTH+1)+"/"+now.get(Calendar.YEAR)+now.get(Calendar.MONTH)+baseCompanies.get(i).getCompanyId()+".pdf");
 //                    File file = new File("D:\\"+now.get(Calendar.YEAR)+now.get(Calendar.MONTH)+baseCompanies.get(i).getCompanyId()+".pdf");
                     file.createNewFile();
                     PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream(file));
@@ -64,13 +70,128 @@ public class DemReportDataServiceImpl extends AbstractCrudService<DemReportDataM
                     writer.setPageEvent(new MyHeaderFooter());// 页眉/页脚
                     // 3.打开文档
                     document.open();
-                    document.addTitle("Title@PDF-Java");// 标题
-                    document.addAuthor("Author@umiz");// 作者
-                    document.addSubject("Subject@iText pdf sample");// 主题
-                    document.addKeywords("Keywords@iTextpdf");// 关键字
-                    document.addCreator("Creator@umiz`s");// 创建者
+                    document.addTitle("fire report");// 标题
+                    document.addAuthor("mhzd");// 作者
+//                    document.addSubject("Subject@iText pdf sample");// 主题
+//                    document.addKeywords("Keywords@iTextpdf");// 关键字
+//                    document.addCreator("Creator@umiz`s");// 创建者
+                    SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                    // 上月起始
+                    Calendar lastMonthFirstDateCal = Calendar.getInstance();
+                    lastMonthFirstDateCal.add(Calendar.MONTH, -1);
+                    lastMonthFirstDateCal.set(Calendar.DAY_OF_MONTH, 1);
+                    String lastMonthFirstTime = format.format(lastMonthFirstDateCal.getTime());
+                    // 上月末尾
+                    Calendar lastMonthEndDateCal = Calendar.getInstance();
+                    lastMonthEndDateCal.add(Calendar.MONTH, -1);
+                    lastMonthEndDateCal.set(
+                            Calendar.DAY_OF_MONTH, lastMonthEndDateCal.getActualMaximum(Calendar.DAY_OF_MONTH));
+                    String lastMonthEndTime = format.format(lastMonthEndDateCal.getTime());
+                    int fireDeviceNum = baseDeviceService.deviceCount(baseCompanies.get(i).getCompanyId(),1);
+                    int smokeDeviceNum = baseDeviceService.deviceCount(baseCompanies.get(i).getCompanyId(),3);
+                    int fireDeviceOfflineNum =
+                            baseDeviceStatusService.deviceStatusByTypeCount(baseCompanies.get(i).getCompanyId(),0,1);
+                    int smokeDeviceOfflineNum =
+                            baseDeviceStatusService.deviceStatusByTypeCount(baseCompanies.get(i).getCompanyId(),0,3);
+                    int fireDeviceHitchNum =
+                            baseDeviceStatusService.deviceStatusByTypeCount(baseCompanies.get(i).getCompanyId(),2,1);
+                    int smokeDeviceHitchNum =
+                            baseDeviceStatusService.deviceStatusByTypeCount(baseCompanies.get(i).getCompanyId(),2,3);
+                    int fireAlarmOfflineNum = fireDeviceOfflineNum+smokeDeviceOfflineNum;
+                    int fireAlarmHitchNum = fireDeviceHitchNum+smokeDeviceHitchNum;
+                    int fireAlarmNum = fireDeviceNum+smokeDeviceNum;
+                    double fireOnlineRate = 0;
+                    double fireFaultRate = 0;
+                    if (fireAlarmNum>0){
+                        fireOnlineRate = 1-Math.round(fireAlarmOfflineNum/fireAlarmNum*100)*0.01;
+                        fireFaultRate = Math.round(fireAlarmHitchNum/fireAlarmNum*100)*0.01;
+                    }
+                    LambdaQueryWrapper<BaseDevice> queryWrapper2 = Wrappers.lambdaQuery();
+                    queryWrapper2.select(BaseDevice::getId, BaseDevice::getDeviceCode)
+                            .eq(BaseDevice::getCompanyId, baseCompanies.get(i).getCompanyId())
+                            .in(BaseDevice::getDeviceType, 2,5,6)
+                            .notLike(BaseDevice::getDeviceName, "风机");
+                    List<BaseDevice> list2 = baseDeviceService.list(queryWrapper2);
+                    double waterOnlineRate = 0;
+                    double waterFaultRate = 0;
+                    if (CollectionUtils.isNotEmpty(list2)) {
+                        List<String> deviceCodeList = new ArrayList<>();
+                        for (int j = 0; j < list2.size(); j++) {
+                            deviceCodeList.add(list2.get(j).getDeviceCode());
+                        }
+                        List<BaseDeviceStatus> list3 = new ArrayList<>();
+                        List<BaseDeviceStatus> list3l = new ArrayList<>();
+                        if (CollectionUtils.isNotEmpty(deviceCodeList)) {
+                            LambdaQueryWrapper<BaseDeviceStatus> queryWrapper3 = Wrappers.lambdaQuery();
+                            queryWrapper3.select(BaseDeviceStatus::getId, BaseDeviceStatus::getDeviceCode)
+                                    .in(BaseDeviceStatus::getDeviceCode, deviceCodeList)
+                                    .ne(BaseDeviceStatus::getDeviceStatus,0);
+                            list3 = baseDeviceStatusService.list(queryWrapper3);
+                            waterOnlineRate = Math.round(list3.size()/list2.size()*100)*0.01;
+                            LambdaQueryWrapper<BaseDeviceStatus> queryWrapper3l = Wrappers.lambdaQuery();
+                            queryWrapper3l.select(BaseDeviceStatus::getId, BaseDeviceStatus::getDeviceCode)
+                                    .in(BaseDeviceStatus::getDeviceCode, deviceCodeList)
+                                    .eq(BaseDeviceStatus::getDeviceStatus,2);
+                            list3l = baseDeviceStatusService.list(queryWrapper3l);
+                            waterFaultRate = Math.round(list3l.size()/list2.size()*100)*0.01;
+                        }
+                    }
+                    LambdaQueryWrapper<BaseDevice> queryWrapper4 = Wrappers.lambdaQuery();
+                    queryWrapper4.select(BaseDevice::getId, BaseDevice::getDeviceCode)
+                            .eq(BaseDevice::getCompanyId, baseCompanies.get(i).getCompanyId())
+                            .eq(BaseDevice::getDeviceType, 6)
+                            .like(BaseDevice::getDeviceName, "风机");
+                    List<BaseDevice> list4 = baseDeviceService.list(queryWrapper4);
+                    double smokeOnlineRate = 0;
+                    double smokeFaultRate = 0;
+                    if (CollectionUtils.isNotEmpty(list4)) {
+                        List<String> deviceCodeList = new ArrayList<>();
+                        for (int j = 0; j < list4.size(); j++) {
+                            deviceCodeList.add(list4.get(j).getDeviceCode());
+                        }
+                        List<BaseDeviceStatus> list5 = new ArrayList<>();
+                        List<BaseDeviceStatus> list5l = new ArrayList<>();
+                        if (CollectionUtils.isNotEmpty(deviceCodeList)) {
+                            LambdaQueryWrapper<BaseDeviceStatus> queryWrapper5 = Wrappers.lambdaQuery();
+                            queryWrapper5.select(BaseDeviceStatus::getId, BaseDeviceStatus::getDeviceCode)
+                                    .in(BaseDeviceStatus::getDeviceCode, deviceCodeList)
+                                    .ne(BaseDeviceStatus::getDeviceStatus,0);
+                            list5 = baseDeviceStatusService.list(queryWrapper5);
+                            smokeOnlineRate = Math.round(list5.size()/list4.size())*0.01;
+                            LambdaQueryWrapper<BaseDeviceStatus> queryWrapper5l = Wrappers.lambdaQuery();
+                            queryWrapper5l.select(BaseDeviceStatus::getId, BaseDeviceStatus::getDeviceCode)
+                                    .in(BaseDeviceStatus::getDeviceCode, deviceCodeList)
+                                    .ne(BaseDeviceStatus::getDeviceStatus,2);
+                            list5l = baseDeviceStatusService.list(queryWrapper5l);
+                            smokeFaultRate = Math.round(list5l.size()/list4.size())*0.01;
+                        }
+                    }
+                    int efireDeviceNum = baseDeviceService.deviceCount(baseCompanies.get(i).getCompanyId(),7);
+                    int efireDeviceOfflineNum =
+                            baseDeviceStatusService.deviceStatusByTypeCount(baseCompanies.get(i).getCompanyId(),0,7);
+                    int efireDeviceHitchNum =
+                            baseDeviceStatusService.deviceStatusByTypeCount(baseCompanies.get(i).getCompanyId(),2,7);
+                    double efOnlineRate = 0;
+                    double efFaultRate = 0;
+                    if (efireDeviceNum>0){
+                        efOnlineRate = 1-Math.round(efireDeviceOfflineNum/efireDeviceNum*100)*0.01;
+                        efFaultRate = Math.round(efireDeviceHitchNum/efireDeviceNum*100)*0.01;
+                    }
+                    DemReportDataVo demReportDataVo = new DemReportDataVo();
+                    demReportDataVo.setLastMonthFirstTime(lastMonthFirstTime);
+                    demReportDataVo.setLastMonthEndTime(lastMonthEndTime);
+                    demReportDataVo.setFireOnlineRate(fireOnlineRate);
+                    demReportDataVo.setFireFaultRate(fireFaultRate);
+                    demReportDataVo.setWaterOnlineRate(waterOnlineRate);
+                    demReportDataVo.setWaterFaultRate(waterFaultRate);
+                    demReportDataVo.setSmokeOnlineRate(smokeOnlineRate);
+                    demReportDataVo.setSmokeFaultRate(smokeFaultRate);
+                    demReportDataVo.setEfOnlineRate(efOnlineRate);
+                    demReportDataVo.setEfFaultRate(efFaultRate);
 
 // 4.向文档中添加内容
+                    BaseCompany baseCompany = baseCompanies.get(i);
+
                     this.generatePDF(document,baseCompanies.get(i).getCompanyName());
 
 // 5.关闭文档

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

@@ -0,0 +1,20 @@
+package com.usky.fire.service.impl;
+
+import com.usky.fire.domain.DemReportGrade;
+import com.usky.fire.mapper.DemReportGradeMapper;
+import com.usky.fire.service.DemReportGradeService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 报告评分 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-24
+ */
+@Service
+public class DemReportGradeServiceImpl extends AbstractCrudService<DemReportGradeMapper, DemReportGrade> implements DemReportGradeService {
+
+}

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

@@ -0,0 +1,25 @@
+package com.usky.fire.service.vo;
+
+import com.usky.fire.domain.*;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-23
+ */
+@Data
+public class BaseBuildAddVO {
+
+        private BaseBuild baseBuild;
+
+        private BaseBuildAttach baseBuildAttach;
+
+        private List<BaseBuildExtinguish> baseBuildExtinguishList;
+
+}

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

@@ -0,0 +1,26 @@
+package com.usky.fire.service.vo;
+
+import com.usky.fire.domain.*;
+import lombok.Data;
+
+import java.lang.reflect.Array;
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-23
+ */
+@Data
+public class BaseBuildDataVO {
+
+        private BaseBuild baseBuild;
+
+        private Array fireFacilitySystem1;
+
+        private Array otherSystem1;
+
+}

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

@@ -25,6 +25,6 @@ public class CompanyAddVO {
 
         private BaseCompanyPerson baseCompanyPerson;
 
-        private List<BaseBuild> baseBuildList;
+        private List<BaseBuildAddVO> baseBuildList;
 
 }

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

@@ -145,9 +145,14 @@ public class CompanyDataVo implements Serializable {
      */
     private String streetTown;
 
+    /**
+     * 产证
+     */
+    private String birthCert;
+
     /**
      * 建筑清单
      */
-    private List<BaseBuild> baseBuildList;
+    private List<BaseBuildAddVO> baseBuildList;
 
 }

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

@@ -0,0 +1,217 @@
+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-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DemReportDataVo implements Serializable {
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+
+    /**
+     * 统计开始时间
+     */
+    private String lastMonthFirstTime;
+
+    /**
+     * 统计结束时间
+     */
+    private String lastMonthEndTime;
+
+    /**
+     * 火灾报警系统在线率
+     */
+    private double fireOnlineRate;
+
+    /**
+     * 火灾报警系统故障率
+     */
+    private double fireFaultRate;
+
+    /**
+     * 火灾报警系统超时未处理数量
+     */
+    private Integer fireUnhandled;
+
+    /**
+     * 消防水系统在线率
+     */
+    private double waterOnlineRate;
+
+    /**
+     * 消防水系统故障率
+     */
+    private double waterFaultRate;
+
+    /**
+     * 消防水系统超时未处理数量
+     */
+    private Integer waterUnhandled;
+
+    /**
+     * 电气火灾系统在线率
+     */
+    private double efOnlineRate;
+
+    /**
+     * 电气火灾系统故障率
+     */
+    private double efFaultRate;
+
+    /**
+     * 电气火灾系统超时未处理数量
+     */
+    private Integer efUnhandled;
+
+    /**
+     * 防排烟系统在线率
+     */
+    private double smokeOnlineRate;
+
+    /**
+     * 防排烟系统故障率
+     */
+    private double smokeFaultRate;
+
+    /**
+     * 防排烟系统超时未处理数量
+     */
+    private Integer smokeUnhandled;
+
+    /**
+     * 组织制度落实状态
+     */
+    private Integer systemStatus;
+
+    /**
+     * 灭火和应急疏散预案
+     */
+    private Integer planStatus;
+
+    /**
+     * 员工消防安全培训
+     */
+    private Integer trainStatus;
+
+    /**
+     * 消防安全管理人
+     */
+    private Integer managerStatus;
+
+    /**
+     * 消防档案
+     */
+    private Integer archivesStatus;
+
+    /**
+     * 消防重点部位
+     */
+    private Integer partsStatus;
+
+    /**
+     * 消控室持证数量
+     */
+    private Integer licenseNum;
+
+    /**
+     * 消防联动控制设备运行情况
+     */
+    private Integer fireLinkageStatus;
+
+    /**
+     * 防火检查、巡查
+     */
+    private Integer fireInspectStatus;
+
+    /**
+     * 消防设施、器材、消防安全标志定期组织维修保养
+     */
+    private Integer maintainStatus;
+
+    /**
+     * 应急演练情况
+     */
+    private Integer emergencyDrillStatus;
+
+    /**
+     * 宣传、培训记录情况
+     */
+    private Integer publicityRecordStatus;
+
+    /**
+     * 微站制度和人员落实
+     */
+    private Integer microStationStatus;
+
+    /**
+     * 和对讲抽查情况
+     */
+    private Integer intercomStatus;
+
+    /**
+     * 日常训练情况
+     */
+    private Integer dayTrainStatus;
+
+    /**
+     * 双随机检查情况近2年内检查隐患平均数
+     */
+    private Integer doubleRandomNum;
+
+    /**
+     * 近3年内处罚情况
+     */
+    private Integer punishNum;
+
+    /**
+     * 近2年内举报投诉情况
+     */
+    private Integer reportComplaintNum;
+
+    /**
+     * 重大隐患挂牌情况
+     */
+    private Integer hangShingleStatus;
+
+    /**
+     * 当年度火灾情况-一般火灾
+     */
+    private Integer generalFireNum;
+
+    /**
+     * 当年度火灾情况-较大及以上火灾
+     */
+    private Integer majorFireNum;
+
+    /**
+     * 当年度火灾情况-影响很大且具有典型意义火灾
+     */
+    private Integer fireDisasterNum;
+
+    /**
+     * 建筑清单
+     */
+    private List<BaseBuild> baseBuildList;
+
+}

service-fire/service-fire-biz/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: usky-cloud-nacos:8848
+        server-addr: 172.16.120.165:8848
       config:
         # 配置中心地址
-        server-addr: usky-cloud-nacos:8848
+        server-addr: 172.16.120.165:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

service-fire/service-fire-biz/src/main/resources/mapper/fire/BaseBuildAttachMapper.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.BaseBuildAttachMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.BaseBuildAttach">
+        <id column="id" property="id" />
+        <result column="build_id" property="buildId" />
+        <result column="hazardous_produce_a" property="hazardousProduceA" />
+        <result column="hazardous_produce_b" property="hazardousProduceB" />
+        <result column="hazardous_produce_c" property="hazardousProduceC" />
+        <result column="hazardous_produce_d" property="hazardousProduceD" />
+        <result column="hazardous_storage_a" property="hazardousStorageA" />
+        <result column="hazardous_storage_b" property="hazardousStorageB" />
+        <result column="hazardous_storage_c" property="hazardousStorageC" />
+        <result column="hazardous_storage_d" property="hazardousStorageD" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,14 @@
+<?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.BaseBuildExtinguishMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.BaseBuildExtinguish">
+        <id column="id" property="id" />
+        <result column="build_id" property="buildId" />
+        <result column="extinguish_type" property="extinguishType" />
+        <result column="extinguish_num" property="extinguishNum" />
+        <result column="delete_flag" property="deleteFlag" />
+    </resultMap>
+
+</mapper>

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

@@ -16,6 +16,7 @@
         <result column="fire_rating" property="fireRating" />
         <result column="use_character" property="useCharacter" />
         <result column="build_structure" property="buildStructure" />
+        <result column="fireproof_coat" property="fireproofCoat" />
         <result column="build_high" property="buildHigh" />
         <result column="high_type" property="highType" />
         <result column="complete_year" property="completeYear" />
@@ -32,6 +33,10 @@
         <result column="update_time" property="updateTime" />
         <result column="update_person" property="updatePerson" />
         <result column="creator" property="creator" />
+        <result column="delete_flag" property="deleteFlag" />
+        <result column="fire_facility_system" property="fireFacilitySystem" />
+        <result column="other_system" property="otherSystem" />
+        <result column="other_facilities" property="otherFacilities" />
     </resultMap>
 
 </mapper>

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

@@ -49,6 +49,7 @@
         <result column="building_height" property="buildingHeight" />
         <result column="building_structure" property="buildingStructure" />
         <result column="construction" property="construction" />
+        <result column="birth_cert" property="birthCert" />
     </resultMap>
 
 </mapper>

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.fire.mapper.DemReportGradeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemReportGrade">
+        <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
+        <result column="total_grade" property="totalGrade" />
+        <result column="build_integrity" property="buildIntegrity" />
+        <result column="facility_status" property="facilityStatus" />
+        <result column="self_manage" property="selfManage" />
+        <result column="law_enforce" property="lawEnforce" />
+        <result column="fire_risk" property="fireRisk" />
+        <result column="statistic_period" property="statisticPeriod" />
+        <result column="statistic_month" property="statisticMonth" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+</mapper>