Merge remote-tracking branch 'origin/feature/gzdyh_ctiy_bugfix' into featur...

xusd

6 days ago cbceb95bdd6713acfc2ce560055170ccfa5b7e89

 dyh-service/dyh-sys/src/main/java/cn/huge/module/timer/GridCityCaseTimer.java

@@ -73,7 +73,7 @@
        Date nowDate = DateUtils.getNowDate();
        List<String> canalSecondList = new ArrayList<>();
        canalSecondList.add("12");
        canalSecondList.add("07");
        canalSecondList.add("13");
        // 获取东八区的当前时间
        ZonedDateTime now = ZonedDateTime.now(TARGET_ZONE);
        // 计算前30分钟的开始和结束（基于东八区）
@@ -147,7 +147,7 @@
                                String fxdj = "";
                                String zrmj = "";
                                String zrga = "";
                                String jyff="";
                                String jyff = "";
                                String tcr = "";
                                String tcqk = "";
                                String tcjg = "";
@@ -162,7 +162,7 @@
                                    if (StringUtils.isNotBlank(gridCaseInfoDTO.getContactTel())) {
                                        uploadPolicePhone = AesUtils.decrypt(gridCaseInfoDTO.getContactTel(), "W90akz7tA7tyMn5tNTynG69YM2E8jGfF");
                                    }
                                } else if ("12".equals(canalSecond)) {
                                } else if ("12".equals(canalSecond) || "13".equals(canalSecond)) {
                                    if (StringUtils.isNotBlank(gridCaseInfoDTO.getLinkman())) {
                                        uploadPolice = AesUtils.decrypt(gridCaseInfoDTO.getLinkman(), "W90akz7tA7tyMn5tNTynG69YM2E8jGfF");
                                    }
@@ -196,7 +196,7 @@
                                    } catch (Exception e) {
                                        log.error("解析extInfo失败，事件id：{" + gridCaseInfoDTO.getId() + "}; 解析内容：" + gridCaseInfoDTO.getExtInfo() + "失败原因：" + e.getMessage());
                                    }
                                    registerSaveDTO.setTcqk(uploadPolice+" -- "+uploadPolicePhone+" -- "+fxdj+" -- "+zrmj+" -- "+tcr+" -- "+tcfa+" -- "+tcqk);
                                    registerSaveDTO.setTcqk(uploadPolice + " -- " + uploadPolicePhone + " -- " + fxdj + " -- " + zrmj + " -- " + tcr + " -- " + tcfa + " -- " + tcqk);
                                    try {
                                        if (StringUtils.isNotBlank(gridCaseInfoDTO.getExtInfoRisk())) {
                                            List<Map<String, Object>> expInfoMapList = JSON.parseObject(gridCaseInfoDTO.getExtInfoRisk(),
@@ -249,7 +249,7 @@
                                }
                                registerSaveDTO.setId(IdUtils.getNewTimeId());
                                BeanUtils.copyProperties(gridCaseInfoDTO, gridEvent);
                                registerSaveDTO.setCreateTime(DateUtils.StringToDate(gridCaseInfoDTO.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
                                registerSaveDTO.setCreateTime(DateUtils.StringToDate(gridCaseInfoDTO.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
                                gridEvent.setLinkman(uploadPolice);
                                gridEvent.setSystemId(gridCaseInfoDTO.getSystemId());
                                gridEvent.setContactTel(uploadPolicePhone);
@@ -261,9 +261,18 @@
                                log.info("xsd保存事件：{}" + gridEvent);
                                //设置二级事件来源
                                if (canalSecond.equals("12")) {
                                    registerSaveDTO.setCanal(CaseBaseConstsEnum.CASE_CANAL_4.getIndex());
                                    registerSaveDTO.setCanalName(CaseBaseConstsEnum.CASE_CANAL_4.getDes());
                                    registerSaveDTO.setCanalSecond(CaseBaseConstsEnum.CASE_CANAL_SECOND_1.getIndex());
                                    registerSaveDTO.setCanalSecondName(CaseBaseConstsEnum.CASE_CANAL_SECOND_1.getDes());
                                } else {
                                } else if (canalSecond.equals("13")){
                                    registerSaveDTO.setCanal(CaseBaseConstsEnum.CASE_CANAL_3.getIndex());
                                    registerSaveDTO.setCanalName(CaseBaseConstsEnum.CASE_CANAL_3.getDes());
                                    registerSaveDTO.setCanalSecond(CaseBaseConstsEnum.CASE_CANAL_SECOND_7.getIndex());
                                    registerSaveDTO.setCanalSecondName(CaseBaseConstsEnum.CASE_CANAL_SECOND_7.getDes());
                                }else {
                                    registerSaveDTO.setCanal(CaseBaseConstsEnum.CASE_CANAL_3.getIndex());
                                    registerSaveDTO.setCanalName(CaseBaseConstsEnum.CASE_CANAL_3.getDes());
                                    registerSaveDTO.setCanalSecond(CaseBaseConstsEnum.CASE_CANAL_SECOND_2.getIndex());
                                    registerSaveDTO.setCanalSecondName(CaseBaseConstsEnum.CASE_CANAL_SECOND_2.getDes());
                                }
@@ -352,7 +361,7 @@
        if (parts.length == 3) {
            return parts[0] + parts[1] + parts[2];
        } else if (parts.length >= 4) {
            return parts[0] + parts[1] + parts[2]+"-"+parts[3];
            return parts[0] + parts[1] + parts[2] + "-" + parts[3];
        } else {
            return input; // 或抛出异常
        }
@@ -368,7 +377,7 @@
        Date nowDate = DateUtils.getNowDate();
        List<String> canalSecondList = new ArrayList<>();
        canalSecondList.add("12");
        canalSecondList.add("07");
        canalSecondList.add("13");
        log.info("startTime:" + startTime);
        log.info("endTime:" + endTime);
        // 定义一个列表，用于存储需要查询的网格代码
@@ -430,7 +439,7 @@
                                String fxdj = "";
                                String zrmj = "";
                                String zrga = "";
                                String jyff="";
                                String jyff = "";
                                String tcr = "";
                                String tcqk = "";
                                String tcjg = "";
@@ -479,7 +488,7 @@
                                    } catch (Exception e) {
                                        log.error("解析extInfo失败，事件id：{" + gridCaseInfoDTO.getId() + "}; 解析内容：" + gridCaseInfoDTO.getExtInfo() + "失败原因：" + e.getMessage());
                                    }
                                    registerSaveDTO.setTcqk(uploadPolice+" -- "+uploadPolicePhone+" -- "+fxdj+" -- "+zrmj+" -- "+tcr+" -- "+tcfa+" -- "+tcqk);
                                    registerSaveDTO.setTcqk(uploadPolice + " -- " + uploadPolicePhone + " -- " + fxdj + " -- " + zrmj + " -- " + tcr + " -- " + tcfa + " -- " + tcqk);
                                    try {
                                        if (StringUtils.isNotBlank(gridCaseInfoDTO.getExtInfoRisk())) {
                                            List<Map<String, Object>> expInfoMapList = JSON.parseObject(gridCaseInfoDTO.getExtInfoRisk(),
@@ -531,7 +540,7 @@
                                    }
                                }
                                registerSaveDTO.setId(IdUtils.getNewTimeId());
                                registerSaveDTO.setCreateTime(DateUtils.StringToDate(gridCaseInfoDTO.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
                                registerSaveDTO.setCreateTime(DateUtils.StringToDate(gridCaseInfoDTO.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
                                BeanUtils.copyProperties(gridCaseInfoDTO, gridEvent);
                                gridEvent.setSystemId(gridCaseInfoDTO.getSystemId());
                                gridEvent.setLinkman(uploadPolice);
@@ -544,9 +553,18 @@
                                log.info("xsd保存事件：{}" + gridEvent);
                                //设置二级事件来源
                                if (canalSecond.equals("12")) {
                                    registerSaveDTO.setCanal(CaseBaseConstsEnum.CASE_CANAL_4.getIndex());
                                    registerSaveDTO.setCanalName(CaseBaseConstsEnum.CASE_CANAL_4.getDes());
                                    registerSaveDTO.setCanalSecond(CaseBaseConstsEnum.CASE_CANAL_SECOND_1.getIndex());
                                    registerSaveDTO.setCanalSecondName(CaseBaseConstsEnum.CASE_CANAL_SECOND_1.getDes());
                                } else {
                                } else if (canalSecond.equals("13")){
                                    registerSaveDTO.setCanal(CaseBaseConstsEnum.CASE_CANAL_3.getIndex());
                                    registerSaveDTO.setCanalName(CaseBaseConstsEnum.CASE_CANAL_3.getDes());
                                    registerSaveDTO.setCanalSecond(CaseBaseConstsEnum.CASE_CANAL_SECOND_7.getIndex());
                                    registerSaveDTO.setCanalSecondName(CaseBaseConstsEnum.CASE_CANAL_SECOND_7.getDes());
                                }else {
                                    registerSaveDTO.setCanal(CaseBaseConstsEnum.CASE_CANAL_3.getIndex());
                                    registerSaveDTO.setCanalName(CaseBaseConstsEnum.CASE_CANAL_3.getDes());
                                    registerSaveDTO.setCanalSecond(CaseBaseConstsEnum.CASE_CANAL_SECOND_2.getIndex());
                                    registerSaveDTO.setCanalSecondName(CaseBaseConstsEnum.CASE_CANAL_SECOND_2.getDes());
                                }