Compare commits

..

3 Commits

3 changed files with 48 additions and 30 deletions

View File

@ -1,6 +1,8 @@
package cn.edu.hfut.rmdjzz.projectmanagement.controller; package cn.edu.hfut.rmdjzz.projectmanagement.controller;
import cn.edu.hfut.rmdjzz.projectmanagement.entity.Task; import cn.edu.hfut.rmdjzz.projectmanagement.entity.Task;
import cn.edu.hfut.rmdjzz.projectmanagement.exception.BadRequestException;
import cn.edu.hfut.rmdjzz.projectmanagement.service.IProjectGroupService;
import cn.edu.hfut.rmdjzz.projectmanagement.service.ITaskService; import cn.edu.hfut.rmdjzz.projectmanagement.service.ITaskService;
import cn.edu.hfut.rmdjzz.projectmanagement.utils.http.ResponseList; import cn.edu.hfut.rmdjzz.projectmanagement.utils.http.ResponseList;
import cn.edu.hfut.rmdjzz.projectmanagement.utils.http.ResponseMap; import cn.edu.hfut.rmdjzz.projectmanagement.utils.http.ResponseMap;
@ -20,6 +22,9 @@ public class TaskController {
@Autowired @Autowired
private ITaskService taskService; private ITaskService taskService;
@Autowired
private IProjectGroupService projectGroupService;
@SneakyThrows @SneakyThrows
@GetMapping("/subtask/{fatherId}") @GetMapping("/subtask/{fatherId}")
public ResponseList<Task> getSubTaskList( public ResponseList<Task> getSubTaskList(
@ -39,14 +44,14 @@ public class TaskController {
} }
@SneakyThrows @SneakyThrows
@PostMapping @PostMapping("/subtask/exist")
public ResponseMap createTask( public ResponseMap createTask(
@RequestHeader("Token") String token, @RequestHeader("Token") String token,
@PathVariable("projectId") Integer projectId, @PathVariable("projectId") Integer projectId,
@RequestBody Task task @RequestParam("taskId") Long taskId
) { ) {
task.setTaskProjectId(projectId); return ResponseMap.ofSuccess("返回成功")
task = taskService.insertTask(token, task); .put("existSubTask" ,taskService.existSubTask(token, projectId, taskId));
return ResponseMap.ofSuccess("新建成功", task);
} }
}
}

View File

