src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/config/WebConfig.java

@@ -11,7 +11,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
  * @author 张韬
  * created at 2022/6/28 19:44
  */
-//TODO: 整机限流
 @Configuration
 public class WebConfig implements WebMvcConfigurer {
     @Bean

src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/ProjectGroupController.java

@@ -20,7 +20,6 @@ import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -123,20 +122,4 @@ public class ProjectGroupController {
         }
         return ResponseList.ofSuccess(taskService.getProjectProcessOfStaff(token, projectId));
     }
-
-    //TODO: TEST
-    @Operation(description = "请求体是一个key为taskId，value为staffId的map")
-    @SneakyThrows
-    @PutMapping("/{staffId}/transfer")
-    public ResponseMap transferStaffTasks(
-            @RequestHeader("Token") String token,
-            @PathVariable Integer projectId,
-            @PathVariable Integer staffId,
-            @RequestBody Map<Long, Integer> transferMap
-    ) {
-        if (taskService.transferStaffTasks(token, projectId, staffId, transferMap)) {
-            return ResponseMap.ofSuccess();
-        }
-        throw new BadRequestException(BadRequestException.OPERATE_FAILED);
-    }
 }

src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/StaffController.java

@@ -2,11 +2,8 @@ package cn.edu.hfut.rmdjzz.projectmanagement.controller;
 
 import cn.edu.hfut.rmdjzz.projectmanagement.entity.Staff;
 import cn.edu.hfut.rmdjzz.projectmanagement.exception.BadRequestException;
-import cn.edu.hfut.rmdjzz.projectmanagement.exception.ForbiddenException;
 import cn.edu.hfut.rmdjzz.projectmanagement.exception.TokenException;
 import cn.edu.hfut.rmdjzz.projectmanagement.service.IStaffService;
-import cn.edu.hfut.rmdjzz.projectmanagement.utils.FileUtils;
-import cn.edu.hfut.rmdjzz.projectmanagement.utils.TokenUtils;
 import cn.edu.hfut.rmdjzz.projectmanagement.utils.http.ResponseMap;
 import io.swagger.v3.oas.annotations.Parameter;
 import lombok.SneakyThrows;
@@ -15,7 +12,6 @@ import org.springframework.util.DigestUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.Objects;
 
 /**
@@ -47,12 +43,8 @@ public class StaffController {
     }
 
     @SneakyThrows
-    @PostMapping(value = "/import")
+    @PostMapping(value = "/staff/import")
-    public ResponseMap importStaffs(
+    public ResponseMap upload(@RequestHeader("Token") String token, @RequestParam("uploadFile") MultipartFile uploadFile,@RequestParam("digest") String digest) {
-            @RequestHeader("Token") String token,
-            @RequestParam("File-Digest") String digest,
-            @RequestParam("uploadFile") MultipartFile uploadFile
-    ) {
         if (null == uploadFile) {
             throw new BadRequestException("文件传输错误");
         }
@@ -60,25 +52,10 @@ public class StaffController {
         if (!fileName.endsWith(".xlsx")) {
             throw new BadRequestException("文件类型错误");
         }
-        if (!Objects.equals(DigestUtils.md5DigestAsHex(uploadFile.getBytes()).toLowerCase(), digest.toLowerCase())) {
+        if(!Objects.equals(DigestUtils.md5DigestAsHex(uploadFile.getBytes()).toLowerCase(),digest.toLowerCase())){
             throw new BadRequestException("文件传输错误");
         }
         Integer successCount = staffService.multiImport(token, uploadFile);
         return ResponseMap.ofSuccess("成功导入" + successCount + "条数据");
     }
-
-    @SneakyThrows
-    @GetMapping("/import/template")
-    public ResponseMap downloadTemplate(
-            @RequestHeader("Token") String token,
-            HttpServletResponse response
-    ) {
-        if (TokenUtils.getStaffGlobalLevel(token) > 2) {
-            throw new ForbiddenException(ForbiddenException.UNABLE_TO_OPERATE);
-        }
-        if (FileUtils.downloadResource("static/账户导入模板.xlsx", response)) {
-            return ResponseMap.ofSuccess();
-        }
-        throw new BadRequestException(BadRequestException.OPERATE_FAILED);
-    }
 }

src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/Task.java

@@ -1,5 +1,6 @@
 package cn.edu.hfut.rmdjzz.projectmanagement.entity;
 
+import cn.edu.hfut.rmdjzz.projectmanagement.service.IProjectGroupService;
 import cn.edu.hfut.rmdjzz.projectmanagement.utils.BeanUtils;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -7,8 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Builder;
 import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.time.LocalDateTime;
 import java.util.Map;
@@ -18,17 +19,19 @@ import java.util.Objects;
  * @author 阳勇权
  * @since 2022/7/4 11:07
  */
