From 7594869a187c79d599ec39863292dbe6af553712 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 01 十二月 2021 15:02:19 +0800
Subject: [PATCH] 分组功能完善

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/GroupService.java |   42 ++++++++++++++++++++++++++++++------------
 1 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/GroupService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/GroupService.java
index 31da830..d479822 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/GroupService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/GroupService.java
@@ -1,37 +1,55 @@
 package com.sandu.ximon.admin.service;
 
+import com.sandu.common.execption.BusinessException;
 import com.sandu.common.service.impl.BaseServiceImpl;
 import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.dao.domain.Group;
+import com.sandu.ximon.dao.domain.Groups;
 import com.sandu.ximon.dao.mapper.GroupMapper;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 @AllArgsConstructor
-public class GroupService extends BaseServiceImpl<GroupMapper, Group> {
+public class GroupService extends BaseServiceImpl<GroupMapper, Groups> {
 
-    public void addGroup(String name) {
-        Group group = new Group();
+    private final GroupMapper groupMapper;
+
+    public boolean addGroup(String name) {
+        Groups group = new Groups();
         group.setUserId(SecurityUtils.getUserId());
         group.setName(name);
-        group.setCount(null);
-        save(group);
-
+       // group.setCount(null);
+        return   save(group);
     }
-//缁欑伅鏉嗚缃垎缁勫湪鐏潌閭h竟
 
-    public void updateGroup(String name,Long id) {
-        Group group = new Group();
+    //缁欑伅鏉嗚缃垎缁勫湪鐏潌閭h竟
+
+    public boolean updateGroup(Long id,String name) {
+        Groups byId = getById(id);
+        if(byId==null){
+            throw new BusinessException("鏈壘鍒拌鍒嗙粍");
+        }
+        Groups group = new Groups();
         //group.setUserId(SecurityUtils.getUserId());
         group.setId(id);
         group.setName(name);
         //group.setCount(null);
-        updateById(group);
-
+        return  updateById(group);
     }
 
+    public boolean deleteGroup(Long id){
+        Groups byId = getById(id);
+        if(byId==null){
+            throw new BusinessException("鏈壘鍒拌鍒嗙粍");
+        }
+      return  removeById(id);
+    }
 
+    public List<Groups> groupList(){
+        return groupMapper.groupList(SecurityUtils.getUserId());
+    }
 
 
 }

--
Gitblit v1.9.3