From 3efcc4bc624bc21338a372bd5d040f8a92fab39f Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 27 Feb 2023 22:11:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=9F=E6=88=B7=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/db/DataSourceConfigController.java  | 12 +++++-
 .../db/vo/DataSourceConfigSimpleRespVO.java   | 21 +++++++++
 .../convert/db/DataSourceConfigConvert.java   |  2 +
 .../system/api/tenant/TenantApiImpl.java      |  2 +-
 .../admin/tenant/vo/tenant/TenantBaseVO.java  |  4 ++
 .../dal/dataobject/tenant/TenantDO.java       |  2 +-
 .../service/dept/DeptServiceImplTest.java     |  1 -
 .../src/api/infra/dataSourceConfig.js         |  8 ++++
 .../src/views/infra/codegen/importTable.vue   |  5 ++-
 .../src/views/system/tenant/index.vue         | 43 ++++++++++++++++---
 10 files changed, 87 insertions(+), 13 deletions(-)
 create mode 100755 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigSimpleRespVO.java

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DataSourceConfigController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DataSourceConfigController.java
index 366f382d7a..39c0f8e937 100755
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DataSourceConfigController.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DataSourceConfigController.java
@@ -3,13 +3,14 @@ package cn.iocoder.yudao.module.infra.controller.admin.db;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigCreateReqVO;
 import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigRespVO;
+import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigSimpleRespVO;
 import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigUpdateReqVO;
 import cn.iocoder.yudao.module.infra.convert.db.DataSourceConfigConvert;
 import cn.iocoder.yudao.module.infra.dal.dataobject.db.DataSourceConfigDO;
 import cn.iocoder.yudao.module.infra.service.db.DataSourceConfigService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -70,4 +71,11 @@ public class DataSourceConfigController {
         return success(DataSourceConfigConvert.INSTANCE.convertList(list));
     }
 
+    @GetMapping("/list-all-simple")
+    @Operation(summary = "获取数据源配置精简信息列表", description = "主要用于前端的下拉选项")
+    public CommonResult<List<DataSourceConfigSimpleRespVO>> getSimpleDataSourceConfigList() {
+        List<DataSourceConfigDO> list = dataSourceConfigService.getDataSourceConfigList();
+        return success(DataSourceConfigConvert.INSTANCE.convertList02(list));
+    }
+
 }
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigSimpleRespVO.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigSimpleRespVO.java
new file mode 100755
index 0000000000..8490133113
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigSimpleRespVO.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.infra.controller.admin.db.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 数据源配置的精简 Response VO")
+@Data
+public class DataSourceConfigSimpleRespVO {
+
+    @Schema(description = "主键编号", required = true, example = "1024")
+    private Integer id;
+
+    @Schema(description = "数据源名称", required = true, example = "test")
+    private String name;
+
+}
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/db/DataSourceConfigConvert.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/db/DataSourceConfigConvert.java
index 96f6caba2e..9885c9e24a 100755
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/db/DataSourceConfigConvert.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/db/DataSourceConfigConvert.java
@@ -30,4 +30,6 @@ public interface DataSourceConfigConvert {
 
     DataSourceConfigRespDTO convert02(DataSourceConfigDO bean);
 
+    List<DataSourceConfigSimpleRespVO> convertList02(List<DataSourceConfigDO> list);
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApiImpl.java
index 297198b9ea..1713d592fc 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApiImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApiImpl.java
@@ -43,7 +43,7 @@ public class TenantApiImpl implements TenantApi {
         }
         // 获得租户的数据源配置
         return TenantConvert.INSTANCE.convert(
-                dataSourceConfigServiceApi.getDataSourceConfig(tenant.getDatasourceConfigId()));
+                dataSourceConfigServiceApi.getDataSourceConfig(tenant.getDataSourceConfigId()));
     }
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantBaseVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantBaseVO.java
index 4673e2990f..0592258719 100755
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantBaseVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantBaseVO.java
@@ -43,4 +43,8 @@ public class TenantBaseVO {
     @NotNull(message = "账号数量不能为空")
     private Integer accountCount;
 
+    @Schema(description = "数据源配置编号", required = true, example = "4096")
+    @NotNull(message = "数据源配置编号不能为空")
+    private Long dataSourceConfigId;
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenant/TenantDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenant/TenantDO.java
index 710d9e7c7a..affde9f9ee 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenant/TenantDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenant/TenantDO.java
@@ -86,6 +86,6 @@ public class TenantDO extends BaseDO {
      *
      * 关联 DataSourceConfigDO 的 id 字段
      */
-    private Long datasourceConfigId;
+    private Long dataSourceConfigId;
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImplTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImplTest.java
index 3771fc33eb..08ee3d346c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImplTest.java
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImplTest.java
@@ -11,7 +11,6 @@ import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptUpdateRe
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.dal.mysql.dept.DeptMapper;
 import cn.iocoder.yudao.module.system.enums.dept.DeptIdEnum;
-import cn.iocoder.yudao.module.system.mq.producer.dept.DeptProducer;
 import com.google.common.collect.Multimap;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/yudao-ui-admin/src/api/infra/dataSourceConfig.js b/yudao-ui-admin/src/api/infra/dataSourceConfig.js
index 2d96b49ccf..591d556114 100755
--- a/yudao-ui-admin/src/api/infra/dataSourceConfig.js
+++ b/yudao-ui-admin/src/api/infra/dataSourceConfig.js
@@ -41,3 +41,11 @@ export function getDataSourceConfigList() {
     method: 'get',
   })
 }