-@Builder
 @Data
 public class Task {
-
+    @Autowired
+    private IProjectGroupService projectGroupService;
     public static final String ATTACH_DEMAND_SOURCE = "demandSource";
     public static final String ATTACH_ESTIMATED_MAN_HOURS = "estimatedManHours";
     public static final String ATTACH_SEVERITY = "severity";
     public static final String ATTACH_RECURRENCE_PROBABILITY = "recurrenceProbability";
+
     public static final String TYPE_DEFECT = "缺陷";
     public static final String TYPE_DEMAND = "需求";
     public static final String TYPE_ASSIGNMENT = "任务";
+
     public static final String STATUS_WAITING = "待进行";
     public static final String STATUS_PROCESSING = "进行中";
     public static final String STATUS_COMPLETED = "已完成";
@@ -114,6 +117,8 @@ public class Task {
     }
 
     public Boolean checkModification(Task rawTask) {
+        if (projectGroupService.getProjectAccessLevel(this.getTaskHolderId(), 3, this.getTaskProjectId()) == 0)
+            return false;
         if (rawTask.getTaskStatus().equals(STATUS_COMPLETED) || rawTask.getTaskStatus().equals(STATUS_CLOSED))
             return false;
         if (!rawTask.getTaskStatus().equals(STATUS_WAITING) && this.getTaskStatus().equals(STATUS_WAITING))

src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/ITaskService.java

@@ -45,7 +45,4 @@ public interface ITaskService extends IService<Task> {
     Task modifyTask(String token, Task task) throws BadRequestException, ForbiddenException;
 
     Map<String, List<TaskTrendDTO>> getProjectTaskTrend(String token, Integer projectId) throws BadRequestException, ForbiddenException;
-
-    Boolean transferStaffTasks(String token, Integer projectId, Integer transferredStaffId, Map<Long, Integer> transferMap) throws ForbiddenException, BadRequestException;
-
 }

src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java

@@ -12,7 +12,6 @@ import cn.edu.hfut.rmdjzz.projectmanagement.service.ITaskService;
 import cn.edu.hfut.rmdjzz.projectmanagement.utils.TokenUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.extension.toolkit.SimpleQuery;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -354,57 +353,4 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
         return taskTrendDTO;
     }
 
-    //不需要定义为事务，因为updateBatch已经定义为事务
-    @Override
-    public Boolean transferStaffTasks(String token, Integer projectId, Integer transferredStaffId, Map<Long, Integer> transferMap) throws ForbiddenException, BadRequestException {
-        if (projectGroupService.getProjectAccessLevel(token, projectId) == 0
-                || projectGroupService.getProjectAccessLevelIgnoreGlobalLevel(transferredStaffId, projectId) == 0) {
-            throw new ForbiddenException(IProjectGroupService.UNABLE_TO_ACCESS_PROJECT);
-        }
-        if (projectGroupService.compareProjectAccessLevel(projectId, token, transferredStaffId) < 0) {
-            throw new ForbiddenException(ForbiddenException.UNABLE_TO_OPERATE);
-        }
-
-        Map<Long, Task> originTransferTaskMap = SimpleQuery.keyMap(
-                Wrappers.<Task>lambdaQuery()
-                        .eq(Task::getTaskProjectId, projectId)
-                        .eq(Task::getTaskHolderId, transferredStaffId),
-                Task::getTaskId,
-                true
-        );
-        if (originTransferTaskMap.size() != transferMap.size()) {
-            throw new BadRequestException("未交接该员工的全部项目");
-        }
-
-        Set<Integer> targetStaffIdCache = new HashSet<>();
-        Set<Map.Entry<Long, Integer>> transferEntrySet = transferMap.entrySet();
-        for (Map.Entry<Long, Integer> transferEntry : transferEntrySet) {
-            Integer targetStaffId = transferEntry.getValue();
-            if (Objects.equals(targetStaffId, transferredStaffId)) {
-                throw new BadRequestException("不能将工作项交接给原员工");
-            }
-            if (!targetStaffIdCache.contains(targetStaffId)) {
-                if (projectGroupService.getProjectAccessLevelIgnoreGlobalLevel(targetStaffId, projectId) == 0) {
-                    throw new BadRequestException("交接目标员工不在该项目组中");
-                }
-                targetStaffIdCache.add(targetStaffId);
-            }
-            Task targetTask = originTransferTaskMap.remove(transferEntry.getKey());
-            if (targetTask == null || !Objects.equals(targetTask.getTaskHolderId(), transferredStaffId)) {
-                throw new BadRequestException("指定的交接任务不属于该项目或被交接员工");
-            }
-        }
-        if (!originTransferTaskMap.isEmpty()) {
-            throw new BadRequestException("未交接该员工的全部项目");
-        }
-
-        return updateBatchById(
-                transferEntrySet.parallelStream()
-                        .map(entry -> Task.builder()
-                                .taskId(entry.getKey())
-                                .taskHolderId(entry.getValue()).build())
-                        .collect(Collectors.toList())
-        );
-    }
-
 }

