xieb
2024-05-29 5b1b617806ff3864fc6921913bf96d02e8072731
暴雨短信模板修改
2 files modified
44 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java 4 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java 40 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java
@@ -986,7 +986,9 @@
        if (smsRequestTemplate.getPersonVOList().size() > 0) {
            for (List<String> list : smsRequestTemplate.getTemplateContent()) {
                // 依次添加行政责任人,主管部门责任人,技术责任人,巡查责任人信息(姓名,联系电话)
                noticeHandle.addWaterMoreDesignPatrolTechnologyInfo(list, "1,2,4,5");
//                noticeHandle.addWaterMoreDesignPatrolTechnologyInfo(list, "1,2,4,5");
                // 主管部门责任人,技术责任人,巡查责任人信息 2024-05-29修改
                noticeHandle.addWaterMoreDesignPatrolTechnologyInfoNew(list, "2,4,5");
                // 拼接市县水利部人员姓名及联系方式
                noticeHandle.addCityCountyBusinessPersonInfo(list);
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
@@ -798,6 +798,46 @@
        }
    }
    /**
     * 依次添加行政责任人,主管部门责任人,技术责任人,巡查责任人信息
     *
     * @param list
     * @param personTypes
     */
    public void addWaterMoreDesignPatrolTechnologyInfoNew(List<String> list, String personTypes) {
        String[] split = personTypes.split(",");
        // 查询巡查责任人姓名,技术责任人姓名信息
        List<PersonVO> personVOList = attResManagePersonClient.getPersonListByResGuid(list.get(1), personTypes);
        if (personVOList.size() > 0) {
            String zgzrr = "-";
            String jszrr = "-";
            String xczrr = "-";
            for (PersonVO personVO : personVOList) {
                String str = null != personVO.getPhone() ? ":" + personVO.getPhone() : "-";
                if (personVO.getType().equals(split[0])) {
                    zgzrr = personVO.getName() + str;
                }
                if (personVO.getType().equals(split[1])) {
                    jszrr = personVO.getName() + str;
                }
                if (personVO.getType().equals(split[2])) {
                    xczrr = personVO.getName() + str;
                }
            }
            // 主管
            list.add(zgzrr);
            // 技术责任人姓名
            list.add(jszrr);
            // 巡查责任人姓名
            list.add(xczrr);
        } else {
            for (String type : split) {
                list.add("-");
            }
        }
    }
    /**
     * 调用中台接口查询数据