diff --git a/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java index 1ff82fd..d67b9eb 100644 --- a/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java +++ b/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java @@ -344,16 +344,16 @@ public class TaskInfoServiceImpl extends ServiceImpl i DataValue[][] data = tableValueResult.getData(); log.info("执行{}查询的方法结束", sqlSelect); - for (DataValue[] datum : data) { - for (DataValue dataValue : datum) { - String key = dataValue.getKey(); - String newKey = map.get(key); - dataValue.setKey(newKey); - } - } - Result result = datasourceFeign.addProduct(newBasicId, tableId, data); - log.info("{}添加结束", result); - //executeTheRule(data,map,newBasicId,tableId); +// for (DataValue[] datum : data) { +// for (DataValue dataValue : datum) { +// String key = dataValue.getKey(); +// String newKey = map.get(key); +// dataValue.setKey(newKey); +// } +// } +// Result result = datasourceFeign.addProduct(newBasicId, tableId, data); +// log.info("{}添加结束", result); + executeTheRule(data,map,newBasicId,tableId); } @@ -368,13 +368,15 @@ public class TaskInfoServiceImpl extends ServiceImpl i // 初始化第一个任务 tasks.add(() -> { + log.info(dataValues); return dataValues; }); - // 创建任务链 - Future currentFuture = null; + // 提交第一个任务 + Future currentFuture = executor.submit(tasks.poll()); for (int i = 1; i <= 4; i++) { final Future finalCurrentFuture = currentFuture; + log.info(finalCurrentFuture); Callable task = () -> { DataValue[][] prevResult = finalCurrentFuture.get(); @@ -397,7 +399,15 @@ public class TaskInfoServiceImpl extends ServiceImpl i } try { DataValue[][] afterFilteringDataValue = currentFuture.get(); - + for (DataValue[] datum : afterFilteringDataValue) { + for (DataValue dataValue : datum) { + String key = dataValue.getKey(); + String newKey = map.get(key); + dataValue.setKey(newKey); + } + } + Result result = datasourceFeign.addProduct(newBasicId, tableId, afterFilteringDataValue); + log.info("{}添加结束", result); } catch (InterruptedException e) { throw new RuntimeException(e);