From 4b838e2a64b4f441819f43fccd067c076eb422b9 Mon Sep 17 00:00:00 2001
From: liusuyi <13324259@qq.com>
Date: 星期三, 26 七月 2023 22:47:15 +0800
Subject: [PATCH] 修改用户关联报警类型
---
ard-work/src/main/java/com/ruoyi/alarm/config/AsyncConfiguration.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 48 +++++++++
ruoyi-system/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java | 46 ++-------
ruoyi-system/src/main/java/com/ruoyi/alarm/config/domain/ArdAlarmTypeConfig.java | 38 +-----
ruoyi-system/src/main/java/com/ruoyi/alarm/config/mapper/ArdAlarmTypeConfigMapper.java | 14 ++
ruoyi-system/src/main/java/com/ruoyi/alarm/config/service/IArdAlarmTypeConfigService.java | 11 -
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 9 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 2
ruoyi-system/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java | 51 ---------
ard-work/src/main/resources/mapper/alarm/ArdAlarmTypeConfigMapper.xml | 27 ++---
10 files changed, 104 insertions(+), 144 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/config/AsyncConfiguration.java b/ard-work/src/main/java/com/ruoyi/alarm/config/AsyncConfiguration.java
similarity index 98%
rename from ard-work/src/main/java/com/ruoyi/config/AsyncConfiguration.java
rename to ard-work/src/main/java/com/ruoyi/alarm/config/AsyncConfiguration.java
index 2f1cf49..4052c82 100644
--- a/ard-work/src/main/java/com/ruoyi/config/AsyncConfiguration.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/config/AsyncConfiguration.java
@@ -1,4 +1,4 @@
-package com.ruoyi.config;
+package com.ruoyi.alarm.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmTypeConfigMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmTypeConfigMapper.xml
index 3f4b4a1..b053509 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmTypeConfigMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmTypeConfigMapper.xml
@@ -5,16 +5,13 @@
<mapper namespace="com.ruoyi.alarm.config.mapper.ArdAlarmTypeConfigMapper">
<resultMap type="ArdAlarmTypeConfig" id="ArdAlarmTypeConfigResult">
- <result property="id" column="id" />
<result property="command" column="command" />
<result property="alarmType" column="alarm_type" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
<result property="userId" column="user_id" />
</resultMap>
<sql id="selectArdAlarmTypeConfigVo">
- select id, command, alarm_type, create_time, user_id from ard_alarm_type_user
+ select command, alarm_type, user_id from ard_alarm_type_user
</sql>
<select id="selectArdAlarmTypeConfigList" parameterType="ArdAlarmTypeConfig" resultMap="ArdAlarmTypeConfigResult">
@@ -33,19 +30,13 @@
<insert id="insertArdAlarmTypeConfig" parameterType="ArdAlarmTypeConfig">
insert into ard_alarm_type_user
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">id,</if>
<if test="command != null">command,</if>
<if test="alarmType != null">alarm_type,</if>
- <if test="createBy != null">create_by,</if>
- <if test="createTime != null">create_time,</if>
<if test="userId != null">user_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">#{id},</if>
<if test="command != null">#{command},</if>
<if test="alarmType != null">#{alarmType},</if>
- <if test="createBy != null">#{createBy},</if>
- <if test="createTime != null">#{createTime},</if>
<if test="userId != null">#{userId},</if>
</trim>
</insert>
@@ -55,8 +46,6 @@
<trim prefix="SET" suffixOverrides=",">
<if test="command != null">command = #{command},</if>
<if test="alarmType != null">alarm_type = #{alarmType},</if>
- <if test="createBy != null">create_by = #{createBy},</if>
- <if test="createTime != null">create_time = #{createTime},</if>
<if test="userId != null">user_id = #{userId},</if>
</trim>
where id = #{id}
@@ -67,12 +56,18 @@
</delete>
<delete id="deleteArdAlarmTypeConfigByIds" parameterType="String">
- delete from ard_alarm_type_user where id in
- <foreach item="id" collection="array" open="(" separator="," close=")">
- #{id}
+ delete from ard_alarm_type_user where user_id in
+ <foreach item="userId" collection="array" open="(" separator="," close=")">
+ #{userId}
</foreach>
</delete>
- <delete id="deleteArdAlarmTypeConfigByCurrentUserId">
+ <delete id="deleteArdAlarmTypeConfigByUserId">
delete from ard_alarm_type_user where user_id=#{userId}
</delete>
+ <insert id="batchAlarmTypeConfig">
+ insert into ard_alarm_type_user(user_id,command,alarm_type) values
+ <foreach item="item" index="index" collection="list" separator=",">
+ (#{item.userId},#{item.command},#{item.alarmType})
+ </foreach>
+ </insert>
</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index b0bbc08..cc2573e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -142,7 +142,7 @@
/**
* 淇敼鐢ㄦ埛
*/
-
+ @ApiOperation("淇敼鐢ㄦ埛")
@PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index d1ef403..3a6118c 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -140,11 +140,20 @@
*/
private String rongCloudToken;
+ private List<String> commands;
public SysUser() {
}
+ public List<String> getCommands() {
+ return commands;
+ }
+
+ public void setCommands(List<String> commands) {
+ this.commands = commands;
+ }
+
public String getRongCloudToken() {
return rongCloudToken;
}
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java b/ruoyi-system/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java
similarity index 73%
rename from ard-work/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java
rename to ruoyi-system/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java
index 7ca67f0..9222774 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java
@@ -1,28 +1,22 @@
package com.ruoyi.alarm.config.controller;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
import com.ruoyi.alarm.config.domain.ArdAlarmTypeConfig;
import com.ruoyi.alarm.config.service.IArdAlarmTypeConfigService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
/**
* 鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈Controller
@@ -64,26 +58,6 @@
util.exportExcel(response, list, "鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈鏁版嵁");
}
- /**
- * 鑾峰彇鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈璇︾粏淇℃伅
- */
- @ApiOperation("鑾峰彇鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('alarm:config:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") String id)
- {
- return success(ardAlarmTypeConfigService.selectArdAlarmTypeConfigById(id));
- }
- /**
- * 鎵归噺鏂板鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈
- */
- @Log(title = "鎵归噺閰嶇疆鎶ヨ绫诲瀷", businessType = BusinessType.INSERT)
- @PostMapping("/batchConfig")
- @ApiOperation("鎵归噺閰嶇疆鎶ヨ绫诲瀷")
- public AjaxResult addBatch(@RequestBody Map<String,Object> map)
- {
- return AjaxResult.success(ardAlarmTypeConfigService.insertArdAlarmTypeConfig(map));
- }
/**
* 鏂板鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/config/domain/ArdAlarmTypeConfig.java b/ruoyi-system/src/main/java/com/ruoyi/alarm/config/domain/ArdAlarmTypeConfig.java
similarity index 60%
rename from ard-work/src/main/java/com/ruoyi/alarm/config/domain/ArdAlarmTypeConfig.java
rename to ruoyi-system/src/main/java/com/ruoyi/alarm/config/domain/ArdAlarmTypeConfig.java
index da7207f..03d24e6 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/config/domain/ArdAlarmTypeConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/alarm/config/domain/ArdAlarmTypeConfig.java
@@ -1,9 +1,9 @@
package com.ruoyi.alarm.config.domain;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
/**
* 鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈瀵硅薄 ard_alarm_type_user
@@ -16,35 +16,25 @@
{
private static final long serialVersionUID = 1L;
- /** 璁板綍ID */
- private String id;
+ /** 鐢ㄦ埛ID */
+ @Excel(name = "鐢ㄦ埛ID")
+ private String userId;
/** 鎶ヨ浠ｇ爜 */
- private Integer command;
+ private String command;
/** 鎶ヨ绫诲瀷 */
@Excel(name = "鎶ヨ绫诲瀷")
private String alarmType;
- /** 鐢ㄦ埛ID */
- @Excel(name = "鐢ㄦ埛ID")
- private String userId;
- public void setId(String id)
- {
- this.id = id;
- }
- public String getId()
- {
- return id;
- }
- public void setCommand(Integer command)
+ public void setCommand(String command)
{
this.command = command;
}
- public Integer getCommand()
+ public String getCommand()
{
return command;
}
@@ -67,15 +57,5 @@
return userId;
}
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("command", getCommand())
- .append("alarmType", getAlarmType())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("userId", getUserId())
- .toString();
- }
+
}
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/config/mapper/ArdAlarmTypeConfigMapper.java b/ruoyi-system/src/main/java/com/ruoyi/alarm/config/mapper/ArdAlarmTypeConfigMapper.java
similarity index 83%
rename from ard-work/src/main/java/com/ruoyi/alarm/config/mapper/ArdAlarmTypeConfigMapper.java
rename to ruoyi-system/src/main/java/com/ruoyi/alarm/config/mapper/ArdAlarmTypeConfigMapper.java
index 9a89b27..6c34e7d 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/config/mapper/ArdAlarmTypeConfigMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/alarm/config/mapper/ArdAlarmTypeConfigMapper.java
@@ -1,7 +1,9 @@
package com.ruoyi.alarm.config.mapper;
-import java.util.List;
import com.ruoyi.alarm.config.domain.ArdAlarmTypeConfig;
+import com.ruoyi.system.domain.SysUserRole;
+
+import java.util.List;
/**
* 鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈Mapper鎺ュ彛
@@ -64,6 +66,14 @@
* @param userId 鍏宠仈鐨勭敤鎴穒d
* @return 缁撴灉
*/
- public int deleteArdAlarmTypeConfigByCurrentUserId(String userId);
+ public int deleteArdAlarmTypeConfigByUserId(String userId);
+
+ /**
+ * 鎵归噺鏂板鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈
+ *
+ * @param ardAlarmTypeConfigList 鎶ヨ绫诲瀷鐢ㄦ埛鍒楄〃
+ * @return 缁撴灉
+ */
+ public int batchAlarmTypeConfig(List<ArdAlarmTypeConfig> ardAlarmTypeConfigList);
}
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/config/service/IArdAlarmTypeConfigService.java b/ruoyi-system/src/main/java/com/ruoyi/alarm/config/service/IArdAlarmTypeConfigService.java
similarity index 88%
rename from ard-work/src/main/java/com/ruoyi/alarm/config/service/IArdAlarmTypeConfigService.java
rename to ruoyi-system/src/main/java/com/ruoyi/alarm/config/service/IArdAlarmTypeConfigService.java
index cb29a8f..19d8a76 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/config/service/IArdAlarmTypeConfigService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/alarm/config/service/IArdAlarmTypeConfigService.java
@@ -1,9 +1,9 @@
package com.ruoyi.alarm.config.service;
+import com.ruoyi.alarm.config.domain.ArdAlarmTypeConfig;
+
import java.util.List;
import java.util.Map;
-
-import com.ruoyi.alarm.config.domain.ArdAlarmTypeConfig;
/**
@@ -62,12 +62,5 @@
*/
public int deleteArdAlarmTypeConfigById(String id);
- /**
- * 鎵归噺鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈
- *
- * @param configInfoMap 鎶ヨ绫诲瀷鍒楄〃
- * @return 缁撴灉
- */
- public int insertArdAlarmTypeConfig(Map<String,Object> configInfoMap);
}
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java
similarity index 63%
rename from ard-work/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java
rename to ruoyi-system/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java
index 92ed5dd..472f039 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java
@@ -1,7 +1,6 @@
package com.ruoyi.alarm.config.service.impl;
-
import com.ruoyi.alarm.config.domain.ArdAlarmTypeConfig;
import com.ruoyi.alarm.config.mapper.ArdAlarmTypeConfigMapper;
import com.ruoyi.alarm.config.service.IArdAlarmTypeConfigService;
@@ -12,6 +11,8 @@
import com.ruoyi.system.mapper.SysDictDataMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -25,10 +26,8 @@
*/
@Service
public class ArdAlarmTypeConfigServiceImpl implements IArdAlarmTypeConfigService {
- @Autowired
+ @Resource
private ArdAlarmTypeConfigMapper ardAlarmTypeConfigMapper;
- @Autowired
- private SysDictDataMapper dictDataMapper;
/**
* 鏌ヨ鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈
*
@@ -59,8 +58,6 @@
*/
@Override
public int insertArdAlarmTypeConfig(ArdAlarmTypeConfig ardAlarmTypeConfig) {
- ardAlarmTypeConfig.setCreateBy(SecurityUtils.getUsername());
- ardAlarmTypeConfig.setCreateTime(DateUtils.getNowDate());
ardAlarmTypeConfig.setUserId(SecurityUtils.getUserId());
return ardAlarmTypeConfigMapper.insertArdAlarmTypeConfig(ardAlarmTypeConfig);
}
@@ -96,47 +93,5 @@
@Override
public int deleteArdAlarmTypeConfigById(String id) {
return ardAlarmTypeConfigMapper.deleteArdAlarmTypeConfigById(id);
- }
- /**
- * 鎵归噺鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈
- *
- * @param configInfo 鎶ヨ绫诲瀷鍒楄〃
- * @return 缁撴灉
- */
- @Override
- public int insertArdAlarmTypeConfig(Map<String,Object> configInfo) {
- String userId =(String) configInfo.get("userId");
- if(userId==null)
- {
- return 0;
- }
- ardAlarmTypeConfigMapper.deleteArdAlarmTypeConfigByCurrentUserId(userId);
- List<Integer> commands=(List<Integer>) configInfo.get("commands");
- if(commands==null)
- {
- return 0;
- }
- if(commands.size()==0)
- {
- return 0;
- }
- int resNum=0;
- for(Integer command :commands)
- {
- ArdAlarmTypeConfig config=new ArdAlarmTypeConfig();
- config.setId(IdUtils.simpleUUID());
- config.setCommand(command);
- 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(userId);
- config.setCreateTime(DateUtils.getNowDate());
- int i = ardAlarmTypeConfigMapper.insertArdAlarmTypeConfig(config);
- if(i>0)
- {
- resNum++;
- }
- }
- return resNum;
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 93eca00..c74bca5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -3,13 +3,19 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import javax.validation.Validator;
+import com.ruoyi.alarm.config.domain.ArdAlarmTypeConfig;
+import com.ruoyi.alarm.config.mapper.ArdAlarmTypeConfigMapper;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -67,6 +73,8 @@
protected Validator validator;
@Resource
private RedisCache redisCache;
+ @Resource
+ private ArdAlarmTypeConfigMapper ardAlarmTypeConfigMapper;
/**
* 椤圭洰鍚姩鏃讹紝鍒濆鍖栧弬鏁板埌缂撳瓨
@@ -306,6 +314,8 @@
insertUserPost(user);
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
insertUserRole(user);
+ // 鏂板鐢ㄦ埛涓庢姤璀︾被鍨嬪叧鑱�
+ insertAlarmTypeConfig(user);
return rows;
}
@@ -330,6 +340,11 @@
@Transactional
public int updateUser(SysUser user) {
String userId = user.getUserId();
+ // 鍒犻櫎鐢ㄦ埛涓庢姤璀︾被鍨嬪叧鑱�
+ ardAlarmTypeConfigMapper.deleteArdAlarmTypeConfigByUserId(userId);
+ // 鏂板鐢ㄦ埛涓庢姤璀︾被鍨嬪叧鑱�
+ insertAlarmTypeConfig(user);
+
// 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
userRoleMapper.deleteUserRoleByUserId(userId);
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
@@ -429,7 +444,14 @@
public void insertUserRole(SysUser user) {
this.insertUserRole(user.getUserId(), user.getRoleIds());
}
-
+ /**
+ * 鏂板鐢ㄦ埛鎶ヨ绫诲瀷淇℃伅
+ *
+ * @param user 鐢ㄦ埛瀵硅薄
+ */
+ public void insertAlarmTypeConfig(SysUser user) {
+ this.insertAlarmTypeConfig(user.getUserId(), user.getCommands());
+ }
/**
* 鏂板鐢ㄦ埛宀椾綅淇℃伅
*
@@ -469,7 +491,27 @@
userRoleMapper.batchUserRole(list);
}
}
-
+ /**
+ * 鏂板鐢ㄦ埛鎶ヨ绫诲瀷
+ *
+ * @param userId 鐢ㄦ埛ID
+ * @param commands 鎶ヨ绫诲瀷缁�
+ */
+ public void insertAlarmTypeConfig(String userId, List<String> commands) {
+ if (StringUtils.isNotEmpty(commands)) {
+ // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
+ List<ArdAlarmTypeConfig> list = new ArrayList<ArdAlarmTypeConfig>(commands.size());
+ for (String command : commands) {
+ ArdAlarmTypeConfig ur = new ArdAlarmTypeConfig();
+ ur.setUserId(userId);
+ ur.setCommand(command);
+ String alarm_type = DictUtils.getDictLabel("alarm_type", command);
+ ur.setAlarmType(alarm_type);
+ list.add(ur);
+ }
+ ardAlarmTypeConfigMapper.batchAlarmTypeConfig(list);
+ }
+ }
/**
* 閫氳繃鐢ㄦ埛ID鍒犻櫎鐢ㄦ埛
*
@@ -503,6 +545,8 @@
checkUserAllowed(new SysUser(userId));
checkUserDataScope(userId);
}
+ // 鍒犻櫎鐢ㄦ埛涓庢姤璀︾被鍨嬪叧鑱�
+ ardAlarmTypeConfigMapper.deleteArdAlarmTypeConfigByIds(userIds);
// 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
userRoleMapper.deleteUserRole(userIds);
// 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
--
Gitblit v1.9.3