‘liusuyi’
2023-10-06 63e7ee4de83e1dfd0d4db6113ca07fe544155c14
增加批量恢复报警过滤接口
已修改5个文件
40 ■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/alarm/filter/controller/ArdAlarmFilterController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/filter/mapper/ArdAlarmFilterMapper.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/filter/service/IArdAlarmFilterService.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/filter/service/impl/ArdAlarmFilterServiceImpl.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/resources/mapper/alarm/ArdAlarmFilterMapper.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/filter/controller/ArdAlarmFilterController.java
@@ -105,11 +105,10 @@
    @ApiOperation("恢复报警过滤")
    @PreAuthorize("@ss.hasPermi('alarm:filter:edit')")
    @Log(title = "恢复报警过滤", businessType = BusinessType.UPDATE)
    @PutMapping("/recovery")
    public AjaxResult recovery(@RequestBody ArdAlarmFilter ardAlarmFilter)
    @PutMapping("/recovery/{ids}")
    public AjaxResult recovery(@PathVariable String[] ids)
    {
        ardAlarmFilter.setEndTime(DateUtils.covertTime(new Date()));
        return toAjax(ardAlarmFilterService.updateArdAlarmFilter(ardAlarmFilter));
        return toAjax(ardAlarmFilterService.RecoveryArdAlarmFilter(ids));
    }
    /**
     * 删除报警过滤
ard-work/src/main/java/com/ruoyi/alarm/filter/mapper/ArdAlarmFilterMapper.java
@@ -1,7 +1,9 @@
package com.ruoyi.alarm.filter.mapper;
import java.util.Date;
import java.util.List;
import com.ruoyi.alarm.filter.domain.ArdAlarmFilter;
import org.apache.ibatis.annotations.Param;
/**
 * 报警过滤Mapper接口
@@ -58,4 +60,11 @@
     * @return 结果
     */
    public int deleteArdAlarmFilterByIds(String[] ids);
    /**
     * 批量恢复报警过滤
     *
     * @param ids 需要恢复的数据主键集合
     * @return 结果
     */
    public int batchRecoveryArdAlarmFilterByIds(String[] ids);
}
ard-work/src/main/java/com/ruoyi/alarm/filter/service/IArdAlarmFilterService.java
@@ -42,7 +42,13 @@
     * @return 结果
     */
    public int updateArdAlarmFilter(ArdAlarmFilter ardAlarmFilter);
    /**
     * 批量恢复报警过滤
     *
     * @param ids 需要恢复的报警过滤主键集合
     * @return 结果
     */
    public int RecoveryArdAlarmFilter(String[] ids);
    /**
     * 批量删除报警过滤
     * 
ard-work/src/main/java/com/ruoyi/alarm/filter/service/impl/ArdAlarmFilterServiceImpl.java
@@ -17,6 +17,8 @@
import com.ruoyi.alarm.filter.domain.ArdAlarmFilter;
import com.ruoyi.alarm.filter.service.IArdAlarmFilterService;
import javax.annotation.Resource;
/**
 * 报警过滤Service业务层处理
 *
@@ -25,7 +27,7 @@
 */
@Service
public class ArdAlarmFilterServiceImpl implements IArdAlarmFilterService {
    @Autowired
    @Resource
    private ArdAlarmFilterMapper ardAlarmFilterMapper;
    /**
@@ -80,6 +82,11 @@
        return ardAlarmFilterMapper.updateArdAlarmFilter(ardAlarmFilter);
    }
    @Override
    public int RecoveryArdAlarmFilter(String[] ids) {
        return ardAlarmFilterMapper.batchRecoveryArdAlarmFilterByIds(ids);
    }
    /**
     * 批量删除报警过滤
     *
ard-work/src/main/resources/mapper/alarm/ArdAlarmFilterMapper.xml
@@ -102,4 +102,11 @@
            #{id}
        </foreach>
    </delete>
    <update id="batchRecoveryArdAlarmFilterByIds" parameterType="String">
        update ard_alarm_filter set end_time=now()::timestamp(0)
        where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </update>
</mapper>