diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java index 0d2981dc..25640db7 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java @@ -45,4 +45,10 @@ public class AlarmContactGroupController { return alarmContactGroupService.deleteById(id); } + @DeleteMapping("deleteUserById") + @ApiOperation(value = "删除报警人联系人组下单独联系人", notes = "删除报警联系人组下单独联系人") + public Result deleteUserById(String id, String userId){ + return alarmContactGroupService.deleteUserById(id, userId); + } + } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java index 8bb41e4a..7ce6721f 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java @@ -17,4 +17,6 @@ public interface IAlarmContactGroupService extends IService { Result deleteById(String id); + Result deleteUserById(String id, String userId); + } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java index 76c3d6aa..bb2dcc68 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java @@ -69,8 +69,6 @@ public class AlarmContactGroupServiceImpl extends ServiceImpl userList = systemClient.findUserMap(); //根据id查询对应的数据 判断数据是否在数据库中 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(AlarmContactGroup::getId, id); @@ -86,16 +84,6 @@ public class AlarmContactGroupServiceImpl extends ServiceImpl userIds = contactGroupMembers.stream().map(AlarmContactGroupMember::getUserId).collect(Collectors.toList()); alarmContactGroup.setUserIds(userIds); - //根据用户id获得对应的用户信息 - List 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.setResult(alarmContactGroup); @@ -180,4 +168,16 @@ public class AlarmContactGroupServiceImpl extends ServiceImpl contactGroupMemberQueryWrapper = new LambdaQueryWrapper<>(); + contactGroupMemberQueryWrapper.eq(AlarmContactGroupMember::getGroupId, id); + contactGroupMemberQueryWrapper.eq(AlarmContactGroupMember::getUserId, userId); + alarmContactGroupMemberMapper.delete(contactGroupMemberQueryWrapper); + result.setSuccess(true); + result.success("删除成功"); + return result; + } + }