fix:解纷态势-兼容白云数据

zhouxiantao

2024-10-21 b1c3a007984187ccd4df2854b320fa5e82c291f5

fix:解纷态势-兼容白云数据

 dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java

@@ -56,6 +56,7 @@
                return ReturnFailUtils.getRepInfo("查询组织不存在！");
            }
        } catch (Exception e) {
            log.error("Controller接口[CtUnitClientController.getUnitById]请求异常："+e, e);
            return ReturnFailUtils.getRepInfo();
        }
    }

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java

@@ -735,7 +735,7 @@
    @GetMapping("/statistics")
    public Object statistics(@CurrentUser String userId) {
        try {
//            String userId = "2409190725411031";
//            String userId = "2409240631181052";
            Map<String, Object> terms = getParameterAll();
            return ReturnSucUtils.getRepInfo( "处理成功", service.statistics(terms,userId));
        } catch (Exception e) {

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java

@@ -1009,7 +1009,11 @@
        String areaCode = null;
        //目前没有村居数据，所以单位等级是4的也归集到3里面
        List<Integer> unitGrades = new ArrayList<>();
        if(ctUnitDTO.getUnitGrade().equals(2)){
        if(ctUnitDTO.getUnitGrade().equals(1)){
            terms.put("queCity", ctUnitDTO.getCity());
            areaCode = ctUnitDTO.getCity();
            unitGrades.add(ctUnitDTO.getUnitGrade());
        }else if(ctUnitDTO.getUnitGrade().equals(2)){
            terms.put("queArea", ctUnitDTO.getArea());
            areaCode = ctUnitDTO.getArea();
            unitGrades.add(ctUnitDTO.getUnitGrade());
@@ -1043,7 +1047,9 @@
        allArea.setAreaCode("1");
        List<String> areaCodeList = new ArrayList<>();
        List<CaseStatisticsAreaDTO> areaList = new ArrayList<>();
        List<String> areaNames = new ArrayList<>();//为兼容白云区数据
        for (CaseStatisticsAreaDTO caseStatisticsAreaDTO : caseStatisticsAreaDTOS) {
            areaNames.add(caseStatisticsAreaDTO.getAreaName());
            //本及：承办单位是本及和没有承办单位并且没有下级区域编码
            if(ObjectUtils.isEmpty(caseStatisticsAreaDTO.getAreaCode()) || unitGrades.contains(caseStatisticsAreaDTO.getUnitGrade())){
                allArea.setCaseNum(dellNull(caseStatisticsAreaDTO.getCaseNum()) + dellNull(allArea.getCaseNum()));
@@ -1056,6 +1062,15 @@
            }
        }
        areaList.add(allArea);
        Map<String, String> area = getArea();
        for (String areaName : area.keySet()) {
            if(!areaNames.contains(areaName)){
                CaseStatisticsAreaDTO areaChild = new CaseStatisticsAreaDTO();
                areaChild.setAreaCode(area.get(areaName));
                areaChild.setAreaName(areaName);
                areaList.add(areaChild);
            }
        }
        List<QueAreaDTO> queArea = listAreaByType(areaCode);
        log.info("listAreaByType {}", JSON.toJSONString(queArea));
        for (QueAreaDTO caseAreaDTO : queArea) {
@@ -1181,7 +1196,7 @@
        return caseStatisticsTypeDTOS;
    }

    public List<CaseStatisticsAreaDTO> sortArea(List<CaseStatisticsAreaDTO> caseStatisticsAreaDTOS) {
    public Map<String, String> getArea(){
        Map<String, String> map = new HashMap<>();
        map.put("越秀区","2");
        map.put("海珠区","3");
@@ -1194,22 +1209,28 @@
        map.put("南沙区","10");
        map.put("从化区","11");
        map.put("增城区","12");
        return map;
    }

    public List<CaseStatisticsAreaDTO> sortArea(List<CaseStatisticsAreaDTO> caseStatisticsAreaDTOS) {
        Map<String, String> map = getArea();
        for (CaseStatisticsAreaDTO caseStatisticsAreaDTO : caseStatisticsAreaDTOS) {
            caseStatisticsAreaDTO.setAreaCode(caseStatisticsAreaDTO.getAreaCode().replace("-",""));
            if(map.containsKey(caseStatisticsAreaDTO.getAreaName())){
                caseStatisticsAreaDTO.setAreaCode(map.get(caseStatisticsAreaDTO.getAreaName()));
            }
        }
//        caseStatisticsAreaDTOS.sort((o1, o2) -> {
//            Integer totalScore1 = Integer.valueOf(o1.getAreaCode());
//            Integer totalScore2 = Integer.valueOf(o2.getAreaCode());
//            if (totalScore1 > totalScore2) {
//                return 1;
//            } else if (totalScore1.equals(totalScore2)) {
//                return 0;
//            } else {
//                return -1;
//            }
//        });
        caseStatisticsAreaDTOS.sort((o1, o2) -> {
            Long totalScore1 = Long.valueOf(o1.getAreaCode());
            Long totalScore2 = Long.valueOf(o2.getAreaCode());
            if (totalScore1 > totalScore2) {
                return 1;
            } else if (totalScore1.equals(totalScore2)) {
                return 0;
            } else {
                return -1;
            }
        });
        return caseStatisticsAreaDTOS;
    }