添加联查信息方法
parent
34c07a4d85
commit
4f07aa08ad
|
@ -20,7 +20,8 @@
|
|||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.muyu</groupId>
|
||||
<artifactId>cloud-common-core</artifactId>
|
||||
<artifactId>cloud-task-common</artifactId>
|
||||
<version>1.0.0</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
}
|
|
@ -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<TaskMapper, TaskInfo> implement
|
|||
private TaskOutputService taskOutputService;
|
||||
|
||||
@Autowired
|
||||
private DataValueFeign dataValue;
|
||||
private DataValueClient dataValueFeign;
|
||||
|
||||
@Override
|
||||
public List<TaskInfo> selectList(TaskInfoReq taskInfoReq) {
|
||||
|
@ -106,8 +106,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, TaskInfo> implement
|
|||
|
||||
LambdaQueryWrapper<TaskOutputInfo> 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<String, String> fieldAsNameMap = new HashMap<>();
|
||||
String sql = "";
|
||||
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() + "." +
|
||||
fieldAsNameMap.get(taskJoinInfo.getLeftJoinField()) + "=" + rightInput.getTableAsName() + "." +
|
||||
fieldAsNameMap.get(taskJoinInfo.getRightJoinField()) + " ";
|
||||
|
||||
}
|
||||
}else{
|
||||
LambdaQueryWrapper<TaskInputInfo> selectOne = new LambdaQueryWrapper<>();
|
||||
|
@ -153,17 +152,16 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, TaskInfo> 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";
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue