diff --git a/cloud-task-server/src/main/java/com/muyu/task/server/service/TaskInfoService.java b/cloud-task-server/src/main/java/com/muyu/task/server/service/TaskInfoService.java index 9e5126d..dfafdfb 100644 --- a/cloud-task-server/src/main/java/com/muyu/task/server/service/TaskInfoService.java +++ b/cloud-task-server/src/main/java/com/muyu/task/server/service/TaskInfoService.java @@ -13,5 +13,5 @@ import com.muyu.common.domian.resp.TaskInfoResp; public interface TaskInfoService extends IService { Page selectList(TaskInfoListReq req); - String findByFieName(Long taskId); + } 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 f2750a4..63af08b 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 @@ -63,59 +63,4 @@ public class TaskInfoServiceImpl extends ServiceImpl i return respPage; } - @Override - public String findByFieName(Long taskId) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("task_id", taskId); - HashSet longs = new HashSet<>(); - List list = taskInputService.list(wrapper); - if (CollectionUtils.isEmpty(list)) { - return "没有选择字段"; - } - String fieName = ""; - for (int i = 0; i < list.size(); i++) { - fieName += "," + list.get(i).getTableAsFieId(); - Long databaseId = list.get(i).getDatabaseId(); - longs.add(databaseId); - } - if (longs.size() > 1) { - return "你选择的不是同一个数据库"; - } - QueryWrapper jointQueryWrapper = new QueryWrapper<>(); - jointQueryWrapper.eq("task_id", taskId); - List jointList = nodeJointService.list(jointQueryWrapper); - String joint = ""; - if (!CollectionUtils.isEmpty(jointList)) { - for (NodeJoint nodeJoint : jointList) { - String oneNodeId = nodeJoint.getOneNodeId(); - TaskInput taskInput = taskInputService.selectByNodeId(oneNodeId); - String tableName = taskInput.getTableName(); - String tableAsName = taskInput.getTableAsName(); - - String twoNodeId = nodeJoint.getTwoNodeId(); - TaskInput taskInputTwo = taskInputService.selectByNodeId(twoNodeId); - String tableNameTwo = taskInputTwo.getTableName(); - String tableAsNameTwo = taskInputTwo.getTableAsName(); - joint += " " + tableName + " " + " " + tableAsName + " " + nodeJoint.getJoint() - + " " + tableNameTwo + " " + " " + tableAsNameTwo + " on " + nodeJoint.getOneFie() - + " = " + nodeJoint.getTwoFie(); - - } - }else { - TaskInput taskInput = taskInputService.selectByTaskId(taskId); - String tableName = taskInput.getTableName(); - String tableAsName = taskInput.getTableAsName(); - joint=" "+ tableName+" "+tableAsName; - } - Long basicId = taskInputService.selectByBasicId(taskId); - fieName = fieName.substring(1); - String sql = " SELECT " + fieName + " FROM "+ joint; - System.out.println(sql); - Result>> tableValueResult = datasourceFeign.findTableValue(basicId, sql); - List> tableValue = tableValueResult.getData(); - for (List dataValues : tableValue) { - System.out.println(dataValues); - } - return null; - } } diff --git a/cloud-task-server/src/main/resources/mapper/TaskInputMapper.xml b/cloud-task-server/src/main/resources/mapper/TaskInputMapper.xml index 31c8cf0..b0b2334 100644 --- a/cloud-task-server/src/main/resources/mapper/TaskInputMapper.xml +++ b/cloud-task-server/src/main/resources/mapper/TaskInputMapper.xml @@ -15,7 +15,7 @@ where task_id =${taskId}