修改租户绑定数据源

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/DataSourceController.java

@@ -33,12 +33,11 @@ public class DataSourceController extends BaseController {
     public AjaxResult addDataSource(@RequestBody Map<String,Object> map){
 
         DataSource dataSource = JSON.parseObject(JSON.toJSONString(map.get("dataSource")), DataSource.class);
-        Long tenantId = (Long)map.get("tenantId");
-
+        Integer tenantId = (Integer)map.get("tenantId");
         if(dataSourceService.selectDatabaseExist(dataSource.getDatabaseIp(),dataSource.getDatabaseName(),dataSource.getPortNumber())>0){
             return AjaxResult.error("数据源已存在");
         }
-        return toAjax(dataSourceService.insertDataSource(dataSource,tenantId));
+        return toAjax(dataSourceService.insertDataSource(dataSource,tenantId.longValue()));
     }
 
 }

ruoyi-common/src/main/java/com/ruoyi/common/constant/IpConstants.java

@@ -0,0 +1,21 @@
+package com.ruoyi.common.constant;
+
+/**
+ * 其他服务IP地址常量信息
+ *
+ * @author ruoyi
+ */
+public class IpConstants {
+
+    /**
+     * 数据引擎切换数据源接口地址
+     */
+    public static final String DATA_ENGINE_IP = "http://localhost:8081/dataSource/changeDataSource";
+
+    /**
+     * 动态表单切换数据源接口地址
+     */
+    public static final String DRAG_FORM_IP = "http://localhost:8081/dataSource/changeDataSource";
+
+
+}

ruoyi-ui/src/views/system/tenant/index.vue

@@ -69,7 +69,7 @@
               <el-dropdown-item><el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                   v-hasPermi="['system:tenant:remove']">删除</el-button></el-dropdown-item>
               <el-dropdown-item><el-button size="mini" type="text" icon="el-icon-edit" @click="bindDatasource(scope.row)"
-                  v-hasPermi="['system:tenant:edit']">绑定数据源</el-button></el-dropdown-item>
+                  v-show="scope.row.datasourceId == null" >绑定数据源</el-button></el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>
@@ -106,26 +106,26 @@
 
     <!-- 添加或修改数据源信息对话框 -->
     <el-dialog :title="dataSourceTitle" :visible.sync="dataSourceOpen" width="500px" append-to-body>
-      <el-form ref="dataSourceForm" :model="dataSourceForm" :rules="rules" label-width="90px">
+      <el-form ref="dataSourceForm" :model="dataSourceForm"  label-width="90px">
         <el-form-item label="数据源类型">
           <el-select v-model="dataSourceForm.databaseType" placeholder="请选择数据源类型">
             <el-option v-for="item in dict.type.datasource_type" :key="item.value" :label="item.label"
               :value="item.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="数据库名称" prop="databaseName">
+        <el-form-item label="数据库名称" >
           <el-input v-model="dataSourceForm.databaseName" placeholder="请输入数据库名称" />
         </el-form-item>
-        <el-form-item label="数据库IP" prop="databaseIp">
+        <el-form-item label="数据库IP" >
           <el-input v-model="dataSourceForm.databaseIp" placeholder="请输数据库IP" />
         </el-form-item>
-        <el-form-item label="用户名" prop="username">
+        <el-form-item label="用户名" >
           <el-input v-model="dataSourceForm.username" placeholder="请输入用户名" />
         </el-form-item>
-        <el-form-item label="密码" prop="password">
+        <el-form-item label="密码" >
           <el-input v-model="dataSourceForm.password" placeholder="请输入密码" />
         </el-form-item>
-        <el-form-item label="端口号" prop="portNumber">
+        <el-form-item label="端口号" >
           <el-input v-model="dataSourceForm.portNumber" placeholder="请输入端口号" />
         </el-form-item>
       </el-form>