aix
2024-08-22 ae397fc026a8a30dd788fae30e4de139f940005d
近一小时水位陡升预警短信模板内容修改
4 files modified
60 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml 3 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java 4 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml 44 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java 9 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
@@ -343,7 +343,8 @@
               case
                   when b."ad_grad" = 2 THEN b."ad_code"
                   when c."ad_grad" = 2 THEN c."ad_code"
                   ELSE d."ad_code" END                      AS cityCode
                   ELSE d."ad_code" END                      AS cityCode,
               a."eng_scal" AS engScal
        FROM sjzt_md."att_res_base" a
                 LEFT JOIN sjzt_md."att_ad_base" b ON a."interior_ad_guid" = b."guid"
                 LEFT JOIN sjzt_md."att_ad_base" c ON b."p_ad_code" = c."guid"
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java
@@ -64,6 +64,10 @@
                                                         @Param("cityCode") String cityCode,
                                                         @Param("type") String type);
    List<PersonVO> getCityCountyPersonListNewByResGuid(@Param("countyCode") String countyCode,
                                                    @Param("cityCode") String cityCode,
                                                    @Param("type") String type);
    List<PatrolResponsiblePerson> getPatrolResponsiblePersonByResCdList(@Param("ids") List<String> reservoirList);
    /**
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml
@@ -233,6 +233,50 @@
        )
    </select>
    <select id="getCityCountyPersonListNewByResGuid" resultType="cn.gistack.sm.sjztmd.vo.PersonVO">
        select * from (
            (
                select real_name as name, phone, '预警短信发送人员' as type
                from YWXT.blade_user bu
                         left join YWXT.blade_dept bd on locate(bd.id, bu.dept_id) > 0 and bd.is_deleted = 0
                         left join YWXT.blade_role br on locate(br.id, bu.role_id) > 0 and br.is_deleted = 0
                where bu.is_deleted = 0
                  and br.role_alias = 'xjyjdxfsry'
                  and bd.ad_code = #{countyCode} limit 1
            )
            union
            (
                select real_name as name, phone, '预警短信发送人员' as type
                from YWXT.blade_user bu
                         left join YWXT.blade_dept bd on locate(bd.id, bu.dept_id) > 0 and bd.is_deleted = 0
                         left join YWXT.blade_role br on locate(br.id, bu.role_id) > 0 and br.is_deleted = 0
                where bu.is_deleted = 0
                  and br.role_alias = 'qxswjgly'
                  and bd.ad_code = #{countyCode} limit 1
            )
            union
            (
                select real_name as name, phone, '预警短信发送人员' as type
                from YWXT.blade_user bu
                         left join YWXT.blade_dept bd on locate(bd.id, bu.dept_id) > 0 and bd.is_deleted = 0
                         left join YWXT.blade_role br on locate(br.id, bu.role_id) > 0 and br.is_deleted = 0
                where bu.is_deleted = 0
                  and br.role_alias = 'sjyjdxfsry'
                  and bd.ad_code = #{cityCode} limit 1
            )
            union
            (
                select real_name as name, phone, '预警短信发送人员' as type
                from YWXT.blade_user bu
                         left join YWXT.blade_dept bd on locate(bd.id, bu.dept_id) > 0 and bd.is_deleted = 0
                         left join YWXT.blade_role br on locate(br.id, bu.role_id) > 0 and br.is_deleted = 0
                where bu.is_deleted = 0
                  and br.role_alias = 'dsswjgly'
                  and bd.ad_code = #{cityCode} limit 1
            )
        ) limit 1
    </select>
    <select id="getPatrolResponsiblePersonByResCdList"
            resultType="cn.gistack.sm.sjztmd.entity.PatrolResponsiblePerson">
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java
@@ -160,6 +160,15 @@
        // 查询当前水库对应的市级编号和县区编号
        AttResBaseVO attResBaseVO = attResBaseService.getCityCountyCodeByResGuid(res_cd);
        if (null!= attResBaseVO) {
            //如果是小型水库只发县级短信预警角色或者县级管理员
            if (attResBaseVO.getEngScal().equals("小(2)型") || attResBaseVO.getEngScal().equals("小(1)型")) {
                // 通过编号查询对应的人员
                List<PersonVO> personListByResGuid = baseMapper.getCityCountyPersonListNewByResGuid(attResBaseVO.getCountyCode(), attResBaseVO.getCityCode(), "");
                personVOList.addAll(personListByResGuid);
                return personVOList;
            }
            // 通过编号查询对应的人员
            List<PersonVO> personListByResGuid = baseMapper.getCityCountyPersonListByResGuid(attResBaseVO.getCountyCode(), attResBaseVO.getCityCode(), "");
            personVOList.addAll(personListByResGuid);