Merge remote-tracking branch 'origin/gzdyh_grid' into gzdyh_grid

wangwh

2024-10-25 e0b8a22df9a40e1b5691140e23721d2c0a5a5a0b

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

@@ -274,7 +274,7 @@
                //默认添加省市
                caseInfo.setQueProv("19");
                caseInfo.setQueProvName("广东省");
                caseInfo.setQueCity("1601");
                caseInfo.setQueCity("440100");
                caseInfo.setQueCityName("广州市");
                // 删除草稿案件
                if (1 == registerSaveDTO.getIsDraft()) {
@@ -1008,26 +1008,39 @@
        CtUnitDTO ctUnitDTO = custClient.getUnitByUserId(userId);
        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());
        }else if(ctUnitDTO.getUnitGrade().equals(2)){
            terms.put("queArea", ctUnitDTO.getArea());
            areaCode = ctUnitDTO.getArea();
            unitGrades.add(ctUnitDTO.getUnitGrade());
        }else if(ctUnitDTO.getUnitGrade().equals(3) || ctUnitDTO.getUnitGrade().equals(4)){
            terms.put("queRoad", ctUnitDTO.getRoad());
            areaCode = ctUnitDTO.getRoad();
        }

        //目前没有村居，所以区和街道进来都是按街道展示
        String areaType = null;//兼容白云数据
        List<Integer> unitGrades = new ArrayList<>();
        if(ObjectUtils.isNotEmpty(terms.get("queRoad"))){
            terms.put("areaType","2");
            areaType = "2";
            areaCode = terms.get("queRoad")+"";
            unitGrades.add(3);
            unitGrades.add(4);
        }
        //目前没有村居，所以区和街道进来都是按街道展示
        if(ObjectUtils.isNotEmpty(terms.get("queRoad")) || ObjectUtils.isNotEmpty(terms.get("queArea"))){
        }else if(ObjectUtils.isNotEmpty(terms.get("queArea"))){
            terms.put("areaType","2");
            areaType = "2";
            areaCode = terms.get("queArea")+"";
            unitGrades.add(2);
        }else{
            areaType = "1";
            unitGrades.add(1);
            areaCode = ctUnitDTO.getCity();
        }
        //基础数据统计
        CaseStatisticsBaseDTO caseStatisticsBaseDTO = mapper.statisticsBase(terms);
        Integer baseTotalNum = dellNull(caseStatisticsBaseDTO.getResolveNum()) + dellNull(caseStatisticsBaseDTO.getUnResolveNum()) + dellNull(caseStatisticsBaseDTO.getResolveingNum());
        caseStatisticsBaseDTO.setResolveRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getResolveNum() * 100, baseTotalNum, 1));
        caseStatisticsBaseDTO.setUnResolveRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getUnResolveNum() * 100, baseTotalNum, 1));
        Integer resolveTotalNum = dellNull(caseStatisticsBaseDTO.getResolveNum()) + dellNull(caseStatisticsBaseDTO.getUnResolveNum());
        caseStatisticsBaseDTO.setResolveRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getResolveNum() * 100, resolveTotalNum, 1));
        caseStatisticsBaseDTO.setUnResolveRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getUnResolveNum() * 100, resolveTotalNum, 1));
        caseStatisticsBaseDTO.setResolveingRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getResolveingNum() * 100, baseTotalNum, 1));
        Integer levelTotalNum = caseStatisticsBaseDTO.getOneLevelNum() + caseStatisticsBaseDTO.getTwoLevelNum() + caseStatisticsBaseDTO.getThreeLevelNum();
        caseStatisticsBaseDTO.setOneLevelRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getOneLevelNum() * 100, levelTotalNum, 1));
@@ -1043,7 +1056,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 +1071,18 @@
            }
        }
        areaList.add(allArea);
        if("1".equals(areaType)){
            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) {
@@ -1129,19 +1156,24 @@
        }

        Integer sourceTotalNum = dellNull(oneSource.getCaseNum()) + dellNull(twoSource.getCaseNum()) + dellNull(threeSource.getCaseNum()) + dellNull(fourSource.getCaseNum());
        Integer oneTotalNum = dellNull(oneSource.getResolveNum()) + dellNull(oneSource.getUnResolveNum());
        Integer twoTotalNum = dellNull(twoSource.getResolveNum()) + dellNull(twoSource.getUnResolveNum());
        Integer threeTotalNum = dellNull(threeSource.getResolveNum()) + dellNull(threeSource.getUnResolveNum());
        Integer fourTotalNum = dellNull(fourSource.getResolveNum()) + dellNull(fourSource.getUnResolveNum());
        oneSource.setCaseRate(BigDecimalUtil.integerDivideDelZero(oneSource.getCaseNum() * 100, sourceTotalNum, 1));
        oneSource.setResolveRate(BigDecimalUtil.integerDivideDelZero(oneSource.getResolveNum() * 100, oneSource.getCaseNum(), 1));
        oneSource.setResolveRate(BigDecimalUtil.integerDivideDelZero(oneSource.getResolveNum() * 100, oneTotalNum, 1));

        twoSource.setCaseRate(BigDecimalUtil.integerDivideDelZero(twoSource.getCaseNum() * 100, sourceTotalNum, 1));
        twoSource.setResolveRate(BigDecimalUtil.integerDivideDelZero(twoSource.getResolveNum() * 100, twoSource.getCaseNum(), 1));
        twoSource.setResolveRate(BigDecimalUtil.integerDivideDelZero(twoSource.getResolveNum() * 100, twoTotalNum, 1));


        threeSource.setCanalName(CaseBaseConstsEnum.CASE_CANAL_3.getDes());
        threeSource.setCaseRate(BigDecimalUtil.integerDivideDelZero(threeSource.getCaseNum() * 100, sourceTotalNum, 1));
        threeSource.setResolveRate(BigDecimalUtil.integerDivideDelZero(threeSource.getResolveNum() * 100, threeSource.getCaseNum(), 1));
        threeSource.setResolveRate(BigDecimalUtil.integerDivideDelZero(threeSource.getResolveNum() * 100, threeTotalNum, 1));

        fourSource.setCanalName(CaseBaseConstsEnum.CASE_CANAL_4.getDes());
        fourSource.setCaseRate(BigDecimalUtil.integerDivideDelZero(fourSource.getCaseNum() * 100, sourceTotalNum, 1));
        fourSource.setResolveRate(BigDecimalUtil.integerDivideDelZero(fourSource.getResolveNum() * 100, fourSource.getCaseNum(), 1));
        fourSource.setResolveRate(BigDecimalUtil.integerDivideDelZero(fourSource.getResolveNum() * 100, fourTotalNum, 1));

        caseStatisticsBaseDTO.setOneSource(oneSource);
        caseStatisticsBaseDTO.setTwoSource(twoSource);
@@ -1181,7 +1213,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,14 +1226,20 @@
        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());
            Long totalScore1 = Long.valueOf(o1.getAreaCode());
            Long totalScore2 = Long.valueOf(o2.getAreaCode());
            if (totalScore1 > totalScore2) {
                return 1;
            } else if (totalScore1.equals(totalScore2)) {