From 7ea723b578332c374c030f0c87b822386c642df8 Mon Sep 17 00:00:00 2001
From: Metal <13144144057@163.com>
Date: Tue, 4 Jul 2023 20:08:27 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E6=B1=A0=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E7=9A=84=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=202=E3=80=81=E4=BB=A3=E7=90=86=E9=85=8D=E7=BD=AE-=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=A3=E6=98=A0=E5=B0=84=E6=B7=BB=E5=8A=A0=E5=92=8C=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=9C=8D=E5=8A=A1=E7=AB=AF=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=A3=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=94=AF=E6=8C=81=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=90=9C=E7=B4=A2=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-admin/src/api/portPool.js      | 10 ++
 .../src/components/Button/buttonPopover.vue   | 98 ++++++++++---------
 neutrino-proxy-admin/src/lang/en.js           |  1 +
 neutrino-proxy-admin/src/lang/zh.js           |  1 +
 .../src/views/proxy/portMapping.vue           |  2 +-
 .../src/views/system/portPool.vue             | 28 +++++-
 .../server/controller/PortPoolController.java | 10 ++
 .../req/system/PortPoolDeleteBatchReq.java    | 14 +++
 .../server/service/PortPoolService.java       | 11 +++
 9 files changed, 126 insertions(+), 49 deletions(-)
 create mode 100644 neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolDeleteBatchReq.java

diff --git a/neutrino-proxy-admin/src/api/portPool.js b/neutrino-proxy-admin/src/api/portPool.js
index fb5a60b4..de7afe6d 100644
--- a/neutrino-proxy-admin/src/api/portPool.js
+++ b/neutrino-proxy-admin/src/api/portPool.js
@@ -60,3 +60,13 @@ export function deletePortPool(id) {
     }
   })
 }
+
+export function deleteBatchPortPool(ids) {
+  return request({
+    url: '/port-pool/deleteBatch',
+    method: 'post',
+    data: {
+      ids:ids
+    }
+  })
+}
diff --git a/neutrino-proxy-admin/src/components/Button/buttonPopover.vue b/neutrino-proxy-admin/src/components/Button/buttonPopover.vue
index 321c2927..80220327 100644
--- a/neutrino-proxy-admin/src/components/Button/buttonPopover.vue
+++ b/neutrino-proxy-admin/src/components/Button/buttonPopover.vue
@@ -8,60 +8,68 @@
       <el-button size="mini" @click="handleCancelClick">{{cancelText}}</el-button>
       <el-button type="primary" size="mini" @click="handleCommitClick">{{okText}}</el-button>
     </div>
-    <el-button slot="reference" :type="type" :size="size">{{buttonText}}</el-button>
+    <el-button slot="reference" :type="type" :size="size" :icon="icon" :disabled="disabled">{{buttonText}}</el-button>
   </el-popover>
 </template>
 
 <script>
 
