Merge branch 'develop_tzs_register_to_0715' of…

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/vo/EquCategoryVo.java

+package com.yeejoin.amos.boot.module.statistics.api.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class EquCategoryVo {
+    public String value;
+    public String title;
+    public List<EquCategoryVo> children;
+
+    public EquCategoryVo(String title, String value) {
+        this.title = title;
+        this.value = value;
+    }
+
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/StCommonController.java

 package com.yeejoin.amos.boot.module.statistcs.biz.controller;
 
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.StCommonServiceImpl;
+import com.yeejoin.amos.boot.module.statistics.api.vo.EquCategoryVo;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import java.util.List;
 
 @RestController
@@ -36,4 +35,16 @@ public class StCommonController extends BaseController {
         List<RegionModel> regionList = commonService.getUserRegionCode(getSelectedOrgInfo());
         return ResponseHelper.buildResponse(regionList);
     }
+
+    /**
+     * 获取设备类型
+     * @return Map
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/getEquCategoryTree")
+    @ApiOperation(httpMethod = "POST", value = "获取设备类型", notes = "获取设备类型")
+    public ResponseModel<EquCategoryVo> getEquCategoryTree(@RequestBody DPFilterParamForDetailDto paramDto){
+        return ResponseHelper.buildResponse(commonService.getEquCategoryTree(paramDto));
+    }
+
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/StCommonServiceImpl.java

@@ -6,15 +6,17 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.dto.CountDto;
 import com.yeejoin.amos.boot.module.common.api.constant.TZSCommonConstant;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
 import com.yeejoin.amos.boot.module.common.api.enums.ReginStepEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.DPMapStatisticsItemEnum;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.CommonBaseMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.ZLStatisticsMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
-import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipTechParamPipelineMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
+import com.yeejoin.amos.boot.module.statistics.api.vo.EquCategoryVo;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import org.apache.lucene.queryparser.classic.QueryParser;
@@ -31,7 +33,6 @@ import org.elasticsearch.search.aggregations.bucket.terms.Terms;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.springframework.stereotype.Service;
-
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -303,4 +304,35 @@ public class StCommonServiceImpl {
         return zlStatisticsMapper.countCompanyForCertDateTimeOut(dpFilterParamDto, orgCode, limitDate);
     }
 
+    public EquCategoryVo getEquCategoryTree(DPFilterParamForDetailDto paramDto) {
+        final List<EquipmentCategoryDto> equipmentCategoryList = getEquipmentCategory();
+        List<EquipmentCategoryDto> updatedCategoryList = addSpecialCategory(equipmentCategoryList);
+        return createEquCategoryVo(updatedCategoryList);
+    }
+
+    /**
+     * 向设备分类列表中添加特定类别
+     * @param equipmentCategoryList 原始设备分类列表
+     * @return 添加了特定类别的新列表
+     */
+    private List<EquipmentCategoryDto> addSpecialCategory(List<EquipmentCategoryDto> equipmentCategoryList) {
+        List<EquipmentCategoryDto> newList = new ArrayList<>(equipmentCategoryList);
+        EquipmentCategoryDto specialCategory = new EquipmentCategoryDto();
+        specialCategory.setName("气瓶");
+        specialCategory.setCode(CylinderTypeEnum.CYLINDER.getCode());
+        newList.add(specialCategory);
+        return newList;
+    }
+
+    /**
+     * 创建设备类别树的根节点
+     * @param equipmentCategoryList 设备分类数据传输对象列表
+     * @return 根节点的 EquCategoryVo 对象
+     */
+    private EquCategoryVo createEquCategoryVo(List<EquipmentCategoryDto> equipmentCategoryList) {
+        List<EquCategoryVo> children = equipmentCategoryList.stream()
+                .map(dto -> new EquCategoryVo(dto.getName(), dto.getCode()))
+                .collect(Collectors.toList());
+        return new EquCategoryVo(null, "全部设备", children);
+    }
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java

@@ -682,8 +682,8 @@ public class ZLDPStatisticsServiceImpl {
     public Map<String, Object> getEquipManagementRateStatistics(DPFilterParamForDetailDto paramDto) {
         Map<String, Object> result = new HashMap<>();
         List<Map<String, Object>> legendData = new ArrayList<>();
-        legendData.add(createLegend("设备认领总数", "equipTotal"));
-        legendData.add(createLegend("设备认领率", "claimRate"));
+        legendData.add(createLegend("设备认领总数", "equipTotal", "bar"));
+        legendData.add(createLegend("设备认领率", "claimRate", "line"));
 
         List<RegionModel> regionList = stCommonService.setRegionIfRootParentAndNoAccessIf3Level("610000");
         // 获取区域名称并过滤
@@ -707,7 +707,7 @@ public class ZLDPStatisticsServiceImpl {
                 .map(region -> {
                     String orgCode = stCommonService.getAndSetOrgCode(region.getRegionCode().toString());
                     Long equipIsManageNum = staticsCenterMapCountDataForEquipIsManage(orgCode, paramDto);
-                    Long equipTotal = getEquipTotalForCode(paramDto.getEquListCode(), region.getRegionCode().toString());
+                    Long equipTotal = getEquipTotalForCode(paramDto.getTreeValue(), region.getRegionCode().toString());
                     CountDto dto = new CountDto();
                     dto.setLongValue(equipTotal);
                     dto.setStrValue(calculateClaimRate(equipTotal, equipIsManageNum, decimalFormat));
@@ -715,11 +715,11 @@ public class ZLDPStatisticsServiceImpl {
                 }).collect(Collectors.toList());
     }
 
-    private Long getEquipTotalForCode(String equListCode, String regionCode) {
-        if (equListCode == null) {
+    private Long getEquipTotalForCode(String treeValue, String regionCode) {
+        if (treeValue == null) {
             return screenMapper.getEquipTotal(regionCode);
         }
-        switch (equListCode) {
+        switch (treeValue) {
             case "1000":
                 return screenMapper.getEquListTotal("boiler", regionCode); // 锅炉
             case "2000":
@@ -743,10 +743,11 @@ public class ZLDPStatisticsServiceImpl {
         }
     }
 
-    private Map<String, Object> createLegend(String value, String dataKey) {
+    private Map<String, Object> createLegend(String value, String dataKey, String chartType) {
         return new HashMap<String, Object>() {{
             put("value", value);
             put("dataKey", dataKey);
+            put("chartType", chartType);
         }};
     }
 
@@ -772,11 +773,11 @@ public class ZLDPStatisticsServiceImpl {
         // 设备类别精确查询气瓶
         boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
 
-        if (StringUtils.isNotEmpty(paramDto.getEquListCode())) {
-            if ("2300".equals(paramDto.getEquListCode())){
-                boolMust.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", QueryParser.escape(paramDto.getEquListCode().toLowerCase())));
+        if (StringUtils.isNotEmpty(paramDto.getTreeValue())) {
+            if ("2300".equals(paramDto.getTreeValue())){
+                boolMust.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", QueryParser.escape(paramDto.getTreeValue().toLowerCase())));
             }else {
-                boolMust.must(QueryBuilders.termQuery("EQU_LIST_CODE", QueryParser.escape(paramDto.getEquListCode().toLowerCase())));
+                boolMust.must(QueryBuilders.termQuery("EQU_LIST_CODE", QueryParser.escape(paramDto.getTreeValue().toLowerCase())));
             }
         }
         // 且8大类，目的去掉脏数据
@@ -820,7 +821,7 @@ public class ZLDPStatisticsServiceImpl {
         if (!ObjectUtils.isEmpty(map.getString("superviseUnitName"))) {
             BoolQueryBuilder query = QueryBuilders.boolQuery();
             String test = QueryParser.escape(map.getString("superviseUnitName"));
-            query.must(QueryBuilders.matchPhraseQuery("ORG_BRANCH_CODE", "*" + test + "*"));
+            query.must(QueryBuilders.matchPhraseQuery("ORG_BRANCH_NAME", "*" + test + "*"));
             boolMust.must(query);
         }