印刷任务管理

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamDetailService.java

@@ -33,10 +33,6 @@ public interface ExamDetailService extends IService<ExamDetail> {
 
     IPage<ExamTaskDetailDto> listPrintTask(Long schoolId, String printPlanName, String status, String courseCode, String paperNumber, String examPlace, Long examStartTime, Long examEndTime, Integer pageNumber, Integer pageSize);
 
-    boolean submitTask(ExamPrintPlan examPrintPlan);
-
-    boolean taskCancel(ExamPrintPlan examPrintPlan);
-
     Map<String, Object> taskTotalData(String printPlanName, String status, String courseCode, String paperNumber, String examPlace, Long examStartTime, Long examEndTime);
 
     String taskViewPDF(Long id);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamPrintPlanService.java

@@ -66,4 +66,8 @@ public interface ExamPrintPlanService extends IService<ExamPrintPlan> {
      * @return 是否成功
      */
     Boolean removePrintPlan(DeleteParams deleteParams);
+
+    boolean submitTask(ExamPrintPlan examPrintPlan);
+
+    boolean taskCancel(ExamPrintPlan examPrintPlan);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamDetailServiceImpl.java

@@ -1,12 +1,14 @@
 package com.qmth.distributed.print.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.dto.ExamTaskDetailDto;
 import com.qmth.distributed.print.business.entity.ExamDetail;
 import com.qmth.distributed.print.business.entity.ExamPrintPlan;
+import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
 import com.qmth.distributed.print.business.mapper.ExamDetailMapper;
 import com.qmth.distributed.print.business.service.ExamDetailCourseService;
 import com.qmth.distributed.print.business.service.ExamDetailService;
@@ -57,16 +59,6 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
         return examTaskDetailDtoIPage;
     }
 
-    @Override
-    public boolean submitTask(ExamPrintPlan examPrintPlan) {
-        return false;
-    }
-
-    @Override
-    public boolean taskCancel(ExamPrintPlan examPrintPlan) {
-        return false;
-    }
-
     @Override
     public Map<String, Object> taskTotalData(String printPlanName, String status, String courseCode, String paperNumber, String examPlace, Long examStartTime, Long examEndTime) {
         return null;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamPrintPlanServiceImpl.java

@@ -2,6 +2,7 @@ package com.qmth.distributed.print.business.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -255,4 +256,18 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
         }
         return resultList;
     }
+
+    @Override
+    public boolean submitTask(ExamPrintPlan examPrintPlan) {
+        UpdateWrapper<ExamPrintPlan> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.lambda().set(ExamPrintPlan::getStatus, PrintPlanStatusEnum.PRINTING).eq(ExamPrintPlan::getId, examPrintPlan.getId());
+        return this.update(updateWrapper);
+    }
+
+    @Override
+    public boolean taskCancel(ExamPrintPlan examPrintPlan) {
+        UpdateWrapper<ExamPrintPlan> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.lambda().set(ExamPrintPlan::getStatus, PrintPlanStatusEnum.NEW).eq(ExamPrintPlan::getId, examPrintPlan.getId());
+        return this.update(updateWrapper);
+    }
 }

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamPrintPlanController.java