+
+// 获取数据源配置精简信息列表
+export function getSimpleDataSourceConfigList() {
+  return request({
+    url: '/infra/data-source-config/list-all-simple',
+    method: 'get',
+  })
+}
diff --git a/yudao-ui-admin/src/views/infra/codegen/importTable.vue b/yudao-ui-admin/src/views/infra/codegen/importTable.vue
index bf5252d4d3..61ca185d0a 100644
--- a/yudao-ui-admin/src/views/infra/codegen/importTable.vue
+++ b/yudao-ui-admin/src/views/infra/codegen/importTable.vue
@@ -36,7 +36,8 @@
 
 <script>
 import { getSchemaTableList, createCodegenList } from "@/api/infra/codegen";
-import {getDataSourceConfigList} from "@/api/infra/dataSourceConfig";
+import { getSimpleDataSourceConfigList } from "@/api/infra/dataSourceConfig";
+
 export default {
   data() {
     return {
@@ -65,7 +66,7 @@ export default {
     show() {
       this.visible = true;
       // 加载数据源
-      getDataSourceConfigList().then(response => {
+      getSimpleDataSourceConfigList().then(response => {
         this.dataSourceConfigs = response.data;
         this.queryParams.dataSourceConfigId = this.dataSourceConfigs[0].id;
         // 加载表列表
diff --git a/yudao-ui-admin/src/views/system/tenant/index.vue b/yudao-ui-admin/src/views/system/tenant/index.vue
index 5bdb75a390..d090f57654 100755
--- a/yudao-ui-admin/src/views/system/tenant/index.vue
+++ b/yudao-ui-admin/src/views/system/tenant/index.vue
@@ -45,25 +45,30 @@
     <el-table v-loading="loading" :data="list">
       <el-table-column label="租户编号" align="center" prop="id" />
       <el-table-column label="租户名" align="center" prop="name" />
-      <el-table-column label="租户套餐" align="center" prop="packageId">
+      <el-table-column label="租户套餐" align="center" prop="packageId" width="100">
         <template v-slot="scope">
           <el-tag v-if="scope.row.packageId === 0" type="danger">系统租户</el-tag>
-          <el-tag v-else> {{getPackageName(scope.row.packageId)}} </el-tag>
+          <el-tag v-else> {{ getPackageName(scope.row.packageId )}} </el-tag>
         </template>
       </el-table-column>
       <el-table-column label="联系人" align="center" prop="contactName" />
-      <el-table-column label="联系手机" align="center" prop="contactMobile" />
+      <el-table-column label="联系手机" align="center" prop="contactMobile" width="120" />
       <el-table-column label="账号额度" align="center" prop="accountCount">
         <template v-slot="scope">
           <el-tag> {{scope.row.accountCount}} </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="过期时间" align="center" prop="expireTime" width="180">
+      <el-table-column label="过期时间" align="center" prop="expireTime" width="180" >
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.expireTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="绑定域名" align="center" prop="domain" width="180" />
+      <el-table-column label="数据源" align="center" prop="dataSourceConfigId" width="100" >
+        <template v-slot="scope">
+          <el-tag type="success"> {{ getDataSourceConfigName(scope.row.dataSourceConfigId )}} </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="租户状态" align="center" prop="status">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
@@ -74,7 +79,7 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="110">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['system:tenant:update']">修改</el-button>
@@ -120,6 +125,12 @@
         <el-form-item label="绑定域名" prop="domain">
           <el-input v-model="form.domain" placeholder="请输入绑定域名" />
         </el-form-item>
+        <el-form-item label="数据源" prop="dataSourceConfigId">
+          <el-select v-model="form.dataSourceConfigId" placeholder="请选择数据源" clearable>
+            <el-option v-for="config in dataSourceConfigs"
+                       :key="config.id" :label="config.name" :value="config.id"/>
+          </el-select>
+        </el-form-item>
         <el-form-item label="租户状态" prop="status">
           <el-radio-group v-model="form.status">
             <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
@@ -139,6 +150,7 @@
 import { createTenant, updateTenant, deleteTenant, getTenant, getTenantPage, exportTenantExcel } from "@/api/system/tenant";
 import { CommonStatusEnum } from '@/utils/constants'
 import {getTenantPackageList} from "@/api/system/tenantPackage";
+import {getSimpleDataSourceConfigList} from "@/api/infra/dataSourceConfig";
 
 export default {
   name: "Tenant",
@@ -183,7 +195,12 @@ export default {
         accountCount: [{ required: true, message: "账号额度不能为空", trigger: "blur" }],
         expireTime: [{ required: true, message: "过期时间不能为空", trigger: "blur" }],
         domain: [{ required: true, message: "绑定域名不能为空", trigger: "blur" }],
-      }
+        username: [{ required: true, message: "账号不能为空", trigger: "blur" }],
+        password: [{ required: true, message: "密码不能为空", trigger: "blur" }],
+        datasourceConfigId: [{ required: true, message: "数据源不能为空", trigger: "blur" }],
+      },
+      // 数据源配置
+      dataSourceConfigs: [],
     };
   },
   created() {
@@ -192,6 +209,10 @@ export default {
     getTenantPackageList().then(response => {
       this.packageList = response.data;
     })
+    // 获得数据源配置列表
+    getSimpleDataSourceConfigList().then(response => {
+      this.dataSourceConfigs = response.data;
+    });
   },
   methods: {
     /** 查询列表 */
@@ -221,6 +242,7 @@ export default {
         expireTime: undefined,
         domain: undefined,
         status: CommonStatusEnum.ENABLE,
+        dataSourceConfigId: 0, // 默认 0 为 master 主数据源
       };
       this.resetForm("form");
     },
@@ -306,6 +328,15 @@ export default {
         }
       }
       return '未知套餐';
+    },
+    /** 套餐名格式化 */
+    getDataSourceConfigName(dataSourceConfigId) {
+      for (const item of this.dataSourceConfigs) {
+        if (item.id === dataSourceConfigId) {
+          return item.name;
+        }
+      }
+      return '未知数据源';
     }
   }
 };