Feat

1、实现了任务的开始和关闭功能。

Reference N/A

quality-review/src/main/java/com/ruoyi/service/StrategySystemReviewTask.java

@@ -5,6 +5,12 @@ import com.ruoyi.web.response.SystemReviewTaskViewResponse;
 
 public interface StrategySystemReviewTask {
 
+    void doStart(SystemReviewTask systemReviewTask);
+
+    void doSubmit(SystemReviewTask systemReviewTask);
+
+    void doClose(SystemReviewTask systemReviewTask);
+
     SystemReviewTaskViewResponse doView(SystemReviewTask systemReviewTask);
 
 }

quality-review/src/main/java/com/ruoyi/service/SystemReviewTaskService.java

@@ -3,6 +3,7 @@ package com.ruoyi.service;
 import com.ruoyi.domain.SystemReviewTask;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.web.request.SystemReviewTaskCreateRequest;
+import com.ruoyi.web.request.SystemReviewTaskStartRequest;
 import com.ruoyi.web.response.SystemReviewTaskViewResponse;
 
 /**
@@ -25,4 +26,10 @@ public interface SystemReviewTaskService extends IService<SystemReviewTask> {
      */
     SystemReviewTaskViewResponse view(Long taskId);
 
+    /**
+     * 开始一个任务
+     * @param request
+     */
+    void start(SystemReviewTaskStartRequest request);
+
 }

quality-review/src/main/java/com/ruoyi/service/impl/StrategySystemReviewTaskClose.java

 package com.ruoyi.service.impl;
 
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.domain.SystemReviewTask;
 import com.ruoyi.service.StrategySystemReviewTask;
 import com.ruoyi.web.response.SystemReviewTaskViewResponse;
