diff --git a/muyu-quest-remote/src/main/java/com/muyu/quest/remote/RemoteDataSourceService.java b/muyu-quest-remote/src/main/java/com/muyu/quest/remote/RemoteDataSourceService.java index 2a7a66e..5de3288 100644 --- a/muyu-quest-remote/src/main/java/com/muyu/quest/remote/RemoteDataSourceService.java +++ b/muyu-quest-remote/src/main/java/com/muyu/quest/remote/RemoteDataSourceService.java @@ -22,11 +22,12 @@ import java.util.List; */ @FeignClient(contextId = "RemoteDataSourceService", value = ServiceNameConstants.SOURCE_SERVICE, + url = "http://10.0.2.1:19652/", fallbackFactory = RemoteDataSourceFactory.class) public interface RemoteDataSourceService { @PostMapping("/value/findTableValue") - public Result> findTableValue(@RequestBody DataValueModel dataValueModel); + public Result>> findTableValue(@RequestBody DataValueModel dataValueModel); /** * 根据基础表ID和SQL语句查询条数 diff --git a/muyu-quest-server/src/main/java/com/muyu/quest/controller/TaskController.java b/muyu-quest-server/src/main/java/com/muyu/quest/controller/TaskController.java index 639acec..07d6bfa 100644 --- a/muyu-quest-server/src/main/java/com/muyu/quest/controller/TaskController.java +++ b/muyu-quest-server/src/main/java/com/muyu/quest/controller/TaskController.java @@ -136,12 +136,6 @@ public class TaskController extends BaseController return success(); } - /** - * 测试 - */ - @PostMapping("/test") - public Result test() { - return success(taskService.test()); - } + } diff --git a/muyu-quest-server/src/main/java/com/muyu/quest/service/TaskService.java b/muyu-quest-server/src/main/java/com/muyu/quest/service/TaskService.java index a2809a7..568fc7b 100644 --- a/muyu-quest-server/src/main/java/com/muyu/quest/service/TaskService.java +++ b/muyu-quest-server/src/main/java/com/muyu/quest/service/TaskService.java @@ -49,5 +49,4 @@ public interface TaskService extends IService { String testExecute(List nodeList); - String test(); } diff --git a/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/TaskServiceImpl.java b/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/TaskServiceImpl.java index f35e6dc..b08f52a 100644 --- a/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/TaskServiceImpl.java +++ b/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/TaskServiceImpl.java @@ -191,13 +191,6 @@ public class TaskServiceImpl extends ServiceImpl return "测试成功,无异常"; } - @Override - public String test() { - String sql = "SELECT `cloud-ecology`.task_source.task_code,`cloud-ecology`.task_source.task_name,`cloud-ecology`.node_info.node_code,`cloud-ecology`.node_info.node_type,`cloud-ecology`.node_info.node_name FROM `cloud-ecology`.task_source RIGHT JOIN `cloud-ecology`.node_info ON `cloud-ecology`.task_source.task_code = `cloud-ecology`.node_info.task_code LIMIT 10 OFFSET 0"; - Result> tableValue = remoteDataSourceService.findTableValue(new DataValueModel(4L, sql)); - System.out.println(tableValue); - return ""; - } /** * 执行任务第一步: 校验节点规范 并返回初始化节点map @@ -262,11 +255,11 @@ public class TaskServiceImpl extends ServiceImpl * 获取新增SQL */ private String getAddSql(HashMap> nodeMap, String findSql) { - Result> tableValue = remoteDataSourceService.findTableValue(new DataValueModel(4L, findSql)); + Result>> tableValue = remoteDataSourceService.findTableValue(new DataValueModel(4L, findSql)); if (tableValue.getCode() != 200){ throw new TaskException(tableValue.getMsg()); } - List data = tableValue.getData(); + List> data = tableValue.getData(); List dispList = getNodeDisp(nodeMap.get("exportation").get(0)); diff --git a/muyu-quest-server/src/main/java/com/muyu/quest/utils/NodeUtils.java b/muyu-quest-server/src/main/java/com/muyu/quest/utils/NodeUtils.java index 8a9d22e..e9eed6c 100644 --- a/muyu-quest-server/src/main/java/com/muyu/quest/utils/NodeUtils.java +++ b/muyu-quest-server/src/main/java/com/muyu/quest/utils/NodeUtils.java @@ -276,7 +276,7 @@ public class NodeUtils { * @param data 查询到的数据 * @return 新增sql */ - public static String nodeDispExportation(List dispList, List data) { + public static String nodeDispExportation(List dispList, List> data) { if (data == null){ throw new TaskException("查询数据为空"); } @@ -291,7 +291,7 @@ public class NodeUtils { * @param data 查询到的数据 * @return 新增sql */ - private static String nodeDispExportation(Map> dispMap, List data) { + private static String nodeDispExportation(Map> dispMap, List> data) { // 拼接新增表 NodeDisposition db = dispMap.get("toDb").get(0); String dbTable = "`" + db.getDispDesc() + "`." + db.getDispValue(); @@ -302,13 +302,10 @@ public class NodeUtils { StringBuilder insSql = new StringBuilder("INSERT INTO " + dbTable + "( " + join + " ) VALUES "); // 整理需新增数据 List> dataList1 = new ArrayList<>(); - HashMap dataMap = new HashMap<>(); - for (int i = 0; i < data.size(); i++) { - if (i % fieldList.size() == 0 && i>0){ - dataList1.add(dataMap); - dataMap = new HashMap<>(); - } - dataMap.put(data.get(i).getKey(), data.get(i).getValue().toString()); + for (List datum : data) { + HashMap dataMap = new HashMap<>(); + datum.forEach(dataModel -> dataMap.put(dataModel.getKey(), dataModel.getValue().toString())); + dataList1.add(dataMap); } // 拼接新增语句的值 dataList1.forEach(map -> insSql.append("( ").