添加字段和表
parent
8902a34e4a
commit
230b90c5c2
|
@ -41,5 +41,9 @@ public class NodeJoint {
|
||||||
*/
|
*/
|
||||||
private String twoFie;
|
private String twoFie;
|
||||||
|
|
||||||
|
private String oneNodeId;
|
||||||
|
|
||||||
|
private String twoNodeId;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -83,7 +83,7 @@ public class Structure extends BaseEntity
|
||||||
.columnName(structure.columnName)
|
.columnName(structure.columnName)
|
||||||
.columnType(structure.columnType)
|
.columnType(structure.columnType)
|
||||||
.isNull(structure.isNull)
|
.isNull(structure.isNull)
|
||||||
.tableAsName(tableAsName+"_"+structure.columnName)
|
.tableAsName(tableAsName+"."+structure.columnName)
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,17 +1,23 @@
|
||||||
package com.muyu.task.server.controller;
|
package com.muyu.task.server.controller;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.muyu.common.core.domain.Result;
|
import com.muyu.common.core.domain.Result;
|
||||||
import com.muyu.common.domian.TaskInfo;
|
import com.muyu.common.domian.TaskInfo;
|
||||||
|
import com.muyu.common.domian.TaskInput;
|
||||||
import com.muyu.common.domian.req.TaskInfoAddReq;
|
import com.muyu.common.domian.req.TaskInfoAddReq;
|
||||||
import com.muyu.common.domian.req.TaskInfoListReq;
|
import com.muyu.common.domian.req.TaskInfoListReq;
|
||||||
import com.muyu.common.domian.req.TaskInfoUpdReq;
|
import com.muyu.common.domian.req.TaskInfoUpdReq;
|
||||||
import com.muyu.common.domian.resp.TaskInfoResp;
|
import com.muyu.common.domian.resp.TaskInfoResp;
|
||||||
|
import com.muyu.task.server.service.NodeJointService;
|
||||||
|
import com.muyu.task.server.service.NodeTableService;
|
||||||
import com.muyu.task.server.service.TaskInfoService;
|
import com.muyu.task.server.service.TaskInfoService;
|
||||||
|
import com.muyu.task.server.service.TaskInputService;
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.util.CollectionUtils;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
@ -29,6 +35,11 @@ public class TaskInfoController {
|
||||||
@Autowired
|
@Autowired
|
||||||
private TaskInfoService taskInfoService;
|
private TaskInfoService taskInfoService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private TaskInputService taskInputService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private NodeJointService nodeJointService;
|
||||||
/**
|
/**
|
||||||
* 获取所有的任务信息
|
* 获取所有的任务信息
|
||||||
* @param req
|
* @param req
|
||||||
|
@ -105,5 +116,11 @@ public class TaskInfoController {
|
||||||
return Result.success(null,"保存成功");
|
return Result.success(null,"保存成功");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping("/execute")
|
||||||
|
public Result execute(@RequestParam("taskId") Long taskId){
|
||||||
|
taskInputService.findByFieName(taskId);
|
||||||
|
return Result.success();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,6 +5,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import com.muyu.common.domian.TaskInput;
|
import com.muyu.common.domian.TaskInput;
|
||||||
import com.muyu.common.domian.req.TaskInputListReq;
|
import com.muyu.common.domian.req.TaskInputListReq;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public interface TaskInputService extends IService<TaskInput> {
|
public interface TaskInputService extends IService<TaskInput> {
|
||||||
Page<TaskInput> findList(TaskInputListReq req);
|
Page<TaskInput> findList(TaskInputListReq req);
|
||||||
|
|
||||||
|
String findByFieName(Long taskId);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,17 +1,31 @@
|
||||||
package com.muyu.task.server.service.impl;
|
package com.muyu.task.server.service.impl;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
import com.muyu.common.core.domain.Result;
|
||||||
import com.muyu.common.core.utils.StringUtils;
|
import com.muyu.common.core.utils.StringUtils;
|
||||||
import com.muyu.common.domian.TaskInput;
|
import com.muyu.common.domian.TaskInput;
|
||||||
import com.muyu.common.domian.req.TaskInputListReq;
|
import com.muyu.common.domian.req.TaskInputListReq;
|
||||||
import com.muyu.task.server.mapper.TaskInputMapper;
|
import com.muyu.task.server.mapper.TaskInputMapper;
|
||||||
|
import com.muyu.task.server.service.NodeTableService;
|
||||||
import com.muyu.task.server.service.TaskInputService;
|
import com.muyu.task.server.service.TaskInputService;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.util.CollectionUtils;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class TaskInputServiceImpl extends ServiceImpl<TaskInputMapper, TaskInput> implements TaskInputService {
|
public class TaskInputServiceImpl extends ServiceImpl<TaskInputMapper, TaskInput> implements TaskInputService {
|
||||||
|
@Autowired
|
||||||
|
private TaskInputMapper taskInputMapper;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private NodeTableService tableService;
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Page<TaskInput> findList(TaskInputListReq req) {
|
public Page<TaskInput> findList(TaskInputListReq req) {
|
||||||
LambdaQueryWrapper<TaskInput> wrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<TaskInput> wrapper = new LambdaQueryWrapper<>();
|
||||||
|
@ -20,4 +34,21 @@ public class TaskInputServiceImpl extends ServiceImpl<TaskInputMapper, TaskInput
|
||||||
page.setTotal(this.count(wrapper));
|
page.setTotal(this.count(wrapper));
|
||||||
return this.page(page, wrapper);
|
return this.page(page, wrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String findByFieName(Long taskId) {
|
||||||
|
QueryWrapper<TaskInput> wrapper = new QueryWrapper<>();
|
||||||
|
wrapper.eq("task_id",taskId);
|
||||||
|
List<TaskInput> list = taskInputMapper.selectList(wrapper);
|
||||||
|
if (CollectionUtils.isEmpty(list)){
|
||||||
|
return "没有选择字段";
|
||||||
|
}
|
||||||
|
String fieName="";
|
||||||
|
for (int i = 0; i < list.size(); i++) {
|
||||||
|
fieName+= ","+list.get(i).getTableAsFieId();
|
||||||
|
}
|
||||||
|
fieName = fieName.substring(1);
|
||||||
|
// tableService.selectTableName(taskId);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE mapper
|
||||||
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
|
<mapper namespace="com.muyu.task.server.mapper.TaskInfoMapper">
|
||||||
|
|
||||||
|
</mapper>
|
Loading…
Reference in New Issue