From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java
index 6d86b3e..1cc7691 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java
@@ -5,7 +5,7 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.ximon.admin.param.PoleGroupParam;
+import com.sandu.ximon.admin.param.GroupParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.PoleGroup;
import com.sandu.ximon.dao.domain.PoleGroupRelation;
@@ -14,7 +14,6 @@
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -28,7 +27,7 @@
private final PoleGroupRelationService poleGroupRelationService;
- public boolean addGroup(PoleGroupParam param) {
+ public boolean addGroup(GroupParam param) {
PoleGroup group = new PoleGroup();
if (SecurityUtils.getClientId() != null) {
group.setClientId(SecurityUtils.getUserId());
@@ -37,7 +36,7 @@
return save(group);
}
- public boolean updateGroup(Long groupId, PoleGroupParam param) {
+ public boolean updateGroup(Long groupId, GroupParam param) {
PoleGroup poleGroup = getById(groupId);
if (poleGroup == null) {
throw new BusinessException("鏈壘鍒拌鍒嗙粍");
@@ -48,16 +47,16 @@
return updateById(update);
}
- public boolean deleteGroup(Long groupId) {
- PoleGroup poleGroup = getById(groupId);
- if (poleGroup == null) {
+ public boolean deleteGroup(List<Long> groupIds) {
+ List<PoleGroup> poleGroups = listByIds(groupIds);
+ if (poleGroups.isEmpty()) {
throw new BusinessException("鏈壘鍒拌鍒嗙粍");
}
/**
* 鍒櫎
*/
- poleGroupRelationService.remove(Wrappers.lambdaQuery(PoleGroupRelation.class).eq(PoleGroupRelation::getPoleGroupId, groupId));
- return removeById(groupId);
+ poleGroupRelationService.remove(Wrappers.lambdaQuery(PoleGroupRelation.class).in(PoleGroupRelation::getPoleGroupId, groupIds));
+ return removeByIds(groupIds);
}
public List<PoleGroup> groupList(BaseConditionVO baseConditionVO, String keyword, Integer order, Integer seq) {
--
Gitblit v1.9.3