From f736df1648a4d9bb8620d38cf4421cf36eacdfc0 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 04 三月 2022 14:37:39 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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 f230f0a..5717982 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
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
@@ -8,10 +9,12 @@
import com.sandu.ximon.admin.param.PoleGroupParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.PoleGroup;
+import com.sandu.ximon.dao.domain.PoleGroupRelation;
import com.sandu.ximon.dao.mapper.PoleGroupMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -27,10 +30,9 @@
public boolean addGroup(PoleGroupParam param) {
PoleGroup group = new PoleGroup();
- if(SecurityUtils.getClientId()!=null){
+ if (SecurityUtils.getClientId() != null) {
group.setClientId(SecurityUtils.getUserId());
}
-
group.setGroupName(param.getGroupName());
return save(group);
}
@@ -54,24 +56,33 @@
return removeById(groupId);
}
- public List<PoleGroup> groupList(BaseConditionVO baseConditionVO,String keyword) {
+ public List<PoleGroup> groupList(BaseConditionVO baseConditionVO, String keyword, Long groupid) {
Long clientId = SecurityUtils.getClientId();
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+
+// LambdaQueryWrapper<PoleGroup> wrapper = new LambdaQueryWrapper<>();
+ List<PoleGroup> list = new ArrayList<>();
if (clientId == null) {
- return list(Wrappers.lambdaQuery(PoleGroup.class).like(PoleGroup::getGroupName,keyword));
+ list = list(Wrappers.lambdaQuery(PoleGroup.class).like(PoleGroup::getGroupName, keyword));
+
} else {
- return list(Wrappers.lambdaQuery(PoleGroup.class).eq(PoleGroup::getClientId, clientId).like(PoleGroup::getGroupName,keyword));
+ list = list(Wrappers.lambdaQuery(PoleGroup.class).eq(PoleGroup::getClientId, clientId).like(PoleGroup::getGroupName, keyword));
}
+ list.forEach(poleGroup -> {
+// int size = poleGroupRelationService.list(Wrappers.lambdaQuery(PoleGroupRelation.class).eq(PoleGroupRelation::getPoleGroupId, poleGroup.getGroupId())).size();
+ poleGroup.setPoleCount(poleGroupRelationService.list(Wrappers.lambdaQuery(PoleGroupRelation.class).eq(PoleGroupRelation::getPoleGroupId, poleGroup.getGroupId())).size());
+ });
+ return list;
}
/**
* 缁戝畾鐏潌
*/
- public boolean bindPole(Long groupId,List<Long> poleIdList) {
+ public boolean bindPole(Long groupId, List<Long> poleIdList) {
PoleGroup poleGroup = getById(groupId);
if (poleGroup == null) {
throw new BusinessException("鏈壘鍒拌鍒嗙粍");
}
- return poleGroupRelationService.saveBinding(groupId,poleIdList);
+ return poleGroupRelationService.saveBinding(groupId, poleIdList);
}
}
--
Gitblit v1.9.3