火灾管理调整接口

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

@@ -2,13 +2,13 @@ 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.DemFileLabel;
 import com.usky.fire.service.DemFileLabelService;
+import com.usky.fire.service.DemFireStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -27,6 +27,9 @@ public class DemFileLabelController {
     @Autowired
     private DemFileLabelService demFileLabelService;
 
+    @Autowired
+    private DemFireStatisticsService demFireStatisticsService;
+
     /**
      * 标签-列表/下拉框查询
      *
@@ -39,5 +42,18 @@ public class DemFileLabelController {
                                                           @RequestParam(value = "labelName", required = false) String labelName) {
         return ApiResult.success(demFileLabelService.demFileLabelList(fid, labelName, null));
     }
+
+    /**
+     * 标签-删除
+     *
+     * @param id 主键ID
+     * @return
+     */
+    @Log(title = "标签-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delDemFileLabel")
+    public ApiResult<Void> delDemFireStatistics(@RequestParam(value = "id") Integer id) {
+        demFireStatisticsService.delDemFileLabel(id);
+        return ApiResult.success();
+    }
 }
 

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

@@ -118,6 +118,17 @@ public class DemFireAccidentDescController {
         return ApiResult.success();
     }
 
+    /**
+     * 火灾数据管理-标签操作异常抛出
+     *
+     * @param demFileLabel
+     * @return
+     */
+    @PostMapping("abnormalData")
+    public ApiResult<Void> abnormalData(@RequestBody DemFileLabel demFileLabel) {
+        demFireStatisticsService.abnormalData(demFileLabel);
+        return ApiResult.success();
+    }
 
 }
 

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

@@ -66,4 +66,10 @@ public class DemFileLabel implements Serializable {
     @TableField(exist = false)
     private List<DemFileLabel> subset;
 
+    /**
+     * 属性
+     */
+    @TableField(exist = false)
+    private String attribute;
+
 }

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

@@ -2,6 +2,9 @@ package com.usky.fire.service;
 
 import com.usky.fire.domain.DemFireLabelAttribute;
 import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.domain.DemLawSituation;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,10 @@ import com.usky.common.mybatis.core.CrudService;
  */
 public interface DemFireLabelAttributeService extends CrudService<DemFireLabelAttribute> {
 
+    /**
+     * 标签/分类查询
+     *
+     * @return
+     */
+    List<DemFireLabelAttribute> freLabelAttributeList();
 }

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

@@ -21,11 +21,11 @@ public interface DemFireStatisticsService extends CrudService<DemFireStatistics>
     /**
      * 火灾数据管理-列表查询
      *
-     * @param fireNumber     火灾序号
-     * @param labelAttribute 属性
-     * @param typeId         分类ID
-     * @param pageNum        当前页
-     * @param pageSize       每页条数
+     * @param fireNumber 火灾序号
+     * @param labelId    标签ID
+     * @param typeId     分类ID
+     * @param pageNum    当前页
+     * @param pageSize   每页条数
      * @return
      */
     CommonPage<Object> fireAccidentStatistic(String fireNumber, Integer labelId, Integer typeId, Integer id, Integer pageNum, Integer pageSize);
@@ -69,4 +69,18 @@ public interface DemFireStatisticsService extends CrudService<DemFireStatistics>
      * @param zid 关联表ID
      */
     void delDemFireStatistics(Integer id, Integer zid);
+
+    /**
+     * 火灾数据管理-标签操作异常抛出
+     *
+     * @param demFileLabel
+     */
+    void abnormalData(DemFileLabel demFileLabel);
+
+    /**
+     * 标签-删除
+     *
+     * @param id 主键ID
+     */
+    void delDemFileLabel(Integer id);
 }

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

@@ -4,6 +4,8 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.DemLawSituation;
 
