大坝安全监测接口添加流域,支持多选

guoshilong

2023-09-07 1b683704585cef8d0f343a4673bffebdb6910456

大坝安全监测接口添加流域,支持多选

 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("basCode") String basCode);

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


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

@@ -461,7 +461,14 @@
            AND  (province."ad_code" =#{dam.adCode} or city."ad_code" = #{dam.adCode} or county."ad_code" = #{dam.adCode})
        </if>
        <if test="dam.basCode != null and dam.basCode !='' ">
            AND abb."code" = #{dam.basCode} or pabb."code" = #{dam.basCode}
            AND(abb."code" in
            <foreach collection="basCode.split(',')" item="item" index="index" open="(" separator="," close=")">
                #{item}
            </foreach>
              or pabb."code" in
            <foreach collection="basCode.split(',')" item="item" index="index" open="(" separator="," close=")">
                 #{item})
            </foreach>
        </if>
    </select>


 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