src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/utils/FileUtils.java

@@ -1,31 +0,0 @@
-package cn.edu.hfut.rmdjzz.projectmanagement.utils;
-
-import lombok.Cleanup;
-import org.springframework.util.DigestUtils;
-import org.springframework.util.MimeTypeUtils;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-
-/**
- * @author 佘语殊
- * @since 2022/7/11 9:32
- */
-public class FileUtils {
-    public static Boolean downloadResource(String resourceName, HttpServletResponse response) throws IOException {
-        @Cleanup InputStream is = FileUtils.class.getResourceAsStream(resourceName);
-        if (is == null) {
-            throw new FileNotFoundException("该文件不存在");
-        }
-        @Cleanup BufferedInputStream bis = new BufferedInputStream(is);
-        response.setContentType(MimeTypeUtils.APPLICATION_OCTET_STREAM_VALUE);
-        response.setCharacterEncoding("UTF-8");
-        ServletOutputStream out = response.getOutputStream();
-        response.addHeader("File-Digest", DigestUtils.md5DigestAsHex(bis));
-        @Cleanup BufferedOutputStream bos = new BufferedOutputStream(out);
-        bis.transferTo(bos);
-        bos.flush();
-        return true;
-    }
-}

src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/utils/http/ResponseMap.java

@@ -75,13 +75,7 @@ public class ResponseMap implements IResponse {
         return of(HttpStatus.OK.value(), msg, data);
     }
 
-    /**
-     * @param data 类型为String则填入msg，否则填入data
-     */
     public static ResponseMap ofSuccess(Object data) {
-        if (data instanceof String msg) {
-            return of(HttpStatus.OK.value(), msg);
-        }
         return of(HttpStatus.OK.value(), SUCCESS, data);
     }
 
@@ -89,6 +83,10 @@ public class ResponseMap implements IResponse {
         return of(HttpStatus.OK.value(), msg, data, putNulls);
     }
 
+    public static ResponseMap ofSuccess(String msg) {
+        return of(HttpStatus.OK.value(), msg);
+    }
+
     public static ResponseMap ofSuccess() {
         return of(HttpStatus.OK.value(), SUCCESS);
     }