TreeData
/
cloud-etl-task
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加联查信息方法

master
陈思豪 2024-09-05 15:35:03 +08:00
parent 34c07a4d85
commit 4f07aa08ad
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cloud-task-remote/pom.xml
View File

@ -20,7 +20,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.muyu</groupId> <groupId>com.muyu</groupId>
<artifactId>cloud-common-core</artifactId> <artifactId>cloud-task-common</artifactId>
<version>1.0.0</version>
</dependency> </dependency>
</dependencies> </dependencies>

3
cloud-task-remote/src/main/java/com/muyu/task/feign/DataValueFeign.java → cloud-task-remote/src/main/java/com/muyu/task/feign/DataValueClient.java
View File

@ -14,9 +14,8 @@ import org.springframework.web.bind.annotation.RequestParam;
*/ */
//,fallback = TaskFeignFallback.class //,fallback = TaskFeignFallback.class
@FeignClient(name = "cloud-source") @FeignClient(name = "cloud-source")
public interface DataValueFeign { public interface DataValueClient {
@PostMapping("/DataValue/findTableValue") @PostMapping("/DataValue/findTableValue")
public Result findTableValue(@RequestParam("basicId") Long basicId,@RequestParam("sql") String sql); public Result findTableValue(@RequestParam("basicId") Long basicId,@RequestParam("sql") String sql);
} }

28
cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java
View File

@ -14,7 +14,7 @@ import com.muyu.service.TaskInputService;
import com.muyu.service.TaskJoinService; import com.muyu.service.TaskJoinService;
import com.muyu.service.TaskOutputService; import com.muyu.service.TaskOutputService;
import com.muyu.service.TaskService; import com.muyu.service.TaskService;
import com.muyu.task.feign.DataValueFeign; import com.muyu.task.feign.DataValueClient;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -46,7 +46,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, TaskInfo> implement
private TaskOutputService taskOutputService; private TaskOutputService taskOutputService;
@Autowired @Autowired
private DataValueFeign dataValue; private DataValueClient dataValueFeign;
@Override @Override
public List<TaskInfo> selectList(TaskInfoReq taskInfoReq) { public List<TaskInfo> selectList(TaskInfoReq taskInfoReq) {
@ -106,8 +106,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, TaskInfo> implement
LambdaQueryWrapper<TaskOutputInfo> outputInfo = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TaskOutputInfo> outputInfo = new LambdaQueryWrapper<>();
outputInfo.eq(TaskOutputInfo::getTaskId, taskId); outputInfo.eq(TaskOutputInfo::getTaskId, taskId);
TaskOutputInfo serviceOne = taskOutputService.getOne(outputInfo); TaskOutputInfo taskOutputInfo = taskOutputService.getOne(outputInfo);
String[] outPutFileName = serviceOne.getLastFileName().split(","); String[] outPutFileName = taskOutputInfo.getLastFileName().split(",");
HashMap<String, String> fieldAsNameMap = new HashMap<>(); HashMap<String, String> fieldAsNameMap = new HashMap<>();
String sql = ""; String sql = "";
for (int i = 0; i < taskInputList.size(); i++) { for (int i = 0; i < taskInputList.size(); i++) {
@ -144,7 +144,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, TaskInfo> implement
rightInput.getTableAsName() + " on " + leftInput.getTableAsName() + "." + rightInput.getTableAsName() + " on " + leftInput.getTableAsName() + "." +
fieldAsNameMap.get(taskJoinInfo.getLeftJoinField()) + "=" + rightInput.getTableAsName() + "." + fieldAsNameMap.get(taskJoinInfo.getLeftJoinField()) + "=" + rightInput.getTableAsName() + "." +
fieldAsNameMap.get(taskJoinInfo.getRightJoinField()) + " "; fieldAsNameMap.get(taskJoinInfo.getRightJoinField()) + " ";
} }
}else{ }else{
LambdaQueryWrapper<TaskInputInfo> selectOne = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TaskInputInfo> selectOne = new LambdaQueryWrapper<>();
@ -153,17 +152,16 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, TaskInfo> implement
sql += taskInputInfo.getTableName() + " " + taskInputInfo.getTableAsName(); 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); log.info(sql);
Result tableValue = dataValue.findTableValue(Long.valueOf(serviceOne.getBasicId()), sql); log.info(sql);
log.info(tableValue); log.info(sql);
Object data = tableValue.getData();
System.out.println(data); Result tableValue = dataValueFeign.findTableValue(Long.valueOf(taskOutputInfo.getBasicId()), sql);
System.out.println(tableValue);
System.out.println(tableValue);
System.out.println(tableValue);
return "success"; return "success";
} }