@@ -10,6 +12,21 @@ import org.springframework.transaction.annotation.Transactional;
 @Service(SystemReviewTask.STATUS_CLOSE)
 public class StrategySystemReviewTaskClose implements StrategySystemReviewTask {
 
+    @Override
+    public void doStart(SystemReviewTask systemReviewTask) {
+        throw new ServiceException("不能开始一个已关闭的任务", HttpStatus.ERROR);
+    }
+
+    @Override
+    public void doSubmit(SystemReviewTask systemReviewTask) {
+        throw new ServiceException("不能提交一个已关闭的任务", HttpStatus.ERROR);
+    }
+
+    @Override
+    public void doClose(SystemReviewTask systemReviewTask) {
+        throw new ServiceException("不能关闭一个已关闭的任务", HttpStatus.ERROR);
+    }
+
     // CLOSE状态下
     // 1.standard字段使用task中归档的问卷
     // 2.不查询场景变更任务

quality-review/src/main/java/com/ruoyi/service/impl/StateSystemReviewTaskContext.java → quality-review/src/main/java/com/ruoyi/service/impl/StrategySystemReviewTaskContext.java

@@ -10,12 +10,12 @@ import java.util.concurrent.ConcurrentHashMap;
 
 @Transactional
 @Service
-public class StateSystemReviewTaskContext {
+public class StrategySystemReviewTaskContext {
 
     @Autowired
     private final Map<String, StrategySystemReviewTask> resourceMap = new ConcurrentHashMap<>();
 
-    public StateSystemReviewTaskContext(Map<String, StrategySystemReviewTask> strategyMap) {
+    public StrategySystemReviewTaskContext(Map<String, StrategySystemReviewTask> strategyMap) {
         this.resourceMap.clear();
         strategyMap.forEach(resourceMap::put);
     }

quality-review/src/main/java/com/ruoyi/service/impl/StrategySystemReviewTaskFinish.java

 package com.ruoyi.service.impl;
 
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.domain.SystemReviewTask;
 import com.ruoyi.service.StrategySystemReviewTask;
 import com.ruoyi.web.response.SystemReviewTaskViewResponse;
@@ -10,6 +12,21 @@ import org.springframework.transaction.annotation.Transactional;
 @Service(SystemReviewTask.STATUS_FINISH)
 public class StrategySystemReviewTaskFinish implements StrategySystemReviewTask {
 
+    @Override
+    public void doStart(SystemReviewTask systemReviewTask) {
+        throw new ServiceException("不能开始一个已完成的任务", HttpStatus.ERROR);
+    }
+
+    @Override
+    public void doSubmit(SystemReviewTask systemReviewTask) {
+        throw new ServiceException("不能提交一个已完成的任务", HttpStatus.ERROR);
+    }
+
+    @Override
+    public void doClose(SystemReviewTask systemReviewTask) {
+        throw new ServiceException("不能关闭一个已完成的任务", HttpStatus.ERROR);
+    }
+
     // FINISH状态下
     // 1.standard字段使用task中归档的问卷
     // 2.不查询场景变更任务

quality-review/src/main/java/com/ruoyi/service/impl/StrategySystemReviewTaskNew.java

 package com.ruoyi.service.impl;
 
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.domain.ReviewStandard;
 import com.ruoyi.domain.SystemReviewTask;
+import com.ruoyi.mapper.SystemReviewTaskMapper;
 import com.ruoyi.service.ReviewStandardService;
 import com.ruoyi.service.StrategySystemReviewTask;
 import com.ruoyi.web.response.SystemReviewTaskViewResponse;
@@ -9,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 
 @Transactional
@@ -18,6 +22,28 @@ public class StrategySystemReviewTaskNew implements StrategySystemReviewTask {
     @Autowired
     private ReviewStandardService reviewStandardService;
 
+    @Autowired
+    private SystemReviewTaskMapper systemReviewTaskMapper;
+
+    @Override
+    public void doStart(SystemReviewTask systemReviewTask) {
+        systemReviewTask.setTaskBeginTime(new Date());
+        systemReviewTask.setTaskStatus(SystemReviewTask.STATUS_PENDING);
+        systemReviewTaskMapper.updateById(systemReviewTask);
+    }
+
+    @Override
+    public void doSubmit(SystemReviewTask systemReviewTask) {
+        throw new ServiceException("不能提交一个尚未开始的任务", HttpStatus.ERROR);
+    }
+
+    @Override
+    public void doClose(SystemReviewTask systemReviewTask) {
+        systemReviewTask.setTaskEndTime(new Date());
+        systemReviewTask.setTaskStatus(SystemReviewTask.STATUS_CLOSE);
+        systemReviewTaskMapper.updateById(systemReviewTask);
+    }
+
     // NEW状态下
     // 1.standard字段查询当前最新问卷
     // 2.不查询场景变更任务

quality-review/src/main/java/com/ruoyi/service/impl/StrategySystemReviewTaskPending.java

 package com.ruoyi.service.impl;
 
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.domain.*;
-import com.ruoyi.service.ReviewDetailsResultService;
-import com.ruoyi.service.ReviewSceneChangeTaskService;
-import com.ruoyi.service.ReviewStandardService;
-import com.ruoyi.service.StrategySystemReviewTask;
+import com.ruoyi.mapper.SystemReviewTaskMapper;
+import com.ruoyi.service.*;
 import com.ruoyi.web.response.SystemReviewTaskViewResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -28,6 +29,32 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
     @Autowired
     private ReviewSceneChangeTaskService reviewSceneChangeTaskService;
 
+    @Autowired
+    private SystemReviewTaskMapper systemReviewTaskMapper;
+
+    @Override
+    public void doStart(SystemReviewTask systemReviewTask) {
+        throw new ServiceException("不能开始一个已经开始的任务", HttpStatus.ERROR);
+    }
+
+    @Override
+    public void doSubmit(SystemReviewTask systemReviewTask) {
+        // TODO
+        // 1. 获取最新问卷
+        // 2. 所有细则必须有对应答案
+        // 3. 答案的 id + text 必须与细则对应的答案一致
+        // 4. 将最终问卷归档到 standard 字段
+        // 5. 填充task_end_time
+        // 6. 修改任务状态为 FINISH
+    }
+
+    @Override
+    public void doClose(SystemReviewTask systemReviewTask) {
+        systemReviewTask.setTaskEndTime(new Date());
+        systemReviewTask.setTaskStatus(SystemReviewTask.STATUS_CLOSE);
+        systemReviewTaskMapper.updateById(systemReviewTask);
+    }
+
     // PENDING状态下
     // 1.standard字段查询当前最新问卷
     // 2.查询场景变更任务

quality-review/src/main/java/com/ruoyi/service/impl/SystemReviewTaskServiceImpl.java

@@ -10,14 +10,13 @@ import com.ruoyi.mapper.SystemReviewTaskMapper;
 import com.ruoyi.service.*;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.web.request.SystemReviewTaskCreateRequest;
+import com.ruoyi.web.request.SystemReviewTaskStartRequest;
 import com.ruoyi.web.response.SystemReviewTaskViewResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 /**
 * @author wangfei
@@ -35,13 +34,7 @@ public class SystemReviewTaskServiceImpl extends ServiceImpl<SystemReviewTaskMap
     private SystemReviewTaskService systemReviewTaskService;
 
     @Autowired
-    private ReviewStandardService reviewStandardService;
-
-    @Autowired
-    private ReviewDetailsResultService reviewDetailsResultService;
-
-    @Autowired
-    private StateSystemReviewTaskContext stateSystemReviewTaskContext;
+    private StrategySystemReviewTaskContext strategySystemReviewTaskContext;
 
     @Autowired
     private ISysUserService sysUserService;
@@ -88,7 +81,13 @@ public class SystemReviewTaskServiceImpl extends ServiceImpl<SystemReviewTaskMap
     @Override
     public SystemReviewTaskViewResponse view(Long taskId) {
         SystemReviewTask systemReviewTask = systemReviewTaskService.getById(taskId);
-        return stateSystemReviewTaskContext.getResource(systemReviewTask.getTaskStatus()).doView(systemReviewTask);
+        return strategySystemReviewTaskContext.getResource(systemReviewTask.getTaskStatus()).doView(systemReviewTask);
+    }
+
+    @Override
+    public void start(SystemReviewTaskStartRequest request) {
+        SystemReviewTask systemReviewTask = systemReviewTaskService.getById(request.getTaskId());
+        strategySystemReviewTaskContext.getResource(systemReviewTask.getTaskStatus()).doStart(systemReviewTask);
     }
 
 }

quality-review/src/main/java/com/ruoyi/web/SystemReviewTaskController.java

@@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.service.SystemReviewTaskService;
 import com.ruoyi.web.request.SystemReviewTaskCreateRequest;
+import com.ruoyi.web.request.SystemReviewTaskStartRequest;
 import com.ruoyi.web.request.SystemReviewTaskViewRequest;
 import com.ruoyi.web.response.SystemReviewTaskViewResponse;
 import org.apache.skywalking.apm.toolkit.trace.Tag;
@@ -42,4 +43,11 @@ public class SystemReviewTaskController extends BaseController {
         return AjaxResult.success(systemReviewTaskViewResponse);
     }
 
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
+    @RequestMapping(method = RequestMethod.POST, value = "/start")
+    public AjaxResult view(@Validated @RequestBody SystemReviewTaskStartRequest request) {
+        systemReviewTaskService.start(request);
+        return AjaxResult.success();
+    }
 }

quality-review/src/main/java/com/ruoyi/web/request/SystemReviewTaskStartRequest.java

+package com.ruoyi.web.request;
+
+import lombok.Data;
+
+@Data
+public class SystemReviewTaskStartRequest {
+
+    private Long taskId;
+
+}