+import java.util.List;
+
 /**
  * <p>
  * 行政处罚情况表 服务类

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

@@ -4,12 +4,15 @@ 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.domain.DemFireLabelAttribute;
+import com.usky.fire.domain.DemLawSituation;
 import com.usky.fire.mapper.DemFileLabelMapper;
 import com.usky.fire.service.DemFileLabelService;
+import com.usky.fire.service.DemFireLabelAttributeService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -26,6 +29,9 @@ import java.util.List;
 @Service
 public class DemFileLabelServiceImpl extends AbstractCrudService<DemFileLabelMapper, DemFileLabel> implements DemFileLabelService {
 
+    @Autowired
+    private DemFireLabelAttributeService demFireLabelAttributeService;
+
     @Override
     public List<DemFileLabel> demFileLabelList(Integer fid, String labelName, List<Integer> idList) {
         LambdaQueryWrapper<DemFileLabel> queryWrapper = Wrappers.lambdaQuery();
@@ -35,6 +41,14 @@ public class DemFileLabelServiceImpl extends AbstractCrudService<DemFileLabelMap
                 .like(StringUtils.isNotBlank(labelName), DemFileLabel::getLabelName, labelName)
                 .orderByDesc(DemFileLabel::getId);
         List<DemFileLabel> list = this.list(queryWrapper);
+        List<DemFireLabelAttribute> demFireLabelAttributes = demFireLabelAttributeService.freLabelAttributeList();
+        for (int i = 0; i < list.size(); i++) {
+            for (int j = 0; j < demFireLabelAttributes.size(); j++) {
+                if (list.get(i).getId() == demFireLabelAttributes.get(j).getLabelId()) {
+                    list.get(i).setAttribute(demFireLabelAttributes.get(j).getAttribute());
+                }
+            }
+        }
         return list;
     }
 

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

@@ -1,11 +1,14 @@
 package com.usky.fire.service.impl;
 
 import com.usky.fire.domain.DemFireLabelAttribute;
+import com.usky.fire.domain.DemLawSituation;
 import com.usky.fire.mapper.DemFireLabelAttributeMapper;
 import com.usky.fire.service.DemFireLabelAttributeService;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +20,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class DemFireLabelAttributeServiceImpl extends AbstractCrudService<DemFireLabelAttributeMapper, DemFireLabelAttribute> implements DemFireLabelAttributeService {
 
+    @Override
+    public List<DemFireLabelAttribute> freLabelAttributeList() {
+        List<DemFireLabelAttribute> list = this.list();
+        return list;
+    }
 }

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

@@ -65,19 +65,19 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
             List<DemFireLabelAttribute> list1 = demFireLabelAttributeService.list(queryWrapper1);
             if (list1.size() > 0) {
                 switch (list1.get(0).getAttribute()) {
-                    case "typeId1":
+                    case "typeName1":
                         type1 = typeId;
                         break;
-                    case "typeId2":
+                    case "typeName2":
                         type2 = typeId;
                         break;
-                    case "typeId3":
+                    case "typeName3":
                         type3 = typeId;
                         break;
-                    case "typeId4":
+                    case "typeName4":
                         type4 = typeId;
                         break;
-                    case "typeId5":
+                    case "typeName5":
                         type5 = typeId;
                         break;
                 }
@@ -181,14 +181,14 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
             }
             LambdaQueryWrapper<DemFireLabelAttribute> queryWrapper = Wrappers.lambdaQuery();
             List<DemFireLabelAttribute> list = demFireLabelAttributeService.list(queryWrapper);
-            String typeAttribute = "typeId1";
+            String typeAttribute = "typeName1";
             if (list.size() > 1) {
                 List<String> typeIdList1 = new ArrayList<>();
-                typeIdList1.add("typeId1");
-                typeIdList1.add("typeId2");
-                typeIdList1.add("typeId3");
-                typeIdList1.add("typeId4");
-                typeIdList1.add("typeId5");
+                typeIdList1.add("typeName1");
+                typeIdList1.add("typeName2");
+                typeIdList1.add("typeName3");
+                typeIdList1.add("typeName4");
+                typeIdList1.add("typeName5");
                 List<String> typeIdList2 = new ArrayList<>();
                 for (int i = 0; i < list.size(); i++) {
                     typeIdList2.add(list.get(i).getAttribute());
@@ -310,19 +310,19 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
             DemFireStatistics demFireStatistics = new DemFireStatistics();
             demFireStatistics.setId(parameterVo.getIdList().get(i));
             switch (list.get(0).getAttribute()) {
-                case "typeId1":
+                case "typeName1":
                     demFireStatistics.setTypeId1(parameterVo.getTypeId());
                     break;
-                case "typeId2":
+                case "typeName2":
                     demFireStatistics.setTypeId2(parameterVo.getTypeId());
                     break;
-                case "typeId3":
+                case "typeName3":
                     demFireStatistics.setTypeId3(parameterVo.getTypeId());
                     break;
-                case "typeId4":
+                case "typeName4":
                     demFireStatistics.setTypeId4(parameterVo.getTypeId());
                     break;
-                case "typeId5":
+                case "typeName5":
                     demFireStatistics.setTypeId5(parameterVo.getTypeId());
                     break;
             }
@@ -371,4 +371,49 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
         demFireStatisticsAttachService.removeById(zid);
     }
 
+    @Override
+    public void abnormalData(DemFileLabel demFileLabel) {
+        List<Integer> typeIdList = new ArrayList<>();
+        if (demFileLabel.getId() != null && demFileLabel.getId() != 0) {
+            LambdaQueryWrapper<DemFileLabel> queryWrapper1 = Wrappers.lambdaQuery();
+            queryWrapper1.eq(DemFileLabel::getFid, demFileLabel.getId());
+            List<DemFileLabel> list1 = demFileLabelService.list(queryWrapper1);
+            for (int i = 0; i < list1.size(); i++) {
+                typeIdList.add(list1.get(i).getId());
+            }
+        } else {
+            LambdaQueryWrapper<DemFileLabel> queryWrapper2 = Wrappers.lambdaQuery();
+            queryWrapper2.eq(DemFileLabel::getLabelName, demFileLabel.getLabelName())
+                    .eq(DemFileLabel::getFid, demFileLabel.getFid());
+            List<DemFileLabel> list2 = demFileLabelService.list(queryWrapper2);
+            for (int i = 0; i < list2.size(); i++) {
+                typeIdList.add(list2.get(i).getId());
+            }
+        }
+        if (CollectionUtils.isNotEmpty(typeIdList)){
+            LambdaQueryWrapper<DemFireStatistics> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.in(DemFireStatistics::getTypeId1, typeIdList)
+                    .or()
+                    .in(DemFireStatistics::getTypeId2, typeIdList)
+                    .or()
+                    .in(DemFireStatistics::getTypeId3, typeIdList)
+                    .or()
+                    .in(DemFireStatistics::getTypeId4, typeIdList)
+                    .or()
+                    .in(DemFireStatistics::getTypeId5, typeIdList);
+            List<DemFireStatistics> list = this.list(queryWrapper);
+            if (CollectionUtils.isNotEmpty(list)){
+                throw new BusinessException("标签/分类绑定中，不可删除");
+            }
+        }
+    }
+
+    @Transactional
+    @Override
+    public void delDemFileLabel(Integer id) {
+        DemFileLabel demFileLabel = new DemFileLabel();
+        demFileLabel.setId(id);
+        this.abnormalData(demFileLabel);
+        demFileLabelService.removeById(id);
+    }
 }

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

@@ -78,5 +78,4 @@ public class DemLawSituationServiceImpl extends AbstractCrudService<DemLawSituat
         demLawSituation.setEnable(1);
         this.updateById(demLawSituation);
     }
-
 }