火灾事故说明相关接口开发（暂时没有设计原稿，不完整接口）

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

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemFileLabelController.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 JCB
+ * @since 2022-09-14
+ */
+@Controller
+@RequestMapping("/demFileLabel")
+public class DemFileLabelController {
+
+}
+

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

@@ -3,7 +3,6 @@ package com.usky.fire.controller.web;
 
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
-import com.usky.fire.domain.DemFireStatistics;
 import com.usky.fire.service.DemFireStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,22 +26,22 @@ public class DemFireAccidentDescController {
     private DemFireStatisticsService demFireStatisticsService;
 
     /**
-     * 火灾事故说明信息列表查询
+     * 火灾数据管理-列表查询
      *
-     * @param companyCode 单位编号
-     * @param startDate   开始时间
-     * @param endDate     结束时间
-     * @param pageNum     当前页
-     * @param pageSize    每页条数
+     * @param fireNumber 火灾序号
+     * @param labelId    标签ID
+     * @param classifyId 分类ID
+     * @param pageNum    当前页
+     * @param pageSize   每页条数
      * @return
      */
-    @GetMapping("fireAccidentExplainList")
-    public ApiResult<CommonPage<DemFireStatistics>> fireAccidentExplainList(@RequestParam(value = "companyCode", required = false) String companyCode,
-                                                                            @RequestParam(value = "startDate", required = false) String startDate,
-                                                                            @RequestParam(value = "endDate", required = false) String endDate,
-                                                                            @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
-                                                                            @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
-        return ApiResult.success(demFireStatisticsService.fireAccidentStatistic(companyCode, startDate, endDate, pageNum, pageSize));
+    @GetMapping("fireAccidentStatistic")
+    public ApiResult<CommonPage<Object>> fireAccidentStatistic(@RequestParam(value = "fireNumber", required = false) String fireNumber,
+                                                               @RequestParam(value = "labelId", required = false, defaultValue = "0") Integer labelId,
+                                                               @RequestParam(value = "classifyId", required = false, defaultValue = "0") Integer classifyId,
+                                                               @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                               @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demFireStatisticsService.fireAccidentStatistic(fireNumber, labelId, classifyId, pageNum, pageSize));
     }
 }
 

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

@@ -0,0 +1,69 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.List;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemFileLabel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 父ID
+     */
+    private Integer fid;
+
+    /**
+     * 标签名称
+     */
+    private String labelName;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 更新人
+     */
+    private String updatePerson;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 子集
+     */
+    @TableField(exist = false)
+    private List<DemFileLabel> subset;
+
+}

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

