优化报警类型配置

‘liusuyi’

2023-06-21 e2ea7986cf5e27e448a25c48c8c4cc771c067b0e

优化报警类型配置

 ard-work/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java

@@ -1,12 +1,15 @@
package com.ruoyi.alarm.config.controller;

import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;

import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.ruoyi.alarm.config.domain.ArdAlarmTypeConfig;
import com.ruoyi.alarm.config.service.IArdAlarmTypeConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,7 +45,7 @@
    /**
     * 查询报警类型用户关联列表
     */
    @PreAuthorize("@ss.hasPermi('alarm:alarmConfig:list')")
    //@PreAuthorize("@ss.hasPermi('alarm:alarmConfig:list')")
    @GetMapping("/list")
    @ApiOperation("查询报警类型用户关联列表")
    public TableDataInfo list(ArdAlarmTypeConfig ardAlarmTypeConfig)
@@ -77,14 +80,13 @@
    /**
     * 批量新增报警类型用户关联
     */
    @PreAuthorize("@ss.hasPermi('alarm:alarmConfig:add')")
    @Log(title = "批量配置报警类型", businessType = BusinessType.INSERT)
    @PostMapping("/batchConfig")
    @ApiOperation("批量配置报警类型")
    public AjaxResult addBatch(@RequestBody List<Integer> commands)
    @ApiOperationSupport(includeParameters = {"map.userId", "map.commands"})
    public AjaxResult addBatch(@RequestBody Map<String,Object> map)
    {
        ardAlarmTypeConfigService.deleteArdAlarmTypeConfigByCurrentUserId();
        return AjaxResult.success(ardAlarmTypeConfigService.insertArdAlarmTypeConfig(commands));
        return AjaxResult.success(ardAlarmTypeConfigService.insertArdAlarmTypeConfig(map));
    }

    /**

 ard-work/src/main/java/com/ruoyi/alarm/config/service/IArdAlarmTypeConfigService.java

@@ -1,6 +1,8 @@
package com.ruoyi.alarm.config.service;

import java.util.List;
import java.util.Map;

import com.ruoyi.alarm.config.domain.ArdAlarmTypeConfig;


@@ -63,16 +65,9 @@
    /**
     * 批量报警类型用户关联
     *
     * @param command 报警类型列表
     * @param configInfoMap 报警类型列表
     * @return 结果
     */
    public int insertArdAlarmTypeConfig(List<Integer>  command);

    /**
     * 批量删除报警类型用户关联
     *
     * @return 结果
     */
    public int deleteArdAlarmTypeConfigByCurrentUserId();
    public int insertArdAlarmTypeConfig(Map<String,Object> configInfoMap);

}

 ard-work/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java

@@ -13,6 +13,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
import java.util.Objects;


@@ -99,11 +100,18 @@
    /**
     * 批量报警类型用户关联
     *
     * @param commands 报警类型列表
     * @param configInfo 报警类型列表
     * @return 结果
     */
    @Override
    public int insertArdAlarmTypeConfig(List<Integer> commands) {
    public int insertArdAlarmTypeConfig(Map<String,Object> configInfo) {
        String userId =(String) configInfo.get("userId");
        ardAlarmTypeConfigMapper.deleteArdAlarmTypeConfigByCurrentUserId(userId);
        List<Integer> commands=(List<Integer>) configInfo.get("commands");
        if(commands.size()==0)
        {
            return 0;
        }
        int resNum=0;
        for(Integer command :commands)
        {
@@ -113,7 +121,7 @@
            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType("alarm_type");
            SysDictData sysDictData = dictDatas.stream().filter(s -> Objects.equals(s.getDictValue(), command.toString())).findFirst().orElse(null);
            config.setAlarmType(sysDictData.getDictLabel());
            config.setUserId(SecurityUtils.getUserId());
            config.setUserId(userId);
            config.setCreateTime(DateUtils.getNowDate());
            int i = ardAlarmTypeConfigMapper.insertArdAlarmTypeConfig(config);
            if(i>0)
@@ -122,10 +130,5 @@
            }
        }
        return resNum;
    }

    @Override
    public int deleteArdAlarmTypeConfigByCurrentUserId() {
        return ardAlarmTypeConfigMapper.deleteArdAlarmTypeConfigByCurrentUserId(SecurityUtils.getUserId());
    }
}