From 1df322ecbe37a32710ae175fd7b420e4430a2f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B0=81=E7=BE=BD?= <2360164671@qq.com> Date: Mon, 4 Jul 2022 15:22:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86Task=E7=9A=84?= =?UTF-8?q?=E4=B8=A4=E7=A7=8D=E6=9F=A5=E8=AF=A2(=E5=BE=85=E6=B5=8B?= =?UTF-8?q?=E8=AF=95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TaskController.java | 35 +++++++++++++++++++ .../projectmanagement/mapper/TaskMapper.java | 11 ++++++ .../service/IProjectGroupService.java | 2 +- .../service/ITaskService.java | 16 +++++++++ .../service/impl/ProjectGroupServiceImpl.java | 22 ++++++++++++ .../service/impl/TaskServiceImpl.java | 34 ++++++++++++++++++ 6 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/TaskController.java create mode 100644 src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/mapper/TaskMapper.java create mode 100644 src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/ITaskService.java create mode 100644 src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/TaskController.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/TaskController.java new file mode 100644 index 0000000..55ed429 --- /dev/null +++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/TaskController.java @@ -0,0 +1,35 @@ +package cn.edu.hfut.rmdjzz.projectmanagement.controller; + +import cn.edu.hfut.rmdjzz.projectmanagement.entity.Task; +import cn.edu.hfut.rmdjzz.projectmanagement.service.ITaskService; +import cn.edu.hfut.rmdjzz.projectmanagement.utils.http.ResponseList; +import lombok.SneakyThrows; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author 张韬 + * created at 2022/7/4 15:02 + */ +@RestController +@RequestMapping("/task") +public class TaskController { + @Autowired + private ITaskService taskService; + + @SneakyThrows + @GetMapping("/{projectId}") + public ResponseList getTaskList(@RequestHeader("Token") String token,@PathVariable Integer projectId){ + List result = taskService.getTaskList(token,projectId,0); + return ResponseList.ofSuccess("查询成功",result); + } + + @SneakyThrows + @GetMapping("/getSubTask") + public ResponseList getSubTaskList(@RequestHeader("Token") String token,@RequestParam("projectId") Integer projectId,@RequestParam("fatherId") Integer fatherId){ + List result = taskService.getTaskList(token,projectId,fatherId); + return ResponseList.ofSuccess("查询成功",result); + } +} diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/mapper/TaskMapper.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/mapper/TaskMapper.java new file mode 100644 index 0000000..787e414 --- /dev/null +++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/mapper/TaskMapper.java @@ -0,0 +1,11 @@ +package cn.edu.hfut.rmdjzz.projectmanagement.mapper; + +import cn.edu.hfut.rmdjzz.projectmanagement.entity.Task; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @author 张韬 + * created at 2022/7/4 14:52 + */ +public interface TaskMapper extends BaseMapper { +} diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/IProjectGroupService.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/IProjectGroupService.java index 3a5c860..d6fc875 100644 --- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/IProjectGroupService.java +++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/IProjectGroupService.java @@ -9,5 +9,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IProjectGroupService extends IService { Boolean addCreator(Integer projectId, Integer staffId); - + Integer getUserLevelInGroup(String token,Integer projectId); } \ No newline at end of file diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/ITaskService.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/ITaskService.java new file mode 100644 index 0000000..55372e2 --- /dev/null +++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/ITaskService.java @@ -0,0 +1,16 @@ +package cn.edu.hfut.rmdjzz.projectmanagement.service; + +import cn.edu.hfut.rmdjzz.projectmanagement.entity.Staff; +import cn.edu.hfut.rmdjzz.projectmanagement.entity.Task; +import cn.edu.hfut.rmdjzz.projectmanagement.exception.BadRequestException; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + * @author 张韬 + * created at 2022/7/4 14:49 + */ +public interface ITaskService extends IService { + List getTaskList(String token,Integer projectId,Integer fatherId) throws BadRequestException; +} diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/ProjectGroupServiceImpl.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/ProjectGroupServiceImpl.java index ac15c38..dc73d3a 100644 --- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/ProjectGroupServiceImpl.java +++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/ProjectGroupServiceImpl.java @@ -1,17 +1,23 @@ package cn.edu.hfut.rmdjzz.projectmanagement.service.impl; import cn.edu.hfut.rmdjzz.projectmanagement.entity.ProjectGroup; +import cn.edu.hfut.rmdjzz.projectmanagement.entity.Staff; import cn.edu.hfut.rmdjzz.projectmanagement.mapper.ProjectGroupMapper; import cn.edu.hfut.rmdjzz.projectmanagement.service.IProjectGroupService; +import cn.edu.hfut.rmdjzz.projectmanagement.utils.TokenUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import java.io.Serializable; + /** * @author 张韬 * created at 2022/6/30 21:38 */ @Service public class ProjectGroupServiceImpl extends ServiceImpl implements IProjectGroupService { + @Override public Boolean addCreator(Integer projectId, Integer staffId) { if (projectId == null || staffId == null) return false; @@ -21,4 +27,20 @@ public class ProjectGroupServiceImpl extends ServiceImpllambdaQuery().eq(ProjectGroup::getStaffId, staffId).eq(ProjectGroup::getProjectId, projectId)); + if(projectGroup == null) + return 0; + else if(projectGroup.getProjectStaffPosition().length()>0) + return 1; + else + return 0; + }catch(Exception e){//需要调整 + return 0; + } + } } diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java new file mode 100644 index 0000000..e20deca --- /dev/null +++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java @@ -0,0 +1,34 @@ +package cn.edu.hfut.rmdjzz.projectmanagement.service.impl; + +import cn.edu.hfut.rmdjzz.projectmanagement.entity.ProjectGroup; +import cn.edu.hfut.rmdjzz.projectmanagement.entity.Staff; +import cn.edu.hfut.rmdjzz.projectmanagement.entity.Task; +import cn.edu.hfut.rmdjzz.projectmanagement.exception.BadRequestException; +import cn.edu.hfut.rmdjzz.projectmanagement.mapper.StaffMapper; +import cn.edu.hfut.rmdjzz.projectmanagement.mapper.TaskMapper; +import cn.edu.hfut.rmdjzz.projectmanagement.service.IStaffService; +import cn.edu.hfut.rmdjzz.projectmanagement.service.ITaskService; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author 张韬 + * created at 2022/7/4 14:51 + */ +@Service +public class TaskServiceImpl extends ServiceImpl implements ITaskService { + @Autowired + private ProjectGroupServiceImpl projectGroupServiceImpl; + @Override + public List getTaskList(String token,Integer projectId,Integer fatherId) throws BadRequestException { + if(projectGroupServiceImpl.getUserLevelInGroup(token,projectId)==0||fatherId==null){ + throw new BadRequestException("错误的访问参数"); + } + return baseMapper.selectList(Wrappers.lambdaQuery().eq(Task::getTaskProjectId,projectId).eq(Task::getTaskFatherId,fatherId)); + } +}