Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev

zhongrj

2023-09-07 b8e5669a7f8b1e8935920f6b172369a07fae2f26

Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java

@@ -114,8 +114,8 @@
     */
    @ApiOperation(value = "大坝安全统计-大坝安全监测预警异常统计", notes = "大坝安全统计-大坝安全监测预警异常统计")
    @GetMapping(value = "/alarmResCount")
    public R alarmResCount(DamStationStatistics damStationStatistics){
        List<DamStationStatistics> list =  damSecurityService.alarmResCount(damStationStatistics);
    public R alarmResCount(DamStationStatistics damStationStatistics,String basCodes){
        List<DamStationStatistics> list =  damSecurityService.alarmResCount(damStationStatistics,basCodes);
        return R.data(list);
    }


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java

@@ -19,7 +19,7 @@

    List<DamStationStatistics> tableResCountPage(@Param("dam")DamStationStatistics damStationStatistics, IPage<DamStationStatistics> page);

    List<DamStationStatistics> alarmResCount(@Param("dam") DamStationStatistics damStationStatistics);
    List<DamStationStatistics> alarmResCount(@Param("dam") DamStationStatistics damStationStatistics,@Param("basCodes") String basCodes);

    List<DamStatisticsRes> damResInfoCount(@Param("adCode") String adCode);


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml

@@ -439,7 +439,9 @@
        SELECT
               arb."center_long" AS longitude,
               arb."center_lat" AS latitude,
               resCd
               resCd,
               abb."code" AS basCode,
               abb."name" AS basName
        FROM
            (
                SELECT NAG.dam_id resCd,count(*)  FROM YWXT.NKY_ALARM_GET NAG GROUP BY NAG.dam_id
@@ -449,10 +451,27 @@
                LEFT JOIN SJZT_MD."att_ad_base" county ON county."guid" = town."p_ad_code"
                LEFT JOIN SJZT_MD."att_ad_base" city ON city."guid" = county."p_ad_code"
                LEFT JOIN SJZT_MD."att_ad_base" province ON province."guid" = city."p_ad_code"

                LEFT JOIN SJZT_MD."rel_res_bas_loc" rrbl ON rrbl."res_guid" = baseAlarm.resCd
                LEFT JOIN SJZT_MD."att_bas_base" abb ON abb."code" = rrbl."bas_guid"
                LEFT JOIN SJZT_MD."att_bas_base" pabb ON abb."p_code" = pabb."code"

        WHERE 1=1
        <if test="dam.adCode != null and dam.adCode !='' ">
            AND  (province."ad_code" =#{dam.adCode} or city."ad_code" = #{dam.adCode} or county."ad_code" = #{dam.adCode})
        </if>
        <if test="basCodes != null and basCodes !='' ">
            AND(
                abb."code" in
            <foreach collection="basCodes.split(',')" item="item" index="index" open="(" separator="," close=")">
                #{item}
            </foreach>
                    or pabb."code" in
            <foreach collection="basCodes.split(',')" item="item" index="index" open="(" separator="," close=")">
                 #{item}
            </foreach>
            )
        </if>
    </select>

    <select id="damResInfoCount" resultType="cn.gistack.sm.damSecurity.vo.DamStatisticsRes">

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/IDamSecurityService.java

@@ -37,7 +37,7 @@
     * @param damStationStatistics
     * @return
     */
    List<DamStationStatistics> alarmResCount(DamStationStatistics damStationStatistics);
    List<DamStationStatistics> alarmResCount(DamStationStatistics damStationStatistics,String basCode);

    /**
     * 业务一张图大坝安全监测

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java

@@ -44,8 +44,8 @@
    }

    @Override
    public List<DamStationStatistics> alarmResCount(DamStationStatistics damStationStatistics) {
        return damSecurityMapper.alarmResCount(damStationStatistics);
    public List<DamStationStatistics> alarmResCount(DamStationStatistics damStationStatistics,String basCode) {
        return damSecurityMapper.alarmResCount(damStationStatistics,basCode);
    }

    @Override

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/vo/DamStationStatistics.java

@@ -91,4 +91,14 @@
    private String startTime;

    private String endTime;

    /**
     * 流域id
     */
    private String basCode;

    /**
     * 流域名称
     */
    private String basName;
}