Merge branch 'master' of http://git.hivekion.com:3000/panbaolin/SourceTermAnalysisSystem_java

jeecg-module-sync/src/main/java/org/jeecg/dataSource/controller/StasDataSourceController.java

@@ -19,7 +19,9 @@ import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.base.entity.StasDataSource;
 import org.jeecg.dataSource.service.IStasDataSourceService;
 import org.jeecg.modules.base.entity.StasSyncStrategy;
+import org.jeecg.modules.base.entity.StasTaskConfig;
 import org.jeecg.modules.base.service.BaseCommonService;
+import org.jeecg.taskConfig.service.IStasTaskConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import java.util.*;
@@ -40,6 +42,8 @@ public class StasDataSourceController extends JeecgController<StasDataSource, IS
 
 	@Autowired
 	private IStasDataSourceService stasDataSourceService;
+	@Autowired
+	private IStasTaskConfigService stasTaskConfigService;
 
 	/**
 	  * 分页列表查询
@@ -77,7 +81,7 @@ public class StasDataSourceController extends JeecgController<StasDataSource, IS
 	@AutoLog(value = "根据数据源名称查询所有表")
 	@Operation(summary = "根据数据源名称查询所有表")
 	@GetMapping(value = "/userList")
-	public Result<?> queryTargetUserList(@RequestParam(name="sourceId",required=false) String sourceId) {
+	public Result<?> queryUserList(@RequestParam(name="sourceId",required=false) String sourceId) {
 		List<String> tableNameList= stasDataSourceService.queryUserList(sourceId);
 		if (tableNameList != null && !"".equals(tableNameList)){
 			return Result.OK(tableNameList);
@@ -85,6 +89,24 @@ public class StasDataSourceController extends JeecgController<StasDataSource, IS
 		return Result.error("获取源端用户为空");
 	}
 
+	/**
+	 * 查询目标源所有用户
+	 *
+	 * @param taskId
+	 * @return
+	 */
+	@AutoLog(value = "查询目标源所有用户")
+	@Operation(summary = "查询目标源所有用户")
+	@GetMapping(value = "/targetUser")
+	public Result<?> queryTargetUserList(@RequestParam(name="taskId",required=false) String taskId) {
+		StasTaskConfig taskConfig = stasTaskConfigService.getById(taskId);
+		List<String> tableNameList= stasDataSourceService.queryUserList(taskConfig.getSourceId());
+		if (tableNameList != null && !"".equals(tableNameList)){
+			return Result.OK(tableNameList);
+		}
+		return Result.error("获取源端用户为空");
+	}
+
 	/**
 	 * 查询数据源表
 	 *
@@ -121,15 +143,15 @@ public class StasDataSourceController extends JeecgController<StasDataSource, IS
 
 	/**
 	 * 数据库连接测试
-	 * @param sourceId
+	 * @param stasDataSource
 	 * @return
 	 */
 	@AutoLog(value = "数据库连接测试")
 	@Operation(summary = "数据库连接测试")
 	@RequestMapping(value = "/testConnection", method = RequestMethod.GET)
-	public Result<StasDataSource> testConnection(String sourceId) {
+	public Result<StasDataSource> testConnection(StasDataSource stasDataSource) {
 		try {
-			boolean isValue = stasDataSourceService.testConnection(sourceId);
+			boolean isValue = stasDataSourceService.testConnection(stasDataSource);
 			if(isValue){
 				return Result.OK("连接成功");
 			}

jeecg-module-sync/src/main/java/org/jeecg/dataSource/service/IStasDataSourceService.java

@@ -39,10 +39,10 @@ import java.util.List;
 
     /**
      * 测试数据库连接
-     * @param sourceId
+     * @param stasDataSource
      * @return
      */
-     boolean testConnection(String sourceId);
+     boolean testConnection(StasDataSource stasDataSource);
 
     /**
      * 查询所有用户信息

jeecg-module-sync/src/main/java/org/jeecg/dataSource/service/impl/StasDataSourceServiceImpl.java

@@ -57,8 +57,7 @@ public class StasDataSourceServiceImpl extends ServiceImpl<StasDataSourceMapper,
     }
 
     @Override
-    public boolean testConnection(String sourceId) {
+    public boolean testConnection(StasDataSource stasDataSource) {
-        StasDataSource stasDataSource = this.baseMapper.selectById(sourceId);
         Connection conn = null;
         try {
             String urlSource = "";