diff --git a/cloud-task-common/src/main/java/com/muyu/domain/TaskInputInfo.java b/cloud-task-common/src/main/java/com/muyu/domain/TaskInputInfo.java index 8c33e5e..6b39831 100644 --- a/cloud-task-common/src/main/java/com/muyu/domain/TaskInputInfo.java +++ b/cloud-task-common/src/main/java/com/muyu/domain/TaskInputInfo.java @@ -65,7 +65,7 @@ public class TaskInputInfo extends BaseEntity { /** * 表字段别名 */ - private String ableAsField; + private String tableAsField; /** * 字段规则 diff --git a/cloud-task-common/src/main/java/com/muyu/domain/req/TaskInfoReq.java b/cloud-task-common/src/main/java/com/muyu/domain/req/TaskInfoReq.java index 2939261..2b2a0b5 100644 --- a/cloud-task-common/src/main/java/com/muyu/domain/req/TaskInfoReq.java +++ b/cloud-task-common/src/main/java/com/muyu/domain/req/TaskInfoReq.java @@ -20,12 +20,6 @@ import lombok.NoArgsConstructor; @Builder public class TaskInfoReq { - /** - * 主键 - */ - @TableId(value = "id",type = IdType.AUTO) - private Integer id; - /** * 任务名称 */ diff --git a/cloud-task-server/src/main/java/com/muyu/controller/TaskController.java b/cloud-task-server/src/main/java/com/muyu/controller/TaskController.java index 186bbcc..d357cc7 100644 --- a/cloud-task-server/src/main/java/com/muyu/controller/TaskController.java +++ b/cloud-task-server/src/main/java/com/muyu/controller/TaskController.java @@ -50,7 +50,7 @@ public class TaskController { public Result addTask( @Validated @RequestBody TaskInfo taskInfo) { - return Result.success(taskService.addTask(taskInfo),"添加成功"); + return Result.success(null,taskService.addTask(taskInfo)); } /** diff --git a/cloud-task-server/src/main/java/com/muyu/controller/TaskInputInfoController.java b/cloud-task-server/src/main/java/com/muyu/controller/TaskInputInfoController.java new file mode 100644 index 0000000..262e6a5 --- /dev/null +++ b/cloud-task-server/src/main/java/com/muyu/controller/TaskInputInfoController.java @@ -0,0 +1,33 @@ +package com.muyu.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.domain.TaskInputInfo; +import com.muyu.service.TaskInputService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * @PackageName:com.muyu.controller + * @ClassName:TaskInputInfoController + * @Description: + * @author: ¥陈思豪¥ + * @date: 2024/8/27 21:35 + */ + +@RestController +@RequestMapping("/taskInput") +public class TaskInputInfoController { + + @Autowired + private TaskInputService taskInputService; + + @PostMapping(value = "addTaskInput") + public Result addTaskInput(@RequestBody TaskInputInfo taskInputInfo){ + return Result.success(null,taskInputService.addTaskInput(taskInputInfo)); + } + +} diff --git a/cloud-task-server/src/main/java/com/muyu/mapper/TaskInputInfoMapper.java b/cloud-task-server/src/main/java/com/muyu/mapper/TaskInputInfoMapper.java new file mode 100644 index 0000000..6cd3127 --- /dev/null +++ b/cloud-task-server/src/main/java/com/muyu/mapper/TaskInputInfoMapper.java @@ -0,0 +1,9 @@ +package com.muyu.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.domain.TaskInputInfo; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface TaskInputInfoMapper extends BaseMapper { +} diff --git a/cloud-task-server/src/main/java/com/muyu/service/TaskInputService.java b/cloud-task-server/src/main/java/com/muyu/service/TaskInputService.java new file mode 100644 index 0000000..49fe199 --- /dev/null +++ b/cloud-task-server/src/main/java/com/muyu/service/TaskInputService.java @@ -0,0 +1,9 @@ +package com.muyu.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.domain.TaskInputInfo; + +public interface TaskInputService extends IService { + String addTaskInput(TaskInputInfo taskInputInfo); +} diff --git a/cloud-task-server/src/main/java/com/muyu/service/impl/TableInfoServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/service/impl/TableInfoServiceImpl.java index c8723ce..9d5c139 100644 --- a/cloud-task-server/src/main/java/com/muyu/service/impl/TableInfoServiceImpl.java +++ b/cloud-task-server/src/main/java/com/muyu/service/impl/TableInfoServiceImpl.java @@ -36,7 +36,7 @@ public class TableInfoServiceImpl extends ServiceImpl queryWrapperC = new LambdaQueryWrapper<>(); - queryWrapperC.eq(TableInfo::getParentId,tableInfo.getId()); + queryWrapperC.eq(TableInfo::getParentId, tableInfo.getId()); List list1 = this.list(queryWrapperC); List tableInfoCasRespSon = new ArrayList<>(); for (TableInfo info : list1) { @@ -48,6 +48,16 @@ public class TableInfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(TableInfo::getParentId,0); +// List list = this.list(queryWrapper); +// list.forEach(tableInfo -> { +// LambdaQueryWrapper queryWrapperC = new LambdaQueryWrapper<>(); +// queryWrapperC.eq(TableInfo::getParentId,tableInfo.getId()); +// List list1 = this.list(queryWrapperC); +// tableInfo.setTableInfoList(list1); +// }); + }); return tableInfoCasResp; } diff --git a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskInputInfoServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskInputInfoServiceImpl.java new file mode 100644 index 0000000..8f8c934 --- /dev/null +++ b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskInputInfoServiceImpl.java @@ -0,0 +1,36 @@ +package com.muyu.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.domain.TaskInputInfo; +import com.muyu.mapper.TaskInputInfoMapper; +import com.muyu.service.TaskInputService; +import org.jetbrains.annotations.NotNull; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Iterator; + +/** + * @PackageName:com.muyu.service.impl + * @ClassName:TaskInputServOceanServiceImpl + * @Description: + * @author: ¥陈思豪¥ + * @date: 2024/8/27 21:37 + */ +@Service +public class TaskInputInfoServiceImpl extends ServiceImpl implements TaskInputService { + + @Autowired + private TaskInputInfoMapper taskInputInfoMapper; + + @Override + public String addTaskInput(TaskInputInfo taskInputInfo) { + int i = taskInputInfoMapper.insert(taskInputInfo); + if(i<=0){ + throw new RuntimeException("添加失败"); + } + return "添加成功"; + } +} diff --git a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java index e8414bd..3082f16 100644 --- a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java +++ b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java @@ -46,7 +46,10 @@ public class TaskServiceImpl extends ServiceImpl implement @Override public String addTask(TaskInfo taskInfo) { - this.save(taskInfo); + boolean save = this.save(taskInfo); + if(save == false){ + throw new RuntimeException("err"); + } return "success"; } @@ -60,7 +63,10 @@ public class TaskServiceImpl extends ServiceImpl implement @Override public String deleteById(Integer id) { TaskMapper taskMapper = this.baseMapper; - taskMapper.deleteById(id); + int i = taskMapper.deleteById(id); + if(i<=0){ + throw new RuntimeException("err"); + } return "success"; }