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

---
 .../system/SysTenantController.java           | 10 ++++++++
 .../system/service/ISysTenantService.java     |  5 ++++
 .../service/impl/SysTenantServiceImpl.java    | 12 +++++++++
 ruoyi-ui/src/api/system/tenant.js             | 13 ++++++++++
 ruoyi-ui/src/views/system/tenant/index.vue    | 25 +++++++++++++++++--
 .../src/views/system/tenantPackage/index.vue  |  1 +
 6 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java
index ec1188c31..ef142065a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java
@@ -90,6 +90,16 @@ public class SysTenantController extends BaseController {
         return toAjax(iSysTenantService.updateByBo(bo));
     }
 
+    /**
+     * 状态修改
+     */
+    @SaCheckPermission("system:tenantPackage:edit")
+    @Log(title = "租户套餐", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public R<Void> changeStatus(@RequestBody SysTenantBo bo) {
+        return toAjax(iSysTenantService.updateTenantStatus(bo));
+    }
+
     /**
      * 删除租户
      *
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantService.java
index 9ee8ae8de..a7deb2613 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantService.java
@@ -41,6 +41,11 @@ public interface ISysTenantService {
      */
     Boolean updateByBo(SysTenantBo bo);
 
+    /**
+     * 修改租户状态
+     */
+    int updateTenantStatus(SysTenantBo bo);
+
     /**
      * 校验并批量删除租户信息
      */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java
index c7766b1aa..9aa7ed669 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java
@@ -99,6 +99,18 @@ public class SysTenantServiceImpl implements ISysTenantService {
         return baseMapper.updateById(update) > 0;
     }
 
+    /**
+     * 修改租户状态
+     *
+     * @param bo 租户信息
+     * @return 结果
+     */
+    @Override
+    public int updateTenantStatus(SysTenantBo bo) {
+        SysTenant tenant = BeanUtil.toBean(bo, SysTenant.class);
+        return baseMapper.updateById(tenant);
+    }
+
     /**
      * 保存前的数据校验
      */
diff --git a/ruoyi-ui/src/api/system/tenant.js b/ruoyi-ui/src/api/system/tenant.js
index fde22d302..66fbac516 100644
--- a/ruoyi-ui/src/api/system/tenant.js
+++ b/ruoyi-ui/src/api/system/tenant.js
@@ -35,6 +35,19 @@ export function updateTenant(data) {
   })
 }
 
+// 租户状态修改
+export function changeTenantStatus(id, status) {
+  const data = {
+    id,
+    status
+  }
+  return request({
+    url: '/system/tenant/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除租户
 export function delTenant(id) {
   return request({
diff --git a/ruoyi-ui/src/views/system/tenant/index.vue b/ruoyi-ui/src/views/system/tenant/index.vue
index c294b5c4b..cdff2f826 100644
--- a/ruoyi-ui/src/views/system/tenant/index.vue
+++ b/ruoyi-ui/src/views/system/tenant/index.vue
@@ -87,6 +87,7 @@
 
     <el-table v-loading="loading" :data="tenantList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="id" align="center" prop="id" v-if="false"/>
       <el-table-column label="租户编号" align="center" prop="tenantId" />
       <el-table-column label="联系人" align="center" prop="contactUserName" />
       <el-table-column label="联系电话" align="center" prop="contactPhone" />
@@ -97,7 +98,16 @@
           <span>{{ parseTime(scope.row.expireTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <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
@@ -179,7 +189,7 @@
 </template>
 
 <script>
-import { listTenant, getTenant, delTenant, addTenant, updateTenant } from "@/api/system/tenant";
+import { listTenant, getTenant, delTenant, addTenant, updateTenant, changeTenantStatus } from "@/api/system/tenant";
 import { listTenantPackage } from "@/api/system/tenantPackage";
 
 export default {
@@ -266,6 +276,17 @@ export default {
         this.loading = false;
       });
     },
+    // 租户套餐状态修改
+    handleStatusChange(row) {
+      let text = row.status === "0" ? "启用" : "停用";
+      this.$modal.confirm('确认要"' + text + '""' + row.companyName + '"租户吗？').then(function() {
+        return changeTenantStatus(row.id, row.status);
+      }).then(() => {
+        this.$modal.msgSuccess(text + "成功");
+      }).catch(function() {
+        row.status = row.status === "0" ? "1" : "0";
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
diff --git a/ruoyi-ui/src/views/system/tenantPackage/index.vue b/ruoyi-ui/src/views/system/tenantPackage/index.vue
index 5b6349b1c..502fb8372 100644
--- a/ruoyi-ui/src/views/system/tenantPackage/index.vue
+++ b/ruoyi-ui/src/views/system/tenantPackage/index.vue
@@ -63,6 +63,7 @@
 
     <el-table v-loading="loading" :data="tenantPackageList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="租户套餐id" align="center" prop="packageId" v-if="false"/>
       <el-table-column label="套餐名称" align="center" prop="packageName" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="状态" align="center" prop="status" >