@@ -200,7 +200,7 @@ public class ExamPrintPlanController {
     @RequestMapping(value = "/task_submit", method = RequestMethod.POST)
     public Result taskSubmit(HttpServletRequest request,
                              @RequestBody ExamPrintPlan examPrintPlan) {
-        boolean isSuccess = examDetailService.submitTask(examPrintPlan);
+        boolean isSuccess = examPrintPlanService.submitTask(examPrintPlan);
         return ResultUtil.ok(isSuccess);
     }
 
@@ -213,7 +213,7 @@ public class ExamPrintPlanController {
     @RequestMapping(value = "/task_cancel", method = RequestMethod.POST)
     public Result taskCancel(HttpServletRequest request,
                              @RequestBody ExamPrintPlan examPrintPlan) {
-        boolean isSuccess = examDetailService.taskCancel(examPrintPlan);
+        boolean isSuccess = examPrintPlanService.taskCancel(examPrintPlan);
         return ResultUtil.ok(isSuccess);
     }
 

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskController.java

@@ -221,7 +221,7 @@ public class ExamTaskController {
      * @return
      */
     @ApiOperation(value = "入库申请查询")
-    @RequestMapping(value = "/task_apply_list", method = RequestMethod.POST)
+    @RequestMapping(value = "/apply_list", method = RequestMethod.POST)
     public Result taskApplyList(HttpServletRequest request,
                                 @RequestParam(value = "auditStatus", required = false) String auditStatus,
                                 @RequestParam(value = "reviewStatus", required = false) String reviewStatus,
@@ -244,7 +244,7 @@ public class ExamTaskController {
      * @return
      */
     @ApiOperation(value = "暂存/提交")
-    @RequestMapping(value = "/task_apply_save", method = RequestMethod.POST)
+    @RequestMapping(value = "/apply_save", method = RequestMethod.POST)
     public Result taskApplySave(@RequestBody ExamTaskDetail examTaskDetail) {
         boolean isSuccess = examTaskDetailService.saveExamTaskDetail(examTaskDetail);
         return ResultUtil.ok(isSuccess);
@@ -257,7 +257,7 @@ public class ExamTaskController {
      * @return
      */
     @ApiOperation(value = "撤回/重新申请")
-    @RequestMapping(value = "/task_apply_status", method = RequestMethod.POST)
+    @RequestMapping(value = "/apply_status", method = RequestMethod.POST)
     public Result taskApplyStatus(@RequestBody ExamTask examTask) {
         boolean isSuccess = examTaskDetailService.status(examTask);
         return ResultUtil.ok(isSuccess);
@@ -278,7 +278,7 @@ public class ExamTaskController {
      * @return
      */
     @ApiOperation(value = "入库审核查询-未审核")
-    @RequestMapping(value = "/task_review_list_unaudited", method = RequestMethod.POST)
+    @RequestMapping(value = "/review_list_unaudited", method = RequestMethod.POST)
     public Result taskReviewListUnaudited(HttpServletRequest request,
                                           @RequestParam(value = "courseCode", required = false) String courseCode,
                                           @RequestParam(value = "paperNumber", required = false) String paperNumber,
@@ -308,7 +308,7 @@ public class ExamTaskController {
      * @return
      */
     @ApiOperation(value = "入库审核查询-已审核")
-    @RequestMapping(value = "/task_review_list_audited", method = RequestMethod.POST)
+    @RequestMapping(value = "/review_list_audited", method = RequestMethod.POST)
     public Result taskReviewListAudited(HttpServletRequest request,
                                         @RequestParam(value = "reviewStatus", required = false) String reviewStatus,
                                         @RequestParam(value = "courseCode", required = false) String courseCode,
@@ -332,7 +332,7 @@ public class ExamTaskController {
      * @return
      */
     @ApiOperation(value = "审核")
-    @RequestMapping(value = "/task_review_save", method = RequestMethod.POST)
+    @RequestMapping(value = "/review_save", method = RequestMethod.POST)
     public Result taskReviewSave(HttpServletRequest request,
                                  @RequestBody ExamTaskReviewLog taskReviewLog) {
         ApiUser apiUser = RequestUtils.getApiUser(request);
@@ -350,7 +350,7 @@ public class ExamTaskController {
      * @return
      */
     @ApiOperation(value = "批量审核")
-    @RequestMapping(value = "/task_review_save_batch", method = RequestMethod.POST)
+    @RequestMapping(value = "/review_save_batch", method = RequestMethod.POST)
     public Result taskReviewSaveBatch(HttpServletRequest request,
                                       @RequestBody ExamTaskReviewLog taskReviewLog) {
         ApiUser apiUser = RequestUtils.getApiUser(request);
@@ -361,7 +361,7 @@ public class ExamTaskController {
     }
 
     @ApiOperation(value = "导出审核样本")
-    @RequestMapping(value = "/task_review_export", method = RequestMethod.POST)
+    @RequestMapping(value = "/review_export", method = RequestMethod.POST)
     public Result taskReviewExport(HttpServletRequest request,
                                    @RequestBody ExamTaskReviewLog taskReviewLog) {
 //        boolean isSuccess = examTaskService.taskReviewSaveBatch(taskReviewLog);
@@ -381,7 +381,7 @@ public class ExamTaskController {
      * @return
      */
     @ApiOperation(value = "卷库查询")
-    @RequestMapping(value = "/task_paper_list", method = RequestMethod.POST)
+    @RequestMapping(value = "/paper_list", method = RequestMethod.POST)
     public Result taskPaperList(HttpServletRequest request,
                                 @RequestParam(value = "courseCode", required = false) String courseCode,
                                 @RequestParam(value = "paperNumber", required = false) String paperNumber,
@@ -395,14 +395,14 @@ public class ExamTaskController {
     }
 
     @ApiOperation(value = "预览")
-    @RequestMapping(value = "/task_paper_preview", method = RequestMethod.POST)
+    @RequestMapping(value = "/paper_preview", method = RequestMethod.POST)
     public Result taskPaperPreview(HttpServletRequest request) {
         // todo 预览
         return ResultUtil.ok(true);
     }
 
     @ApiOperation(value = "下载")
-    @RequestMapping(value = "/task_paper_download", method = RequestMethod.POST)
+    @RequestMapping(value = "/paper_download", method = RequestMethod.POST)
     public Result taskPaperDownload(HttpServletRequest request) {
         // todo 预览
         return ResultUtil.ok(true);
@@ -415,7 +415,7 @@ public class ExamTaskController {
      * @return
      */
     @ApiOperation(value = "启用/禁用")
-    @RequestMapping(value = "/task_paper_enable", method = RequestMethod.POST)
+    @RequestMapping(value = "/paper_enable", method = RequestMethod.POST)
     public Result taskPaperEnable(HttpServletRequest request, @RequestBody ExamTaskDetail examTaskDetail) {
         boolean isSuccess = examTaskDetailService.enable(examTaskDetail);
         return ResultUtil.ok(isSuccess);