From ee557dfb5240fa25bd8f0ee02c817c511804decc Mon Sep 17 00:00:00 2001
From: "Michelle.Chung" <1242874891@qq.com>
Date: Sun, 5 Feb 2023 11:40:04 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=96=B0=E5=A2=9E=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E5=A5=97=E9=A4=90=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9=20SysTen?=
 =?UTF-8?q?antPackageController#changeStatus=20;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/SysTenantPackageController.java    | 10 ++++++++
 .../system/domain/bo/SysTenantPackageBo.java  |  1 -
 .../service/ISysTenantPackageService.java     |  5 ++++
 .../impl/SysTenantPackageServiceImpl.java     | 12 ++++++++++
 ruoyi-ui/src/api/system/tenantPackage.js      | 14 +++++++++++
 ruoyi-ui/src/views/system/tenant/index.vue    |  1 +
 .../src/views/system/tenantPackage/index.vue  | 24 +++++++++++++++++--
 7 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantPackageController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantPackageController.java
index 2505bf784..c82610ed0 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantPackageController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantPackageController.java
@@ -90,6 +90,16 @@ public class SysTenantPackageController extends BaseController {
         return toAjax(iSysTenantPackageService.updateByBo(bo));
     }
 
+    /**
+     * 状态修改
+     */
+    @SaCheckPermission("system:tenantPackage:edit")
+    @Log(title = "租户套餐", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public R<Void> changeStatus(@RequestBody SysTenantPackageBo bo) {
+        return toAjax(iSysTenantPackageService.updatePackageStatus(bo));
+    }
+
     /**
      * 删除租户套餐
      *
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantPackageBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantPackageBo.java
index 53dab8156..816613e4e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantPackageBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantPackageBo.java
@@ -34,7 +34,6 @@ public class SysTenantPackageBo extends BaseEntity {
     /**
      * 关联菜单id
      */
-    @NotBlank(message = "关联菜单id不能为空", groups = { AddGroup.class, EditGroup.class })
     private String menuIds;
 
     /**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantPackageService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantPackageService.java
index 1fbc9a976..ae0b3e9d9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantPackageService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantPackageService.java
@@ -41,6 +41,11 @@ public interface ISysTenantPackageService {
      */
     Boolean updateByBo(SysTenantPackageBo bo);
 
+    /**
+     * 修改套餐状态
+     */
+    int updatePackageStatus(SysTenantPackageBo bo);
+
     /**
      * 校验并批量删除租户套餐信息
      */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantPackageServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantPackageServiceImpl.java
index dd1492371..e90a5017b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantPackageServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantPackageServiceImpl.java
@@ -90,6 +90,18 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService {
         return baseMapper.updateById(update) > 0;
     }
 
+    /**
+     * 修改套餐状态
+     *
+     * @param bo 套餐信息
+     * @return 结果
+     */
+    @Override
+    public int updatePackageStatus(SysTenantPackageBo bo) {
+        SysTenantPackage tenantPackage = BeanUtil.toBean(bo, SysTenantPackage.class);
+        return baseMapper.updateById(tenantPackage);
+    }
+
     /**
      * 保存前的数据校验
      */
diff --git a/ruoyi-ui/src/api/system/tenantPackage.js b/ruoyi-ui/src/api/system/tenantPackage.js
index 00dcf3182..f783e5127 100644
--- a/ruoyi-ui/src/api/system/tenantPackage.js
+++ b/ruoyi-ui/src/api/system/tenantPackage.js
@@ -35,6 +35,20 @@ export function updateTenantPackage(data) {
   })
 }
 
+// 租户套餐状态修改
+export function changePackageStatus(packageId, status) {
+  const data = {
+    packageId,
+    status
+  }
+  return request({
+    url: '/system/tenantPackage/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+
 // 删除租户套餐
 export function delTenantPackage(packageId) {
   return request({
diff --git a/ruoyi-ui/src/views/system/tenant/index.vue b/ruoyi-ui/src/views/system/tenant/index.vue
index c69635d47..a6ef02448 100644
--- a/ruoyi-ui/src/views/system/tenant/index.vue
+++ b/ruoyi-ui/src/views/system/tenant/index.vue
@@ -213,6 +213,7 @@ import { listTenant, getTenant, delTenant, addTenant, updateTenant } from "@/api
 
 export default {
   name: "Tenant",
+  dicts: ['sys_normal_disable'],
   data() {
     return {
       // 按钮loading
diff --git a/ruoyi-ui/src/views/system/tenantPackage/index.vue b/ruoyi-ui/src/views/system/tenantPackage/index.vue
index 997d8958b..0ec34c02c 100644
--- a/ruoyi-ui/src/views/system/tenantPackage/index.vue
+++ b/ruoyi-ui/src/views/system/tenantPackage/index.vue
@@ -66,7 +66,16 @@
       <el-table-column label="租户套餐id" align="center" prop="packageId" v-if="true"/>
       <el-table-column label="套餐名称" align="center" prop="packageName" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="状态" align="center" prop="status" >
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.status"
+            active-value="0"
+            inactive-value="1"
+            @change="handleStatusChange(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -129,7 +138,7 @@
 </template>
 
 <script>
-import { listTenantPackage, getTenantPackage, delTenantPackage, addTenantPackage, updateTenantPackage } from "@/api/system/tenantPackage";
+import { listTenantPackage, getTenantPackage, delTenantPackage, addTenantPackage, updateTenantPackage, changePackageStatus } from "@/api/system/tenantPackage";
 import { treeselect as menuTreeselect, tenantPackageMenuTreeselect } from "@/api/system/menu";
 
 export default {
@@ -220,6 +229,17 @@ export default {
         this.loading = false;
       });
     },
+    // 租户套餐状态修改
+    handleStatusChange(row) {
+      let text = row.status === "0" ? "启用" : "停用";
+      this.$modal.confirm('确认要"' + text + '""' + row.packageName + '"套餐吗？').then(function() {
+        return changePackageStatus(row.packageId, row.status);
+      }).then(() => {
+        this.$modal.msgSuccess(text + "成功");
+      }).catch(function() {
+        row.status = row.status === "0" ? "1" : "0";
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;