气瓶下钻页面功能-修改

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

@@ -117,7 +117,7 @@ public class CylinderDPStatisticsController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "区域安全指数排名下钻树节点")
     @PostMapping(value = "/securityIndexSubTree")
-    public ResponseModel<SubTreeDto> securityIndexSubTree() {
+    public ResponseModel<List<SubTreeDto>> securityIndexSubTree() {
         return ResponseHelper.buildResponse(dpStatisticsService.securityIndexSubTree());
     }
 
@@ -131,7 +131,7 @@ public class CylinderDPStatisticsController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "充装量/卸液量下钻树节点")
     @PostMapping(value = "/getFillingSubTree")
-    public ResponseModel<SubTreeDto> getFillingSubTree() {
+    public ResponseModel<List<SubTreeDto>> getFillingSubTree() {
         return ResponseHelper.buildResponse(dpStatisticsService.getFillingSubTree());
     }
 
@@ -160,7 +160,7 @@ public class CylinderDPStatisticsController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "区域气站对接率下钻树节点")
     @PostMapping(value = "/getStationRateSubTree")
-    public ResponseModel<SubTreeDto> getStationRateSubTree() {
+    public ResponseModel<List<SubTreeDto>> getStationRateSubTree() {
         return ResponseHelper.buildResponse(dpStatisticsService.getStationRateSubTree());
     }
 

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

@@ -468,11 +468,13 @@ public class CylinderDPStatisticsServiceImpl {
         return result;
     }
 
-    public SubTreeDto securityIndexSubTree() {
+    public List<SubTreeDto> securityIndexSubTree() {
+        List<SubTreeDto> list = new ArrayList<>();
         SubTreeDto subTreeDto = new SubTreeDto();
-        subTreeDto.setTitle(CylinderTypeEnum.CYLINDER.getCode());
-        subTreeDto.setValue("气" + CylinderTypeEnum.CYLINDER.getName());
-        return subTreeDto;
+        subTreeDto.setValue(CylinderTypeEnum.CYLINDER.getCode());
+        subTreeDto.setTitle("气" + CylinderTypeEnum.CYLINDER.getName());
+        list.add(subTreeDto);
+        return list;
     }
 
     public Map<String, Object> securityIndexSubChart(DPFilterParamDto dpFilterParamDto) {
@@ -488,11 +490,19 @@ public class CylinderDPStatisticsServiceImpl {
         });
         Map<String, Object> result = new HashMap<>();
         result.put("xdata", xdata);
-        result.put("ydata", yData);
+        result.put("securityIndex", yData);
+        List<Map<String, Object>> legendData = new ArrayList<>();
+        Map<String, Object> map = new HashMap<>();
+        map.put("dataKey", "securityIndex");
+        map.put("value", "各地市区域安全指数");
+        map.put("chartType", "bar");
+        legendData.add(map);
+        result.put("legendData", legendData);
         return result;
     }
 
-    public SubTreeDto getFillingSubTree() {
+    public List<SubTreeDto> getFillingSubTree() {
+        List<SubTreeDto> list = new ArrayList<>();
         SubTreeDto subTreeDto = new SubTreeDto();
         subTreeDto.setTitle("气" + CylinderTypeEnum.CYLINDER.getName());
         subTreeDto.setValue(CylinderTypeEnum.CYLINDER.getCode());
@@ -506,7 +516,8 @@ public class CylinderDPStatisticsServiceImpl {
             }
         }
         subTreeDto.setChildren(children);
-        return subTreeDto;
+        list.add(subTreeDto);
+        return list;
     }
 
     public Map<String, Object> getFillingSubChart(DPFilterParamForDetailDto dpFilterParamForDetailDto) {
@@ -730,7 +741,8 @@ public class CylinderDPStatisticsServiceImpl {
     }
 
 
-    public SubTreeDto getStationRateSubTree() {
+    public List<SubTreeDto> getStationRateSubTree() {
+        List<SubTreeDto> subTreeDtos = new ArrayList<>();
         SubTreeDto subTreeDto = new SubTreeDto();
         subTreeDto.setTitle("企业类型");
         subTreeDto.setValue("");
@@ -740,7 +752,8 @@ public class CylinderDPStatisticsServiceImpl {
         subTree.setValue("1231");
         children.add(subTree);
         subTreeDto.setChildren(children);
-        return subTreeDto;
+        subTreeDtos.add(subTreeDto);
+        return subTreeDtos;
     }
 
     public Map<String, Object> getStationRateSubChart(DPFilterParamForDetailDto dpFilterParamForDetailDto) {