@@ -2,11 +2,12 @@ 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;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 火灾统计表
@@ -242,6 +243,16 @@ public class DemFireStatistics implements Serializable {
      */
     private String administrativeDivision;
 
+    /**
+     * 标签ID
+     */
+    private Integer labelId;
+
+    /**
+     * 分类ID
+     */
+    private Integer classifyId;
+
     /**
      * 创建人
      */

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemFileLabel;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-14
+ */
+public interface DemFileLabelMapper extends CrudMapper<DemFileLabel> {
+
+}

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

@@ -0,0 +1,47 @@
+package com.usky.fire.service;
+
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.domain.DemFileLabel;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-14
+ */
+public interface DemFileLabelService extends CrudService<DemFileLabel> {
+
+    /**
+     * 标签-列表
+     *
+     * @param fid       父ID
+     * @param labelName 标签名称
+     * @return
+     */
+    List<DemFileLabel> demFileLabelList(Integer fid, String labelName,List<Integer> idList);
+
+    /**
+     * 标签-新增
+     *
+     * @param demFileLabel
+     */
+    void addDemFileLabel(DemFileLabel demFileLabel);
+
+    /**
+     * 标签-修改
+     *
+     * @param demFileLabel
+     */
+    void updateDemFileLabel(DemFileLabel demFileLabel);
+
+    /**
+     * 标签-删除
+     *
+     * @param id 主键ID
+     */
+    void delDemFileLabel(Integer id);
+}

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

@@ -2,11 +2,8 @@ package com.usky.fire.service;
 
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
-import com.usky.fire.domain.DemFireAccidentDesc;
 import com.usky.fire.domain.DemFireStatistics;
 
-import java.util.List;
-
 /**
  * <p>
  * 火灾统计表 服务类
@@ -17,12 +14,17 @@ import java.util.List;
  */
 public interface DemFireStatisticsService extends CrudService<DemFireStatistics> {
 
+
     /**
-     * 火灾统计表 数据查询
+     * 火灾数据管理-列表查询
      *
-     * @param companyCode
+     * @param fireNumber 火灾序号
+     * @param labelId    标签ID
+     * @param classifyId 分类ID
+     * @param pageNum    当前页
+     * @param pageSize   每页条数
      * @return
      */
-    CommonPage<DemFireStatistics> fireAccidentStatistic(String companyCode, String startDate, String endDate, Integer pageNum, Integer pageSize);
+    CommonPage<Object> fireAccidentStatistic(String fireNumber, Integer labelId, Integer classifyId, Integer pageNum, Integer pageSize);
 
 }

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

@@ -0,0 +1,77 @@
+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.core.exception.BusinessException;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.fire.domain.DemFileLabel;
+import com.usky.fire.mapper.DemFileLabelMapper;
+import com.usky.fire.service.DemFileLabelService;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-14
+ */
+@Service
+public class DemFileLabelServiceImpl extends AbstractCrudService<DemFileLabelMapper, DemFileLabel> implements DemFileLabelService {
+
+    @Override
+    public List<DemFileLabel> demFileLabelList(Integer fid,String labelName,List<Integer> idList) {
+        LambdaQueryWrapper<DemFileLabel> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemFileLabel::getId, DemFileLabel::getFid, DemFileLabel::getLabelName)
+                .eq(fid != null, DemFileLabel::getFid, fid)
+                .in(CollectionUtils.isNotEmpty(idList), DemFileLabel::getId, idList)
+                .like(StringUtils.isNotBlank(labelName), DemFileLabel::getLabelName, labelName)
+                .orderByDesc(DemFileLabel::getId);
+        List<DemFileLabel> list = this.list(queryWrapper);
+        return list;
+    }
+
+    @Override
+    public void addDemFileLabel(DemFileLabel demFileLabel) {
+        LambdaQueryWrapper<DemFileLabel> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemFileLabel::getId, DemFileLabel::getFid, DemFileLabel::getLabelName)
+                .eq(DemFileLabel::getFid, demFileLabel.getFid())
+                .eq(DemFileLabel::getLabelName, demFileLabel.getLabelName());
+        int count = this.count(queryWrapper);
+        if (count > 0) {
+            throw new BusinessException("表签名/分类名不可重复");
+        }
+        demFileLabel.setCreateTime(LocalDateTime.now());
+        demFileLabel.setCreator(SecurityUtils.getUsername());
+        this.save(demFileLabel);
+    }
+
+    @Override
+    public void updateDemFileLabel(DemFileLabel demFileLabel) {
+        LambdaQueryWrapper<DemFileLabel> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemFileLabel::getId, DemFileLabel::getFid, DemFileLabel::getLabelName)
+                .eq(DemFileLabel::getFid, demFileLabel.getFid())
+                .eq(DemFileLabel::getLabelName, demFileLabel.getLabelName())
+                .ne(DemFileLabel::getId, demFileLabel.getId());
+        int count = this.count(queryWrapper);
+        if (count > 0) {
+            throw new BusinessException("表签名/分类名不可重复");
+        }
+        demFileLabel.setUpdatePerson(SecurityUtils.getUsername());
+        demFileLabel.setUpdateTime(LocalDateTime.now());
+        this.updateById(demFileLabel);
+    }
+
+    @Override
+    public void delDemFileLabel(Integer id) {
+        this.removeById(id);
+    }
+
+}

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

@@ -2,18 +2,26 @@ 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.mybatis.core.AbstractCrudService;
-import com.usky.fire.domain.DemFireAccidentDesc;
+import com.usky.fire.domain.DemFileLabel;
 import com.usky.fire.domain.DemFireStatistics;
