1.1.大屏-气瓶-右屏接口

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

@@ -196,14 +196,14 @@ public class AQZSDPStatisticsController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "大屏-安全追溯-右屏-按问题类型排名top 10")
+    @ApiOperation(value = "大屏-安全追溯-右屏-当年主体单位问题排名（Top10）")
     @PostMapping(value = "/issueCompanyTop")
-    public ResponseModel<List<Map<String, Object>>> issueCompanyTop(@RequestBody Map<String, Object> map) {
-        Object regionCode = map.get("cityCode");
-        if (ObjectUtils.isEmpty(regionCode)) {
-            regionCode = "610000";
+    public ResponseModel<List<Map<String, Object>>> issueCompanyTop(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult bindingResult) throws Exception {
+        List<FieldError> fieldErrors = bindingResult.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
         }
-        List<Map<String, Object>> result = statisticsService.issueCompanyTop(regionCode.toString());
+        List<Map<String, Object>> result = statisticsService.issueCompanyTop(dpFilterParamDto);
         return ResponseHelper.buildResponse(result);
     }
 
@@ -221,12 +221,12 @@ public class AQZSDPStatisticsController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "大屏-安全追溯-右屏-当年下级区域问题闭环率排名")
     @PostMapping(value = "/issueChildrenCityCountTop")
-    public ResponseModel<List<Map<String, Object>>> issueChildrenCityCountTop(@RequestBody Map<String, Object> map) throws Exception {
-        Object regionCode = map.get("cityCode");
-        if (ObjectUtils.isEmpty(regionCode)) {
-            regionCode = "610000";
+    public ResponseModel<List<Map<String, Object>>> issueChildrenCityCountTop(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult bindingResult) {
+        List<FieldError> fieldErrors = bindingResult.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
         }
-        List<Map<String, Object>> result = statisticsService.issueChildrenCityCountTop(regionCode.toString());
+        List<Map<String, Object>> result = statisticsService.issueChildrenCityCountTop(dpFilterParamDto);
         return ResponseHelper.buildResponse(result);
     }
 

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

@@ -655,9 +655,9 @@ public class AQZSDPStatisticsServiceImpl {
         return resultMap;
     }
 
-    public List<Map<String, Object>> issueCompanyTop(String cityCode) {
+    public List<Map<String, Object>> issueCompanyTop(DPFilterParamDto dpFilterParamDto) {
         List<Map<String, Object>> resultList = new ArrayList<>();
-        String orgCode = stCommonService.getAndSetOrgCode(cityCode);
+        String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         if(orgCode  == null){
             return new ArrayList<>();
         }
@@ -674,12 +674,12 @@ public class AQZSDPStatisticsServiceImpl {
         return resultList;
     }
 
-    public List<Map<String, Object>> issueChildrenCityCountTop(String cityCode) {
-        String orgCode = stCommonService.getAndSetOrgCode(cityCode);
+    public List<Map<String, Object>> issueChildrenCityCountTop(DPFilterParamDto dpFilterParamDto) {
+        String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         if(orgCode == null){
             return new ArrayList<>();
         }
-        List<RegionModel> regionModels = stCommonService.setRegionIfRootParentAndNoAccessIf3Level(cityCode);
+        List<RegionModel> regionModels = stCommonService.setRegionIfRootParentAndNoAccessIf3Level(dpFilterParamDto.getCityCode());
         List<Integer> regionCodeList = regionModels.stream().map(RegionModel::getRegionCode).collect(Collectors.toList());
         List<Map<String, String>> orgCodeAndCompanyCodesByCompanyCodes = statisticsMapper.getOrgCodeAndCompanyCodesByCompanyCodes(regionCodeList);
         List<String> orgCodes = orgCodeAndCompanyCodesByCompanyCodes.stream().map(m -> m.get("orgCode")).collect(Collectors.toList());
@@ -710,17 +710,14 @@ public class AQZSDPStatisticsServiceImpl {
                 allIssuedataMap.forEach((k, v) -> {
                     if (k.startsWith(orgCodeAndCompanyCodesMap.get(regionModel.getRegionCode() + ""))) {
                         if (null != v) {
-                            allCount.addAndGet(Integer.valueOf(v + ""));
+                            allCount.addAndGet(Integer.parseInt(v + ""));
                         }
                     }
                 });
-            }
-
-            if (StringUtils.isNotBlank(orgCodeAndCompanyCodesMap.get(regionModel.getRegionCode() + ""))) {
                 endIssuedataMap.forEach((k, v) -> {
                     if (k.startsWith(orgCodeAndCompanyCodesMap.get(regionModel.getRegionCode() + ""))) {
                         if (null != v) {
-                            endCount.addAndGet(Integer.valueOf(v + ""));
+                            endCount.addAndGet(Integer.parseInt(v + ""));
                         }
                     }
                 });
@@ -732,7 +729,8 @@ public class AQZSDPStatisticsServiceImpl {
             }
             resultList.add(map);
         }
-        resultList.sort(Comparator.comparing(m -> Double.valueOf(m.get("rate") + ""), Comparator.reverseOrder()));
+        resultList.sort(Comparator.comparingDouble(m -> Double.parseDouble(m.get("rate").toString())));
+        Collections.reverse(resultList);
         for (int i = 0; i < resultList.size(); i++) {
             resultList.get(i).put("sequenceNbr", (i + 1) + "");
         }