fix:事项来源优化，定时器评价优化

xusd

6 days ago 6bde2de72d9e16a7fc1ee204149effb47d9676d9

 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分钟的开始和结束（基于东八区）
@@ -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");
                                    }
@@ -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 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());
                                }
@@ -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);
        // 定义一个列表，用于存储需要查询的网格代码
@@ -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 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());
                                }