From 7dba9ac1730087d375f8a11a411633c0a7187e05 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Sat, 25 Mar 2023 21:17:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E6=B1=A0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E7=AB=AF=E5=8F=A3?=
 =?UTF-8?q?=E6=B1=A0=E5=88=86=E7=BB=84=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-admin/src/views/system/portPool.vue         | 7 ++++---
 .../proxy/server/controller/req/PortPoolListReq.java       | 5 ++++-
 .../fun/asgc/neutrino/proxy/server/dal/PortPoolMapper.java | 2 +-
 .../src/main/resources/mapper/PortPoolMapper.xml           | 7 ++++++-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/neutrino-proxy-admin/src/views/system/portPool.vue b/neutrino-proxy-admin/src/views/system/portPool.vue
index 93b300f6..548267da 100644
--- a/neutrino-proxy-admin/src/views/system/portPool.vue
+++ b/neutrino-proxy-admin/src/views/system/portPool.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="app-container calendar-list-container">
     <div class="filter-container">
+      <el-select v-model="listQuery.groupId" placeholder="请选择端口池分组" clearable>
+        <el-option v-for="item in portGroupList" :key="item.id" :label="item.name" :value="item.id"/>
+      </el-select>
       <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">{{$t('table.search')}}</el-button>
       <el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate" type="primary" icon="el-icon-edit">{{$t('table.add')}}</el-button>
     </div>
@@ -125,9 +128,7 @@
         listQuery: {
           current: 1,
           size: 10,
-          importance: undefined,
-          title: undefined,
-          type: undefined
+          groupId: undefined
         },
         importanceOptions: [1, 2, 3],
         calendarTypeOptions,
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolListReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolListReq.java
index c8f35bbb..9e34975d 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolListReq.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolListReq.java
@@ -30,5 +30,8 @@ import lombok.Data;
  */
 @Data
 public class PortPoolListReq {
-
+    /**
+     * 分组ID
+     */
+    private Integer groupId;
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortPoolMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortPoolMapper.java
index 0e2c7fa6..c2120107 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortPoolMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortPoolMapper.java
@@ -66,7 +66,7 @@ public interface PortPoolMapper extends BaseMapper<PortPoolDO> {
 		);
 	}
 
-	List<PortPoolListRes> selectResList(PortPoolListReq req);
+	List<PortPoolListRes> selectResList(@Param("req") PortPoolListReq req);
 
     List<PortPoolListRes> getAvailablePortList(@Param("licenseId") Integer licenseId,@Param("userId") Integer userId);
 }
diff --git a/neutrino-proxy-server/src/main/resources/mapper/PortPoolMapper.xml b/neutrino-proxy-server/src/main/resources/mapper/PortPoolMapper.xml
index a238f04a..f8397e2a 100644
--- a/neutrino-proxy-server/src/main/resources/mapper/PortPoolMapper.xml
+++ b/neutrino-proxy-server/src/main/resources/mapper/PortPoolMapper.xml
@@ -7,7 +7,12 @@
                g.possessor_type,
                g.`name` group_name
         FROM port_pool p
-                 LEFT JOIN port_group g ON p.group_id = g.id
+        LEFT JOIN port_group g ON p.group_id = g.id
+        <where>
+            <if test="req.groupId != null">
+                AND p.group_id = #{req.groupId}
+            </if>
+        </where>
         ORDER BY p.id
     </select>