xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增删除报警人联系人组下单独联系人接口

Browse Source
This commit is contained in:
qiaoqinzheng 2023-07-21 10:53:47 +08:00
parent 42c9bf9bea
commit 4b113079ca
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java
View File

@ -45,4 +45,10 @@ public class AlarmContactGroupController {
return alarmContactGroupService.deleteById(id); return alarmContactGroupService.deleteById(id);
} }
@DeleteMapping("deleteUserById")
@ApiOperation(value = "删除报警人联系人组下单独联系人", notes = "删除报警联系人组下单独联系人")
public Result deleteUserById(String id, String userId){
return alarmContactGroupService.deleteUserById(id, userId);
}
} }

2
jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java
View File

@ -17,4 +17,6 @@ public interface IAlarmContactGroupService extends IService<AlarmContactGroup> {
Result deleteById(String id); Result deleteById(String id);
Result deleteUserById(String id, String userId);
} }

24
jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java
View File

@ -69,8 +69,6 @@ public class AlarmContactGroupServiceImpl extends ServiceImpl<AlarmContactGroupM
@Override @Override
public Result findInfo(String id) { public Result findInfo(String id) {
Result result = new Result(); Result result = new Result();
//获取用户信息
Map<String ,SysUser> userList = systemClient.findUserMap();
//根据id查询对应的数据 判断数据是否在数据库中 //根据id查询对应的数据 判断数据是否在数据库中
LambdaQueryWrapper<AlarmContactGroup> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<AlarmContactGroup> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(AlarmContactGroup::getId, id); queryWrapper.eq(AlarmContactGroup::getId, id);
@ -86,16 +84,6 @@ public class AlarmContactGroupServiceImpl extends ServiceImpl<AlarmContactGroupM
if (CollectionUtils.isNotEmpty(contactGroupMembers)){ if (CollectionUtils.isNotEmpty(contactGroupMembers)){
List<String> userIds = contactGroupMembers.stream().map(AlarmContactGroupMember::getUserId).collect(Collectors.toList()); List<String> userIds = contactGroupMembers.stream().map(AlarmContactGroupMember::getUserId).collect(Collectors.toList());
alarmContactGroup.setUserIds(userIds); alarmContactGroup.setUserIds(userIds);
//根据用户id获得对应的用户信息
List<SysUser> sysUsers = new LinkedList<>();
if (CollectionUtils.isNotEmpty(userList)){
for (String userId:userIds) {
if (userList.containsKey(userId)){
sysUsers.add(userList.get(userId));
}
}
}
alarmContactGroup.setUsers(sysUsers);
} }
result.setSuccess(true); result.setSuccess(true);
result.setResult(alarmContactGroup); result.setResult(alarmContactGroup);
@ -180,4 +168,16 @@ public class AlarmContactGroupServiceImpl extends ServiceImpl<AlarmContactGroupM
return result; return result;
} }
@Override
public Result deleteUserById(String id, String userId) {
Result result = new Result();
LambdaQueryWrapper<AlarmContactGroupMember> contactGroupMemberQueryWrapper = new LambdaQueryWrapper<>();
contactGroupMemberQueryWrapper.eq(AlarmContactGroupMember::getGroupId, id);
contactGroupMemberQueryWrapper.eq(AlarmContactGroupMember::getUserId, userId);
alarmContactGroupMemberMapper.delete(contactGroupMemberQueryWrapper);
result.setSuccess(true);
result.success("删除成功");
return result;
}
} }