气瓶下钻页面功能-修改

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DPFilterParamForDetailDto.java

@@ -88,6 +88,4 @@ public class DPFilterParamForDetailDto {
      */
     private String anomalyType;
 
-    private String cylinderVariety;
-
 }

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

@@ -8,7 +8,6 @@ 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.statistcs.biz.service.impl.CylinderDPStatisticsServiceImpl;
 import com.yeejoin.amos.boot.module.statistics.api.dto.SubTreeDto;
-import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.ESCylinderFillingRecordDto;
 import io.swagger.annotations.Api;
@@ -118,7 +117,7 @@ public class CylinderDPStatisticsController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "区域安全指数排名下钻树节点")
     @GetMapping(value = "/securityIndexSubTree")
-    public ResponseModel<List<EquipmentCategoryDto>> securityIndexSubTree() {
+    public ResponseModel<SubTreeDto> securityIndexSubTree() {
         return ResponseHelper.buildResponse(dpStatisticsService.securityIndexSubTree());
     }
 
@@ -174,7 +173,7 @@ public class CylinderDPStatisticsController extends BaseController {
 
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "POST", value = "区域气站对接率下钻图")
+    @ApiOperation(httpMethod = "POST", value = "区域气站对接率下钻列表")
     @PostMapping(value = "/getStationRateSubPage")
     public ResponseModel<IPage<TzBaseEnterpriseInfoDto>> getStationRateSubPage(@RequestBody DPFilterParamForDetailDto dpFilterParamForDetailDto) {
         return ResponseHelper.buildResponse(dpStatisticsService.getStationRateSubPage(dpFilterParamForDetailDto));

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/CylinderDPStatisticsServiceImpl.java

@@ -16,7 +16,6 @@ import com.yeejoin.amos.boot.module.statistics.api.dto.SubTreeDto;
 import com.yeejoin.amos.boot.module.statistics.api.enums.AnomalyTypeEnum;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.AQZSDPStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.CylinderStatisticsMapper;
-import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.ESCylinderFillingRecordDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
@@ -468,13 +467,11 @@ public class CylinderDPStatisticsServiceImpl {
         return result;
     }
 
-    public List<EquipmentCategoryDto> securityIndexSubTree() {
-        List<EquipmentCategoryDto> equipmentCategory = new ArrayList<>();
-        EquipmentCategoryDto equipmentCategoryDto = new EquipmentCategoryDto();
-        equipmentCategoryDto.setCode(CylinderTypeEnum.CYLINDER.getCode());
-        equipmentCategoryDto.setName("气" + CylinderTypeEnum.CYLINDER.getName());
-        equipmentCategory.add(equipmentCategoryDto);
-        return equipmentCategory;
+    public SubTreeDto securityIndexSubTree() {
+        SubTreeDto subTreeDto = new SubTreeDto();
+        subTreeDto.setTitle(CylinderTypeEnum.CYLINDER.getCode());
+        subTreeDto.setValue("气" + CylinderTypeEnum.CYLINDER.getName());
+        return subTreeDto;
     }
 
     public Map<String, Object> securityIndexSubChart(DPFilterParamDto dpFilterParamDto) {