添加字段和表

master
Cui YongXing 2024-09-03 17:02:16 +08:00
parent 61b06f8c55
commit cf4a22b95a
1 changed files with 24 additions and 19 deletions

View File

@ -162,15 +162,18 @@ public class TaskInfoServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo> i
} }
HashMap<String, String> tableNameMap = new HashMap<>(); HashMap<String, String> tableNameMap = new HashMap<>();
String fieName = ""; String fieName = "";
HashMap<String, Long> hashMap = new HashMap<>(); HashMap<String, String> hashMap = new HashMap<>();
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
Long databaseId = list.get(i).getDatabaseId(); Long databaseId = list.get(i).getDatabaseId();
longs.add(databaseId); longs.add(databaseId);
String tableFieId = list.get(i).getTableFieId(); String[] tableFieId = list.get(i).getTableFieId().split(",");
String tableAsFieId = list.get(i).getTableAsFieId(); String[] tableAsFieId = list.get(i).getTableAsFieId().split(",");
// String fieIdAsEngineId = list.get(i).getFieIdAsEngineId(); String[] fieIdAsEngineId = list.get(i).getFieIdAsEngineId().split(",");
// hashMap.put(tableFieId,fieIdAsEngineId); for (int j = 0; j < tableFieId.length; j++) {
// tableNameMap.put(tableFieId,tableAsFieId); hashMap.put(tableFieId[j],fieIdAsEngineId[j]);
tableNameMap.put(tableFieId[j],tableAsFieId[j]);
}
} }
if (longs.size() > 1) { if (longs.size() > 1) {
return "你选择的不是同一个数据库"; return "你选择的不是同一个数据库";
@ -183,12 +186,16 @@ public class TaskInfoServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo> i
if (!CollectionUtils.isEmpty(jointList)) { if (!CollectionUtils.isEmpty(jointList)) {
for (NodeJoint nodeJoint : jointList) { for (NodeJoint nodeJoint : jointList) {
String oneNodeId = nodeJoint.getOneNodeId(); String oneNodeId = nodeJoint.getOneNodeId();
TaskInput taskInput = taskInputService.selectByNodeId(oneNodeId); QueryWrapper<TaskInput> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("node_id", oneNodeId);
TaskInput taskInput = taskInputService.getOne(queryWrapper);
String tableName = taskInput.getTableName(); String tableName = taskInput.getTableName();
String tableAsName = taskInput.getTableAsName(); String tableAsName = taskInput.getTableAsName();
String twoNodeId = nodeJoint.getTwoNodeId(); String twoNodeId = nodeJoint.getTwoNodeId();
TaskInput taskInputTwo = taskInputService.selectByNodeId(twoNodeId); QueryWrapper<TaskInput> queryWrapperTwo = new QueryWrapper<>();
queryWrapperTwo.eq("node_id", twoNodeId);
TaskInput taskInputTwo = taskInputService.getOne(queryWrapperTwo);
String tableNameTwo = taskInputTwo.getTableName(); String tableNameTwo = taskInputTwo.getTableName();
String tableAsNameTwo = taskInputTwo.getTableAsName(); String tableAsNameTwo = taskInputTwo.getTableAsName();
joint += " " + tableName + " " + " " + tableAsName + " " + nodeJoint.getJoint() joint += " " + tableName + " " + " " + tableAsName + " " + nodeJoint.getJoint()
@ -197,7 +204,7 @@ public class TaskInfoServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo> i
} }
}else { }else {
TaskInput taskInput = taskInputService.selectByTaskId(taskId); TaskInput taskInput = taskInputService.getOne(wrapper);
String tableName = taskInput.getTableName(); String tableName = taskInput.getTableName();
String tableAsName = taskInput.getTableAsName(); String tableAsName = taskInput.getTableAsName();
joint=" "+ tableName+" "+tableAsName; joint=" "+ tableName+" "+tableAsName;
@ -207,17 +214,15 @@ public class TaskInfoServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo> i
QueryWrapper<TaskOutput> queryWrapper = new QueryWrapper<>(); QueryWrapper<TaskOutput> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("task_id", taskId); queryWrapper.eq("task_id", taskId);
List<TaskOutput> list1 = taskOutputService.list(queryWrapper); TaskOutput one = taskOutputService.getOne(queryWrapper);
Long tableId = one.getTableId();
Long newBasicId = one.getBasicId();
HashMap<String, String> map = new HashMap<>(); HashMap<String, String> map = new HashMap<>();
Long tableId=null; String[] newFieName = one.getNewFieName().split(",");
Long newBasicId=null; String[] lastFieName = one.getLastFieName().split(",");
for (TaskOutput taskOutput : list1) { for (int i = 0; i < newFieName.length; i++) {
tableId=taskOutput.getTableId(); map.put(lastFieName[i], newFieName[i]);
newBasicId=taskOutput.getBasicId(); fieName += "," + tableNameMap.get(lastFieName[i]);
String lastFieName = taskOutput.getLastFieName();
String newFieName = taskOutput.getNewFieName();
map.put(lastFieName, newFieName);
fieName += "," + tableNameMap.get(lastFieName);
} }
fieName = fieName.substring(1); fieName = fieName.substring(1);
String sql = " SELECT " + fieName + " FROM "+ joint; String sql = " SELECT " + fieName + " FROM "+ joint;