diff --git a/cloud-task-remote/pom.xml b/cloud-task-remote/pom.xml index c4f5839..a4acd05 100644 --- a/cloud-task-remote/pom.xml +++ b/cloud-task-remote/pom.xml @@ -20,7 +20,8 @@ com.muyu - cloud-common-core + cloud-task-common + 1.0.0 diff --git a/cloud-task-remote/src/main/java/com/muyu/task/feign/DataValueFeign.java b/cloud-task-remote/src/main/java/com/muyu/task/feign/DataValueClient.java similarity index 94% rename from cloud-task-remote/src/main/java/com/muyu/task/feign/DataValueFeign.java rename to cloud-task-remote/src/main/java/com/muyu/task/feign/DataValueClient.java index 26a9f80..00b7aad 100644 --- a/cloud-task-remote/src/main/java/com/muyu/task/feign/DataValueFeign.java +++ b/cloud-task-remote/src/main/java/com/muyu/task/feign/DataValueClient.java @@ -14,9 +14,8 @@ import org.springframework.web.bind.annotation.RequestParam; */ //,fallback = TaskFeignFallback.class @FeignClient(name = "cloud-source") -public interface DataValueFeign { +public interface DataValueClient { @PostMapping("/DataValue/findTableValue") public Result findTableValue(@RequestParam("basicId") Long basicId,@RequestParam("sql") String sql); - } diff --git a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java index b178d2b..e0e71c9 100644 --- a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java +++ b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java @@ -14,7 +14,7 @@ import com.muyu.service.TaskInputService; import com.muyu.service.TaskJoinService; import com.muyu.service.TaskOutputService; import com.muyu.service.TaskService; -import com.muyu.task.feign.DataValueFeign; +import com.muyu.task.feign.DataValueClient; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -46,7 +46,7 @@ public class TaskServiceImpl extends ServiceImpl implement private TaskOutputService taskOutputService; @Autowired - private DataValueFeign dataValue; + private DataValueClient dataValueFeign; @Override public List selectList(TaskInfoReq taskInfoReq) { @@ -106,8 +106,8 @@ public class TaskServiceImpl extends ServiceImpl implement LambdaQueryWrapper outputInfo = new LambdaQueryWrapper<>(); outputInfo.eq(TaskOutputInfo::getTaskId, taskId); - TaskOutputInfo serviceOne = taskOutputService.getOne(outputInfo); - String[] outPutFileName = serviceOne.getLastFileName().split(","); + TaskOutputInfo taskOutputInfo = taskOutputService.getOne(outputInfo); + String[] outPutFileName = taskOutputInfo.getLastFileName().split(","); HashMap fieldAsNameMap = new HashMap<>(); String sql = ""; for (int i = 0; i < taskInputList.size(); i++) { @@ -144,7 +144,6 @@ public class TaskServiceImpl extends ServiceImpl implement rightInput.getTableAsName() + " on " + leftInput.getTableAsName() + "." + fieldAsNameMap.get(taskJoinInfo.getLeftJoinField()) + "=" + rightInput.getTableAsName() + "." + fieldAsNameMap.get(taskJoinInfo.getRightJoinField()) + " "; - } }else{ LambdaQueryWrapper selectOne = new LambdaQueryWrapper<>(); @@ -153,17 +152,16 @@ public class TaskServiceImpl extends ServiceImpl implement sql += taskInputInfo.getTableName() + " " + taskInputInfo.getTableAsName(); } - System.out.println(sql); - System.out.println(sql); - System.out.println(sql); - System.out.println(sql); - System.out.println(sql); - System.out.println(sql); + log.info(sql); - Result tableValue = dataValue.findTableValue(Long.valueOf(serviceOne.getBasicId()), sql); - log.info(tableValue); - Object data = tableValue.getData(); - System.out.println(data); + log.info(sql); + log.info(sql); + + Result tableValue = dataValueFeign.findTableValue(Long.valueOf(taskOutputInfo.getBasicId()), sql); + System.out.println(tableValue); + System.out.println(tableValue); + System.out.println(tableValue); + return "success"; }