-export default {
-  name: 'deleteButton',
-  props: {
-    width: {
-      type: Number,
-      default: 160
+  export default {
+    name: 'deleteButton',
+    props: {
+      width: {
+        type: Number,
+        default: 160
+      },
+      buttonText: {
+        type: String,
+        default: '删除'
+      },
+      type: {
+        type: String,
+        default: 'danger'
+      },
+      size: {
+        type: String,
+        default: 'mini'
+      },
+      icon: {
+        type: String,
+        default: ''
+      },
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      title: {
+        type: String,
+        default: '确定删除吗？'
+      },
+      okText: {
+        type: String,
+        default: '确定'
+      },
+      cancelText: {
+        type: String,
+        default: '取消'
+      }
     },
-    buttonText: {
-      type: String,
-      default: '删除'
+    data() {
+      return {
+        visible: false
+      }
     },
-    type: {
-      type: String,
-      default: 'danger'
-    },
-    size: {
-      type: String,
-      default: 'mini'
-    },
-    title: {
-      type: String,
-      default: '确定删除吗？'
-    },
-    okText: {
-      type: String,
-      default: '确定'
-    },
-    cancelText: {
-      type: String,
-      default: '取消'
-    }
-  },
-  data() {
-    return {
-      visible: false
-    }
-  },
-  methods: {
-    handleCancelClick() {
-      this.visible = false
-      this.$emit('handleCancelClick')
-    },
-    handleCommitClick() {
-      this.visible = false
-      this.$emit('handleCommitClick')
+    methods: {
+      handleCancelClick() {
+        this.visible = false
+        this.$emit('handleCancelClick')
+      },
+      handleCommitClick() {
+        this.visible = false
+        this.$emit('handleCommitClick')
+      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/neutrino-proxy-admin/src/lang/en.js b/neutrino-proxy-admin/src/lang/en.js
index 46bfdb58..ceb7d1b4 100644
--- a/neutrino-proxy-admin/src/lang/en.js
+++ b/neutrino-proxy-admin/src/lang/en.js
@@ -101,6 +101,7 @@ export default {
     publish: 'Publish',
     draft: 'Draft',
     delete: 'Delete',
+    deleteBatch: 'DeleteBatch',
     cancel: 'Cancel',
     confirm: 'Confirm',
     portOrRange: 'example: 3306 or 1000-2000'
diff --git a/neutrino-proxy-admin/src/lang/zh.js b/neutrino-proxy-admin/src/lang/zh.js
index d0694208..b4489a02 100644
--- a/neutrino-proxy-admin/src/lang/zh.js
+++ b/neutrino-proxy-admin/src/lang/zh.js
@@ -121,6 +121,7 @@ export default {
     publish: '发布',
     draft: '草稿',
     delete: '删除',
+    deleteBatch: '批量删除',
     cancel: '取 消',
     confirm: '确 定',
     userId: '用户ID',
diff --git a/neutrino-proxy-admin/src/views/proxy/portMapping.vue b/neutrino-proxy-admin/src/views/proxy/portMapping.vue
index 32d517e1..725ac591 100644
--- a/neutrino-proxy-admin/src/views/proxy/portMapping.vue
+++ b/neutrino-proxy-admin/src/views/proxy/portMapping.vue
@@ -143,7 +143,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('服务端端口')" prop="serverPort">
-          <el-select style="width: 280px;" class="filter-item" v-model="temp.serverPort" placeholder="请选择">
+          <el-select style="width: 280px;" class="filter-item" v-model="temp.serverPort" placeholder="请选择" filterable>
             <el-option v-for="item in serverPortList" :key="item.port" :label="item.port" :value="item.port">
             </el-option>
           </el-select>
diff --git a/neutrino-proxy-admin/src/views/system/portPool.vue b/neutrino-proxy-admin/src/views/system/portPool.vue
index 0263ccdb..014a6973 100644
--- a/neutrino-proxy-admin/src/views/system/portPool.vue
+++ b/neutrino-proxy-admin/src/views/system/portPool.vue
@@ -6,10 +6,13 @@
       </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>
+      <button-popover class="filter-item" style="margin-left: 10px;" size="medium" icon="el-icon-delete"
+                      :buttonText="$t('table.deleteBatch')" :disabled="checkBoxData.length==0" @handleCommitClick="handleDeleteBatch" />
     </div>
 
     <el-table :key='tableKey' :data="list" v-loading="listLoading" element-loading-text="给我一点时间" border fit highlight-current-row
-              style="width: 100%">
+              style="width: 100%" @selection-change="onTableRowChange">
+      <el-table-column align="center" width="40" type="selection" />
       <el-table-column align="center" :label="$t('table.id')" width="120">
         <template slot-scope="scope">
           <span>{{scope.row.id}}</span>
@@ -92,7 +95,7 @@
 </template>
 
 <script>
-import { createPortPool, deletePortPool, fetchList, updateEnableStatus, updatePortPool } from '@/api/portPool'
+import { createPortPool, deletePortPool, deleteBatchPortPool, fetchList, updateEnableStatus, updatePortPool } from '@/api/portPool'
 import { portGroupList } from '@/api/portGroup'
 import waves from '@/directive/waves' // 水波纹指令
 import { parseTime } from '@/utils'
@@ -157,7 +160,8 @@ const calendarTypeOptions = [
         rules: {
           port: [{ required: true, message: '端口必填', trigger: 'blur' }]
         },
-        downloadLoading: false
+        downloadLoading: false,
+        checkBoxData:[], //表单勾选的行
       }
     },
     filters: {
@@ -320,6 +324,24 @@ const calendarTypeOptions = [
             return v[j]
           }
         }))
+      },
+      onTableRowChange(val){ //表单勾选后赋值
+        this.checkBoxData = val
+      },
+      handleDeleteBatch(){ //批量删除操作
+        let ids = []
+        this.checkBoxData.forEach(item => {ids.push(item.id)})
+        deleteBatchPortPool(ids).then(response => {
+          if (response.data.code === 0) {
+            this.$notify({
+              title: '成功',
+              message: '删除成功',
+              type: 'success',
+              duration: 2000
+            })
+            this.getList()
+          }
+        })
       }
     }
   }
diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/PortPoolController.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/PortPoolController.java
index da3d91f6..87f6bfa4 100644
--- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/PortPoolController.java
+++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/PortPoolController.java
@@ -123,4 +123,14 @@ public class PortPoolController {
 		ParamCheckUtil.checkNotEmpty(req.getPortIdList(), "portIdList");
 		return portPoolService.updateGroup(req);
 	}
+
+	@Post
+	@Mapping("/deleteBatch")
+	@Authorization(onlyAdmin = true)
+	public void deleteBatch(PortPoolDeleteBatchReq req) {
+		ParamCheckUtil.checkNotNull(req, "req");
+		ParamCheckUtil.checkNotNull(req.getIds(), "ids");
+
+		portPoolService.deleteBatch(req.getIds());
+	}
 }
diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolDeleteBatchReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolDeleteBatchReq.java
new file mode 100644
index 00000000..5b816544
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolDeleteBatchReq.java
@@ -0,0 +1,14 @@
+package org.dromara.neutrinoproxy.server.controller.req.system;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author: Metal
+ * @date: 2023/7/3
+ */
+@Data
+public class PortPoolDeleteBatchReq {
+    private List<Integer> ids;
+}
diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortPoolService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortPoolService.java
index a99826f2..b3f03491 100644
--- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortPoolService.java
+++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortPoolService.java
@@ -179,4 +179,15 @@ public class PortPoolService {
         LicenseDO licenseDO = licenseMapper.queryById(req.getLicenseId());
         return portPoolMapper.getAvailablePortList(req.getLicenseId(), licenseDO.getUserId());
     }
+
+    public void deleteBatch(List<Integer> ids) {
+        List<PortPoolDO> portPoolDOList = portPoolMapper.selectBatchIds(ids);
+        ParamCheckUtil.checkNotNull(portPoolDOList, ExceptionConstant.PORT_NOT_EXIST);
+
+        portPoolMapper.deleteBatchIds(ids);
+        // 更新visitorChannel
+        portPoolDOList.stream().forEach(portPoolDO -> {
+            visitorChannelService.updateVisitorChannelByPortPool(portPoolDO.getPort(), EnableStatusEnum.DISABLE.getStatus());
+        });
+    }
 }