From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java |   55 +++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 45 insertions(+), 10 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 5717982..073ae92 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,20 +1,19 @@
 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;
 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;
+import com.sandu.ximon.dao.enums.OrderByEnums;
 import com.sandu.ximon.dao.mapper.PoleGroupMapper;
 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("鏈壘鍒拌鍒嗙粍");
@@ -53,23 +52,59 @@
         if (poleGroup == null) {
             throw new BusinessException("鏈壘鍒拌鍒嗙粍");
         }
+        /**
+         * 鍒櫎
+         */
+        poleGroupRelationService.remove(Wrappers.lambdaQuery(PoleGroupRelation.class).eq(PoleGroupRelation::getPoleGroupId, groupId));
         return removeById(groupId);
     }
 
-    public List<PoleGroup> groupList(BaseConditionVO baseConditionVO, String keyword, Long groupid) {
+    public List<PoleGroup> groupList(BaseConditionVO baseConditionVO, String keyword, Integer order, Integer seq) {
         Long clientId = SecurityUtils.getClientId();
-        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
 
-//        LambdaQueryWrapper<PoleGroup> wrapper = new LambdaQueryWrapper<>();
-        List<PoleGroup> list = new ArrayList<>();
+        //鎺掑簭瀛楁
+        String orderByResult = "group_id";
+        //姝ｅ簭銆佸�掑彊
+        String orderBySeq = OrderByEnums.ASC.getCode();
+        if (order != null) {
+            switch (order) {
+                case 1:
+                    orderByResult = OrderByEnums.POLE_GROUP_UPDATE_TIME.getCode();
+                    break;
+                case 2:
+                    orderByResult = OrderByEnums.POLE_GROUP_CREATE_TIME.getCode();
+                    break;
+                default:
+            }
+        }
+        if (seq != null) {
+            switch (seq) {
+                case 1:
+                    orderBySeq = OrderByEnums.ASC.getCode();
+                    break;
+                case 2:
+                    orderBySeq = OrderByEnums.DESC.getCode();
+                    break;
+                default:
+                    break;
+            }
+        }
+        //鎺掑簭鏂瑰紡
+        String orderBy = orderByResult + " " + orderBySeq;
+
+        if (baseConditionVO != null) {
+            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+        }
+
+        List<PoleGroup> list;
         if (clientId == null) {
             list = list(Wrappers.lambdaQuery(PoleGroup.class).like(PoleGroup::getGroupName, keyword));
 
         } else {
             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;

--
Gitblit v1.9.3