+import com.usky.fire.domain.DemFireStatisticsAttach;
 import com.usky.fire.mapper.DemFireStatisticsMapper;
+import com.usky.fire.service.DemFileLabelService;
+import com.usky.fire.service.DemFireStatisticsAttachService;
 import com.usky.fire.service.DemFireStatisticsService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,19 +34,115 @@ import java.util.List;
 @Service
 public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireStatisticsMapper, DemFireStatistics> implements DemFireStatisticsService {
 
+    @Autowired
+    private DemFireStatisticsAttachService demFireStatisticsAttachService;
+
+    @Autowired
+    private DemFileLabelService demFileLabelService;
+
     @Override
-    public CommonPage<DemFireStatistics> fireAccidentStatistic(String companyCode, String startDate, String endDate, Integer pageNum, Integer pageSize) {
+    public CommonPage<Object> fireAccidentStatistic(String fireNumber, Integer labelId, Integer classifyId, Integer pageNum, Integer pageSize) {
         IPage<DemFireStatistics> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<DemFireStatistics> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(DemFireStatistics::getBurnedArea, DemFireStatistics::getDirectPropertyLoss, DemFireStatistics::getVictimNumber,
                 DemFireStatistics::getInjuredNumber, DemFireStatistics::getDeathToll, DemFireStatistics::getFileCase, DemFireStatistics::getFireGrade,
                 DemFireStatistics::getSubordinateDetachment, DemFireStatistics::getAdministrativeDivision, DemFireStatistics::getFireNumber,
-                DemFireStatistics::getFireAddress, DemFireStatistics::getFireTime, DemFireStatistics::getId)
-                .eq(StringUtils.isNotBlank(companyCode), DemFireStatistics::getCompanyCode, companyCode)
-                .between(StringUtils.isNotBlank(startDate) & StringUtils.isNotBlank(endDate), DemFireStatistics::getFillTime, startDate, endDate)
+                DemFireStatistics::getFireAddress, DemFireStatistics::getFireTime, DemFireStatistics::getId, DemFireStatistics::getLabelId,
+                DemFireStatistics::getClassifyId)
+                .like(StringUtils.isNotBlank(fireNumber), DemFireStatistics::getFireNumber, fireNumber)
+                .eq(labelId != null && labelId != 0, DemFireStatistics::getLabelId, labelId)
+                .eq(classifyId != null & classifyId != 0, DemFireStatistics::getClassifyId, classifyId)
                 .orderByDesc(DemFireStatistics::getId);
         page = this.page(page, queryWrapper);
-        return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
+        List<Object> list = new ArrayList<>();
+        if (page.getTotal() > 0) {
+            List<String> fireNumberList = new ArrayList<>();
+            List<Integer> labelIdList = new ArrayList<>();
+            for (int i = 0; i < page.getTotal(); i++) {
+                fireNumberList.add(page.getRecords().get(i).getFireNumber());
+                labelIdList.add(page.getRecords().get(i).getLabelId());
+            }
+            List<DemFireStatisticsAttach> demFireStatisticsAttaches = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(fireNumberList)) {
+                demFireStatisticsAttaches = demFireStatisticsAttachService.fireAccidentStatistic(fireNumberList);
+            }
+
+            List<DemFileLabel> demFileLabels = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(labelIdList)) {
+                demFileLabels = demFileLabelService.demFileLabelList(null, null, labelIdList);
+            }
+            for (int i = 0; i < page.getTotal(); i++) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("id", page.getRecords().get(i).getId());
+                map.put("burnedArea", page.getRecords().get(i).getBurnedArea());
+                map.put("directPropertyLoss", page.getRecords().get(i).getDirectPropertyLoss());
+                map.put("victimNumber", page.getRecords().get(i).getVictimNumber());
+                map.put("injuredNumber", page.getRecords().get(i).getInjuredNumber());
+                map.put("deathToll", page.getRecords().get(i).getDeathToll());
+                map.put("fileCase", page.getRecords().get(i).getFileCase());
+                map.put("fireGrade", page.getRecords().get(i).getFireGrade());
+                map.put("subordinateDetachment", page.getRecords().get(i).getSubordinateDetachment());
+                map.put("administrativeDivision", page.getRecords().get(i).getAdministrativeDivision());
+                map.put("fireNumber", page.getRecords().get(i).getFireNumber());
+                map.put("fireAddress", page.getRecords().get(i).getFireAddress());
+                map.put("fireTime", page.getRecords().get(i).getFireTime());
+                map.put("labelId", page.getRecords().get(i).getLabelId());
+                map.put("classifyId", page.getRecords().get(i).getClassifyId());
+                map.put("zid", null);
+                map.put("fireCauseType1", null);
+                map.put("fireSiteType1", null);
+                map.put("labelName", null);
+                for (int j = 0; j < demFireStatisticsAttaches.size(); j++) {
+                    if (page.getRecords().get(i).getFireNumber().equals(demFireStatisticsAttaches.get(j).getFireNumber())) {
+                        map.put("zid", demFireStatisticsAttaches.get(j).getId());
+                        map.put("fireCauseType1", demFireStatisticsAttaches.get(j).getFireCauseType1());
+                        map.put("fireSiteType1", demFireStatisticsAttaches.get(j).getFireSiteType1());
+                    }
+                }
+                for (int j = 0; j < demFileLabels.size(); j++) {
+                    if (page.getRecords().get(i).getLabelId() == demFileLabels.get(j).getId()) {
+                        map.put("labelName", demFileLabels.get(j).getLabelName());
+                    }
+                }
+                list.add(map);
+            }
+        }
+        return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
+    }
+
+
+    public void addLabel(DemFileLabel demFileLabel){
+        if (demFileLabel.getId()==0){
+            demFileLabelService.addDemFileLabel(demFileLabel);
+        }else {
+            demFileLabelService.updateDemFileLabel(demFileLabel);
+        }
+        int fid = demFileLabel.getId();
+        List<DemFileLabel> demFileLabel1 = demFileLabel.getSubset();
+        if (CollectionUtils.isNotEmpty(demFileLabel1)){
+            List<DemFileLabel> demFileLabel2 = new ArrayList<>();
+            List<DemFileLabel> demFileLabel3 = new ArrayList<>();
+            List<Integer> idList1 = new ArrayList<>();
+            List<Integer> idList2 = new ArrayList<>();
+            for (int i = 0; i < demFileLabel1.size(); i++) {
+                if (demFileLabel1.get(i).getId()==0){
+                    demFileLabel2.add(demFileLabel1.get(i));
+                }else {
+                    demFileLabel3.add(demFileLabel1.get(i));
+                    idList1.add(demFileLabel1.get(i).getId());
+                }
+            }
+            List<DemFileLabel> demFileLabels = demFileLabelService.demFileLabelList(fid, null, null);
+            if (CollectionUtils.isNotEmpty(demFileLabels)){
+                for (int i = 0; i < demFileLabels.size(); i++) {
+                    idList2.add(demFileLabels.get(i).getId());
+                }
+            }
+
+
+
+        }
+
     }
 
 }

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

@@ -0,0 +1,62 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemFileLabelVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 父ID
+     */
+    private Integer fid;
+
+    /**
+     * 标签名称
+     */
+    private String labelName;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 更新人
+     */
+    private String updatePerson;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+}

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

@@ -0,0 +1,16 @@
+<?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.DemFileLabelMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemFileLabel">
+        <id column="id" property="id" />
+        <result column="fid" property="fid" />
+        <result column="label_name" property="labelName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_person" property="updatePerson" />
+        <result column="creator" property="creator" />
+    </resultMap>
+
+</mapper>

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

@@ -48,6 +48,8 @@
         <result column="subordinate_corps" property="subordinateCorps" />
         <result column="subordinate_district" property="subordinateDistrict" />
         <result column="administrative_division" property="administrativeDivision" />
+        <result column="label_id" property="labelId" />
+        <result column="classify_id" property="classifyId" />
         <result column="creator" property="creator" />
         <result column="create_time" property="createTime" />
         <result column="update_person" property="updatePerson" />