xuezizhuo 1 год назад
Родитель
Сommit
788974fbe4

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

@@ -6,7 +6,9 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.DataSource;
 import com.ruoyi.system.service.IDataSourceService;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
 import java.util.Map;
@@ -18,6 +20,24 @@ public class DataSourceController extends BaseController {
     @Resource
     private IDataSourceService dataSourceService;
 
+    RestTemplate restTemplate = new RestTemplate();
+
+    /**
+     * 数据引擎切换数据源接口地址
+     */
+    @Value("${parameter.ip.DATA_ENGINE_IP}")
+    public String DATA_ENGINE_IP;
+
+    /**
+     * 动态表单切换数据源接口地址
+     */
+    @Value("${parameter.ip.DRAG_FORM_IP}")
+    public String DRAG_FORM_IP;
+
+    @Value("${parameter.ip.PROCESS_ENGINE_IP}")
+    public String PROCESS_ENGINE_IP;
+
+
     /**
      * 数据源信息列表
      */
@@ -41,4 +61,18 @@ public class DataSourceController extends BaseController {
         return dataSourceService.insertDataSource(dataSource,tenantId.longValue());
     }
 
+    /**
+     * 调用(数据引擎、流程引擎、表单引擎)切换数据源接口
+     */
+    @PostMapping("/changeDatasource")
+    public AjaxResult changeDatasource(@RequestBody DataSource dataSource){
+        //调用数据引擎服务切换数据源接口
+//        restTemplate.postForEntity(DATA_ENGINE_IP, dataSource, DataSource.class);
+//        //调用表单引擎服务切换数据源接口
+//        restTemplate.postForEntity(DRAG_FORM_IP, dataSource, DataSource.class);
+        //调用流程引擎服务切换数据源接口
+        restTemplate.postForEntity(PROCESS_ENGINE_IP, dataSource, DataSource.class);
+        return AjaxResult.success();
+    }
+
 }

+ 9 - 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -63,8 +63,8 @@ public class SysLoginController {
     /**
      * 流程引擎切换数据源地址接口
      */
-    @Value("${parameter.ip.PROCESS_ENGINE}")
-    public String PROCESS_ENGINE;
+    @Value("${parameter.ip.PROCESS_ENGINE_IP}")
+    public String PROCESS_ENGINE_IP;
 
     RestTemplate restTemplate = new RestTemplate();
 
@@ -110,12 +110,13 @@ public class SysLoginController {
             //数据源信息
             DataSource dataSource = dataSourceService.selectById(sysTenant.getDatasourceId());
             ajax.put("dataSource", dataSource);
-            //调用数据引擎服务切换数据源接口
-            restTemplate.postForEntity(DATA_ENGINE_IP, dataSource, DataSource.class);
-            //调用表单引擎服务切换数据源接口
-            restTemplate.postForEntity(DRAG_FORM_IP, dataSource, DataSource.class);
-            //调用流程引擎服务切换数据源接口
-            restTemplate.postForEntity(PROCESS_ENGINE, dataSource, DataSource.class);
+//            //调用数据引擎服务切换数据源接口
+//            restTemplate.postForEntity(DATA_ENGINE_IP, dataSource, DataSource.class);
+//            //调用表单引擎服务切换数据源接口
+//            restTemplate.postForEntity(DRAG_FORM_IP, dataSource, DataSource.class);
+//            //调用流程引擎服务切换数据源接口
+//            System.err.println(dataSource.toString());
+//            restTemplate.postForEntity(PROCESS_ENGINE, dataSource, DataSource.class);
         }
         return ajax;
     }

+ 1 - 1
ruoyi-admin/src/main/resources/application.yml

@@ -138,6 +138,6 @@ parameter:
     # 动态表单切换数据源接口地址
     DRAG_FORM_IP: http://localhost:8088/dataSource/changeDataSource
     # 流程引擎切换数据源接口地址
-    PROCESS_ENGINE: http://localhost:8055/dataSource/changeDataSource
+    PROCESS_ENGINE_IP: http://localhost:8055/dataSource/changeDataSource
     #数据引擎初始化数据库表接口地址
     DATA_ENGINE_INITDATABASE_IP: http://localhost:8099/tableInfo/initDatabase