@ -13,7 +13,7 @@ import java.util.List;
*/ */
public interface ITaskService extends IService<Task> { public interface ITaskService extends IService<Task> {
List<Task> getTaskList(String token,Integer projectId,Long fatherId) throws BadRequestException; List<Task> getTaskList(String token,Integer projectId,Long fatherId) throws BadRequestException;
List<List<Long>> getTaskAndSubTask(Long taskId); Boolean existSubTask(String token, Integer projectId, Long taskId) throws BadRequestException;
Boolean deleteTaskAndSubTask(String token, Integer projectId, Long taskId) throws BadRequestException; Boolean deleteTaskAndSubTask(String token, Integer projectId, Long taskId) throws BadRequestException;
Boolean closeTaskAndSubTask(String token, Integer projectId, Long taskId) throws BadRequestException; Boolean closeTaskAndSubTask(String token, Integer projectId, Long taskId) throws BadRequestException;
Integer checkHolder(Integer staffId,Long taskId); Integer checkHolder(Integer staffId,Long taskId);

View File

@ -38,36 +38,35 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
return baseMapper.selectList(Wrappers.<Task>lambdaQuery().eq(Task::getTaskProjectId, projectId).eq(Task::getTaskFatherId, fatherId)); return baseMapper.selectList(Wrappers.<Task>lambdaQuery().eq(Task::getTaskProjectId, projectId).eq(Task::getTaskFatherId, fatherId));
} }
//FIXME:
@Override @Override
public List<List<Long>> getTaskAndSubTask(Long taskId) { public Boolean existSubTask(String token, Integer projectId, Long taskId) throws BadRequestException {
List<List<Long>> resList = new ArrayList<>(); if(projectGroupService.getUserLevelInGroup(token, projectId) == 0) {
List<Long> res = new ArrayList<>(); throw new BadRequestException("请求参数错误");
res.add(taskId);
resList.add(res);
while (true) {
List<Task> list = baseMapper.selectList(Wrappers.<Task>lambdaQuery().in(Task::getTaskFatherId, res));
if (list == null || list.isEmpty()) break;
res = list.stream().map(Task::getTaskId).collect(Collectors.toList());
resList.add(res);
} }
return resList; return baseMapper.exists(Wrappers.<Task>lambdaQuery().eq(Task::getTaskFatherId, taskId));
} }
//FIXME:
@Transactional(isolation = Isolation.SERIALIZABLE, rollbackFor = Exception.class) @Transactional(isolation = Isolation.SERIALIZABLE, rollbackFor = Exception.class)
@Override @Override
public Boolean deleteTaskAndSubTask(String token, Integer projectId, Long taskId) throws BadRequestException { public Boolean deleteTaskAndSubTask(String token, Integer projectId, Long taskId) throws BadRequestException {
Integer level = checkHolder(token, taskId);
if (projectGroupService.getUserLevelInGroup(token, projectId) == 0) { if (projectGroupService.getUserLevelInGroup(token, projectId) == 0) {
throw new BadRequestException("错误参数"); throw new BadRequestException("错误参数");
} }
if (!checkHolder(token, taskId)) { if (level == 0 || level == 3) {
throw new BadRequestException("错误父级参数"); throw new BadRequestException("错误父级参数");
} }
List<List<Long>> resList = getTaskAndSubTask(taskId);
try { try {
for (List<Long> list : resList) { List<Long> res = new ArrayList<>();
baseMapper.delete(Wrappers.<Task>lambdaQuery().in(Task::getTaskId, list)); res.add(taskId);
while (true) {
List<Task> list = baseMapper.selectList(
Wrappers.<Task>lambdaQuery()
.in(Task::getTaskFatherId, res)
.ne(Task::getTaskStatus, "已完成"));
baseMapper.delete(Wrappers.<Task>lambdaQuery().in(Task::getTaskId, res));
if (list == null || list.isEmpty()) break;
res = list.stream().map(Task::getTaskId).collect(Collectors.toList());
} }
return true; return true;
} catch (Exception e) { } catch (Exception e) {
@ -75,19 +74,33 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
} }
} }
//FIXME: @Transactional(isolation = Isolation.SERIALIZABLE, rollbackFor = Exception.class)
@Override @Override
public Boolean closeTaskAndSubTask(String token, Integer projectId, Long taskId) throws BadRequestException { public Boolean closeTaskAndSubTask(String token, Integer projectId, Long taskId) throws BadRequestException {
Integer level = checkHolder(token, taskId);
if (projectGroupService.getUserLevelInGroup(token, projectId) == 0) { if (projectGroupService.getUserLevelInGroup(token, projectId) == 0) {
throw new BadRequestException("错误参数"); throw new BadRequestException("错误参数");
} }
if (!checkHolder(token, taskId)) { if (level == 0) {
throw new BadRequestException("错误父级参数"); throw new BadRequestException("错误父级参数");
} }
List<List<Long>> resList = getTaskAndSubTask(taskId);
try { try {
for (List<Long> list : resList) { List<Long> res = new ArrayList<>();
baseMapper.update(null, Wrappers.<Task>lambdaUpdate().in(Task::getTaskId, list).set(Task::getTaskStatus, "关闭")); res.add(taskId);
while (true) {
List<Task> list = baseMapper.selectList(
Wrappers.<Task>lambdaQuery()
.in(Task::getTaskFatherId, res)
.ne(Task::getTaskStatus, "已完成")
);
baseMapper.update(
null,
Wrappers.<Task>lambdaUpdate()
.in(Task::getTaskId, res)
.set(Task::getTaskStatus, "关闭")
);
if (list == null || list.isEmpty()) break;
res = list.stream().map(Task::getTaskId).collect(Collectors.toList());
} }
return true; return true;
} catch (Exception e) { } catch (Exception e) {
@ -181,7 +194,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
if (!task.checkInsert()) { if (!task.checkInsert()) {
throw new BadRequestException("工作项参数错误"); throw new BadRequestException("工作项参数错误");
} }
if (!checkHolder(token, task.getTaskFatherId())) { if (checkHolder(token, task.getTaskFatherId()) == 0) {
throw new BadRequestException("非法的父级参数"); throw new BadRequestException("非法的父级参数");
} }
try { try {