3.3.1 update

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

@@ -164,7 +164,7 @@ public interface ExamDetailService extends IService<ExamDetail> {
 
     boolean taskBatchCancel(Map data);
 
-    boolean resubmitTask(ExamDetail examDetail) throws IOException;
+//    boolean resubmitTask(ExamDetail examDetail) throws IOException;
 
     /**
      * 根据考务数据Excel数据处理考务-场次表

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

@@ -151,19 +151,6 @@ public interface PrintCommonService {
      */
     boolean sysOrgRemove(Long id);
 
-    /**
-     * 更新任务状态
-     */
-    @Async
-    void updateStatus() throws IOException;
-
-    /**
-     * 重新生成pdf失败任务
-     *
-     * @throws IOException
-     */
-    void resetCreatePdfTask() throws IOException;
-
     /**
      * 保存任务
      *

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

@@ -27,7 +27,7 @@ public interface TBTaskPdfService extends IService<TBTaskPdf> {
 
     boolean updateStatusById(TaskStatusEnum status, TaskResultEnum result, String summary, Long id);
 
-    TBTaskPdf saveTask(TbTaskDetailResult tbTaskDetailResult, TaskTypeEnum createPdf, Long printPlanId, SysUser user, Long id);
+    TBTaskPdf saveTask(TbTaskDetailResult tbTaskDetailResult, Long printPlanId, SysUser user, Long id);
 
     void resetRunningCreatePdf(Long id, CreatePdfTypeEnum type);
 

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

@@ -606,21 +606,21 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
         return true;
     }
 
-    @Override
-    public boolean resubmitTask(ExamDetail examDetail) {
-        ExamDetail detail = this.getById(examDetail.getId());
-        if (!detail.getStatus().name().equals(ExamDetailStatusEnum.PRINTING.name())
-                && !detail.getStatus().name().equals(ExamDetailStatusEnum.FINISH.name())) {
-            throw ExceptionResultEnum.ERROR.exception("印刷状态为“印刷中”、“已完成”的任务可重新提交印刷");
-        }
-        TbTaskDetailResult tbTaskDetailResult = examDetailCourseService.getByExamDetailId(detail.getId());
-        // 调用生成pdf方法
-        Map<String, Object> map = tbTaskService.saveTask(tbTaskDetailResult, TaskTypeEnum.CREATE_PDF, detail.getPrintPlanId(), (SysUser) ServletUtil.getRequestUser(), detail.getId());
-//        asyncCreatePdfTempleteService.createPdf(map, null);
-        MqDto mqDto = new MqDto(MqTagEnum.PDF.getCode(), map, String.valueOf(map.get(SystemConstant.TB_TASK_ID)));
-        redisUtil.sendMessage(mqDto.getTopic(), mqDto);
-        return true;
-    }
+//    @Override
+//    public boolean resubmitTask(ExamDetail examDetail) {
+//        ExamDetail detail = this.getById(examDetail.getId());
+//        if (!detail.getStatus().name().equals(ExamDetailStatusEnum.PRINTING.name())
+//                && !detail.getStatus().name().equals(ExamDetailStatusEnum.FINISH.name())) {
+//            throw ExceptionResultEnum.ERROR.exception("印刷状态为“印刷中”、“已完成”的任务可重新提交印刷");
+//        }
+//        TbTaskDetailResult tbTaskDetailResult = examDetailCourseService.getByExamDetailId(detail.getId());
+//        // 调用生成pdf方法
+//        Map<String, Object> map = tbTaskService.saveTask(tbTaskDetailResult, TaskTypeEnum.CREATE_PDF, detail.getPrintPlanId(), (SysUser) ServletUtil.getRequestUser(), detail.getId());
+////        asyncCreatePdfTempleteService.createPdf(map, null);
+//        MqDto mqDto = new MqDto(MqTagEnum.PDF.getCode(), map, String.valueOf(map.get(SystemConstant.TB_TASK_ID)));
+//        redisUtil.sendMessage(mqDto.getTopic(), mqDto);
+//        return true;
+//    }
 
     @Transactional(rollbackFor = Exception.class)
     @Override

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

@@ -53,40 +53,24 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
 
     @Resource
     private ExamPrintPlanMapper examPrintPlanMapper;
-
     @Resource
     private ExamDetailService examDetailService;
-
     @Resource
     private SysOrgService sysOrgService;
-
     @Resource
     private BasicSchoolService basicSchoolService;
-
-    @Resource
-    private BasicSemesterService basicSemesterService;
-
     @Resource
     private BasicAttachmentService basicAttachmentService;
-
     @Resource
     private BasicExamRuleService basicExamRuleService;
-
     @Resource
-    private TBTaskService tbTaskService;
-
+    private TBTaskPdfService tbTaskPdfService;
     @Resource
-    private ClientPrintDataService clientPrintDataService;
-
+    private TeachcloudCommonService teachcloudCommonService;
     @Resource
-    TeachcloudCommonService teachcloudCommonService;
-
+    private ExamDetailCourseService examDetailCourseService;
     @Resource
-    ExamDetailCourseService examDetailCourseService;
-
-    @Resource
-    BasicTemplateService basicTemplateService;
-
+    private BasicTemplateService basicTemplateService;
     @Resource
     private BasicRoleDataPermissionService basicRoleDataPermissionService;
 
@@ -279,7 +263,7 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
         if (!PrintPlanStatusEnum.NEW.equals(examPrintPlan.getStatus())) {
             throw ExceptionResultEnum.ERROR.exception("只有'新建'状态的项目计划可以被删除");
         }
-        if (!tbTaskService.countByPrintPlanIdAndEntityId(examPrintPlan.getSchoolId(), id, null)) {
+        if (!tbTaskPdfService.countByPrintPlanIdAndEntityId(examPrintPlan.getSchoolId(), id)) {
             throw ExceptionResultEnum.ERROR.exception("要删除的印刷计划正在生成pdf中，无法删除");
         }
         examDetailService.deleteExaminationData(id, null);

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

@@ -14,8 +14,6 @@ import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.distributed.print.business.bean.dto.approvalForm.*;
 import com.qmth.distributed.print.business.bean.dto.examObject.ExamObjectDto;
 import com.qmth.distributed.print.business.bean.dto.excel.ExamStudentImportDto;
-import com.qmth.distributed.print.business.bean.examRule.CodeNameEnableValue;
-import com.qmth.distributed.print.business.bean.examRule.FieldsDto;
 import com.qmth.distributed.print.business.bean.params.*;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
 import com.qmth.distributed.print.business.bean.result.examTaskStudent.ExamTaskExamStudentImportResult;
@@ -697,7 +695,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
     @Transactional
     @Override
-    public boolean taskReviewSave(ExamTaskReviewLog taskReviewLog) throws IOException {
+    public boolean taskReviewSave(ExamTaskReviewLog taskReviewLog) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
 
         // 校验状态，可能被撤回
@@ -1028,7 +1026,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
         for (ExamDetail examDetail : examDetailList) {
             TbTaskDetailResult tbTaskDetailResult = examDetailCourseService.getByExamDetailId(examDetail.getId());
-            tbTaskPdfService.saveTask(tbTaskDetailResult, TaskTypeEnum.CREATE_PDF, examDetail.getPrintPlanId(), user, examDetail.getId());
+            tbTaskPdfService.saveTask(tbTaskDetailResult, examDetail.getPrintPlanId(), user, examDetail.getId());
         }
     }
 

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

@@ -2,7 +2,6 @@ package com.qmth.distributed.print.business.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -24,8 +23,6 @@ import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.util.CreatePrintPdfUtil;
 import com.qmth.distributed.print.business.util.PdfUtil;
 import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
-import com.qmth.teachcloud.common.bean.dto.MqDto;
-import com.qmth.teachcloud.common.bean.params.ArraysParams;
 import com.qmth.teachcloud.common.bean.result.TbTaskDetailResult;
 import com.qmth.teachcloud.common.bean.vo.FilePathVo;
 import com.qmth.teachcloud.common.bean.vo.PrintPathVo;
@@ -1033,80 +1030,6 @@ public class PrintCommonServiceImpl implements PrintCommonService {
         }
     }
 
-    /**
-     * 更新任务状态
-     */
-    @Override
-    @Transactional
-    public void updateStatus() throws IOException {
-        //不是自动生成pdf的全部改为失败
-//        UpdateWrapper<TBTask> tbTaskUpdateWrapper = new UpdateWrapper<>();
-//        tbTaskUpdateWrapper.lambda().set(TBTask::getStatus, TaskStatusEnum.FINISH)
-//                .set(TBTask::getSummary, "系统提交:网络异常或程序异常中断!")
-//                .set(TBTask::getResult, TaskResultEnum.ERROR)
-//                .isNotNull(TBTask::getStatus).ne(TBTask::getStatus, TaskStatusEnum.FINISH)
-//                .ne(TBTask::getType, TaskTypeEnum.CREATE_PDF);
-//        this.update(tbTaskUpdateWrapper);
-
-        QueryWrapper<TBTask> tbTaskQueryWrapper = new QueryWrapper<>();
-        tbTaskQueryWrapper.lambda().eq(TBTask::getType, TaskTypeEnum.CREATE_PDF)
-                .ne(TBTask::getStatus, TaskStatusEnum.FINISH)
-                .ne(TBTask::getResult, TaskResultEnum.SUCCESS).or().isNull(TBTask::getResult)
-                .orderByDesc(TBTask::getStatus);
-        List<TBTask> tbTasks = tbTaskService.list(tbTaskQueryWrapper);
-        if (Objects.nonNull(tbTasks) && tbTasks.size() > 0) {
-            for (TBTask tbTask : tbTasks) {
-                Map<String, Object> map = new HashMap<>();
-                if (Objects.nonNull(tbTask.getRemark())) {
-                    JSONArray jsonArray = JSONArray.parseArray(tbTask.getRemark());
-                    ArraysParams arraysParams = new ArraysParams(jsonArray.toArray(new Long[jsonArray.size()]));
-                    map.computeIfAbsent("examDetailCourseIds", v -> Arrays.asList(arraysParams.getIds()));
-                }
-                map.computeIfAbsent(SystemConstant.TASK, v -> tbTask);
-                map.computeIfAbsent(SystemConstant.USER, v -> sysUserService.getById(tbTask.getCreateId()));
-//                asyncCreatePdfTempleteService.createPdf(map, null);
-                MqDto mqDto = new MqDto(MqTagEnum.PDF.getCode(), map, String.valueOf(tbTask.getId()));
-                redisUtil.sendMessage(mqDto.getTopic(), mqDto);
-            }
-        }
-    }
-
-    /**
-     * 重新生成pdf失败任务
-     *
-     * @throws IOException
-     */
-    @Override
-    @Transactional
-    public void resetCreatePdfTask() throws IOException {
-        QueryWrapper<TBTask> tbTaskQueryWrapper = new QueryWrapper<>();
-        tbTaskQueryWrapper.lambda().eq(TBTask::getType, TaskTypeEnum.CREATE_PDF)
-                .eq(TBTask::getStatus, TaskStatusEnum.FINISH).isNotNull(TBTask::getStatus)
-                .eq(TBTask::getResult, TaskResultEnum.ERROR).last("limit 0,100");
-        List<TBTask> tbTasks = tbTaskService.list(tbTaskQueryWrapper);
-        if (Objects.nonNull(tbTasks) && tbTasks.size() > 0) {
-            for (TBTask tbTask : tbTasks) {
-                SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.AUTO_CREATE_PDF_RESET_MAX_COUNT);
-                Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置自动重试生成pdf失败最大次数"));
-                Integer maxResetCount = Integer.parseInt(sysConfig.getConfigValue());
-                if (tbTask.getResetCount() < maxResetCount.intValue()) {
-                    Map<String, Object> map = new HashMap<>();
-//                    tbTask.setVersion(new AtomicInteger(tbTask.getVersion()).incrementAndGet());
-                    if (Objects.nonNull(tbTask.getRemark())) {
-                        JSONArray jsonArray = JSONArray.parseArray(tbTask.getRemark());
-                        ArraysParams arraysParams = new ArraysParams(jsonArray.toArray(new Long[jsonArray.size()]));
-                        map.computeIfAbsent("examDetailCourseIds", v -> Arrays.asList(arraysParams.getIds()));
-                    }
-                    map.computeIfAbsent(SystemConstant.TASK, v -> tbTask);
-                    map.computeIfAbsent(SystemConstant.USER, v -> sysUserService.getById(tbTask.getCreateId()));
-//                    asyncCreatePdfTempleteService.createPdf(map, null);
-                    MqDto mqDto = new MqDto(MqTagEnum.PDF.getCode(), map, String.valueOf(tbTask.getId()));
-                    redisUtil.sendMessage(mqDto.getTopic(), mqDto);
-                }
-            }
-        }
-    }
-
     /**
      * 保存任务
      *
@@ -1347,7 +1270,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
                         // 所有考场都撤回，印刷任务状态改为就绪
                         examPrintPlanService.updateStatusById(examDetail.getPrintPlanId(), PrintPlanStatusEnum.READY);
                         TbTaskDetailResult tbTaskDetailResult = examDetailCourseService.getByExamDetailId(examDetail.getId());
-                        tbTaskPdfService.saveTask(tbTaskDetailResult, TaskTypeEnum.CREATE_PDF, examDetail.getPrintPlanId(), user, examDetail.getId());
+                        tbTaskPdfService.saveTask(tbTaskDetailResult, examDetail.getPrintPlanId(), user, examDetail.getId());
                     }
                 }
             } else {
@@ -1361,7 +1284,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
                         // 所有考场都撤回，印刷任务状态改为就绪
                         examPrintPlanService.updateStatusById(examDetail.getPrintPlanId(), PrintPlanStatusEnum.READY);
                         TbTaskDetailResult tbTaskDetailResult = examDetailCourseService.getByExamDetailId(examDetail.getId());
-                        tbTaskPdfService.saveTask(tbTaskDetailResult, TaskTypeEnum.CREATE_PDF, examDetail.getPrintPlanId(), user, examDetail.getId());
+                        tbTaskPdfService.saveTask(tbTaskDetailResult, examDetail.getPrintPlanId(), user, examDetail.getId());
                     }
                 }
             }
@@ -1410,7 +1333,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
             examPrintPlanService.updateStatusById(examDetail.getPrintPlanId(), PrintPlanStatusEnum.READY);
             //创建pdf生成任务
             TbTaskDetailResult tbTaskDetailResult = examDetailCourseService.getByExamDetailId(examDetail.getId());
-            tbTaskPdfService.saveTask(tbTaskDetailResult, TaskTypeEnum.CREATE_PDF, examDetail.getPrintPlanId(), user, examDetail.getId());
+            tbTaskPdfService.saveTask(tbTaskDetailResult, examDetail.getPrintPlanId(), user, examDetail.getId());
         }
     }
 

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

@@ -53,7 +53,7 @@ public class TBTaskPdfServiceImpl extends ServiceImpl<TBTaskPdfMapper, TBTaskPdf
     }
 
     @Override
-    public TBTaskPdf saveTask(TbTaskDetailResult tbTaskDetailResult, TaskTypeEnum createPdf, Long printPlanId, SysUser user, Long examDetailId) {
+    public TBTaskPdf saveTask(TbTaskDetailResult tbTaskDetailResult, Long printPlanId, SysUser user, Long examDetailId) {
         try {
             TBTaskPdf tbTaskPdf = this.getById(examDetailId);
             if (tbTaskPdf == null) {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncBasicClazzImportService.java

@@ -1,72 +0,0 @@
-package com.qmth.distributed.print.business.templete.execute;
-
-import cn.hutool.core.date.DateUtil;
-import com.qmth.boot.api.exception.ApiException;
-import com.qmth.distributed.print.business.templete.importData.AsyncImportTaskTemplete;
-import com.qmth.distributed.print.business.templete.service.TaskLogicService;
-import com.qmth.teachcloud.common.contant.SpringContextHolder;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.TBTask;
-import com.qmth.teachcloud.common.enums.TaskResultEnum;
-import com.qmth.teachcloud.common.enums.TaskStatusEnum;
-import com.qmth.teachcloud.common.service.TBTaskService;
-import com.qmth.teachcloud.common.util.Result;
-import com.qmth.teachcloud.common.util.ResultUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.MessageFormat;
-import java.util.Date;
-import java.util.Map;
-import java.util.StringJoiner;
-
-/**
- * @Description: 异步-班级基础信息导入
- * @Author: CaoZixuan
- * @Date: 2021-08-28
- */
-@Service
-public class AsyncBasicClazzImportService extends AsyncImportTaskTemplete {
-
-    private final static Logger log = LoggerFactory.getLogger(AsyncStudentDataImportService.class);
-
-    public static final String OBJ_TITLE = "班级基础数据";
-    @Override
-    public Result importTask(Map<String, Object> map) throws IOException, Exception {
-        TBTask tbTask = (TBTask) map.get(SystemConstant.TASK);
-        InputStream inputStream = super.getUploadFileInputStream(tbTask);
-        map.put("inputStream",inputStream);
-
-        StringJoiner stringJoinerSummary = new StringJoiner("\n")
-                .add(MessageFormat.format("{0}{1}{2}", DateUtil.format(new Date(), SystemConstant.DEFAULT_DATE_PATTERN), BEGIN_TITLE, OBJ_TITLE));
-        tbTask.setStatus(TaskStatusEnum.RUNNING);
-        TBTaskService tbTaskService = SpringContextHolder.getBean(TBTaskService.class);
-        tbTaskService.updateById(tbTask);
-        try {
-            TaskLogicService taskLogicService = SpringContextHolder.getBean(TaskLogicService.class);
-
-            // 执行导入基础学生数据
-            Map<String, Object> result = taskLogicService.executeImportBasicClazzLogic(map);
-
-
-            stringJoinerSummary.add(MessageFormat.format("{0}{1}{2}{3}", DateUtil.format(new Date(), SystemConstant.DEFAULT_DATE_PATTERN), FINISH_TITLE, Long.valueOf(String.valueOf(result.get("dataCount"))), FINISH_ERROR_SIZE));
-            tbTask.setResult(TaskResultEnum.SUCCESS);
-        }catch (Exception e){
-            log.error(SystemConstant.LOG_ERROR, e);
-            stringJoinerSummary.add(MessageFormat.format("{0}{1}{2}{3}", DateUtil.format(new Date(), SystemConstant.DEFAULT_DATE_PATTERN), EXCEPTION_TITLE, EXCEPTION_DATA, e.getMessage()));
-            tbTask.setResult(TaskResultEnum.ERROR);
-            if (e instanceof ApiException) {
-                ResultUtil.error((ApiException) e, ((ApiException) e).getCode(), e.getMessage());
-            } else {
-                ResultUtil.error(e.getMessage());
-            }
-        } finally {//生成txt文件
-            tbTask.setSummary(stringJoinerSummary.toString());
-            super.createTxt(tbTask);
-        }
-        return ResultUtil.ok(map);
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncCreatePdfTempleteService.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncCreatePdfTemplateService.java

@@ -1,23 +1,17 @@
 package com.qmth.distributed.print.business.templete.execute;
 
 import cn.hutool.core.date.DateUtil;
-import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.entity.TBTaskPdf;
 import com.qmth.distributed.print.business.service.TBTaskPdfService;
 import com.qmth.distributed.print.business.templete.callback.CallbackCreatePdf;
 import com.qmth.distributed.print.business.templete.create.AsyncCreateTaskTemplete;
 import com.qmth.distributed.print.business.templete.service.PdfTaskLogicService;
-import com.qmth.distributed.print.business.templete.service.TaskLogicService;
 import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.TBTask;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.TaskResultEnum;
 import com.qmth.teachcloud.common.enums.TaskStatusEnum;
-import com.qmth.teachcloud.common.service.TBTaskService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
-import org.bouncycastle.crypto.paddings.TBCPadding;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -34,8 +28,8 @@ import java.util.*;
  * @Date: 2021/4/9
  */
 @Service
-public class AsyncCreatePdfTempleteService extends AsyncCreateTaskTemplete {
-    private final static Logger log = LoggerFactory.getLogger(AsyncCreatePdfTempleteService.class);
+public class AsyncCreatePdfTemplateService extends AsyncCreateTaskTemplete {
+    private final static Logger log = LoggerFactory.getLogger(AsyncCreatePdfTemplateService.class);
 
     static final String OBJ_TITLE = "pdf数据";
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncDownloadPaperFileBatchService.java

@@ -65,7 +65,8 @@ public class AsyncDownloadPaperFileBatchService extends AsyncExportTaskTemplete
             }
         } finally {
             tbTask.setSummary(stringJoinerSummary.toString());
-            super.createTxt(tbTask);
+            tbTask.setStatus(TaskStatusEnum.FINISH);
+            tbTaskService.updateById(tbTask);
         }
         return ResultUtil.ok();
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncDownloadPdfTempleteService.java

@@ -19,7 +19,6 @@ import org.springframework.stereotype.Service;
 import java.text.MessageFormat;
 import java.util.Date;
 import java.util.Map;
-import java.util.Objects;
 import java.util.StringJoiner;
 
 /**
@@ -31,7 +30,7 @@ import java.util.StringJoiner;
  */
 @Service
 public class AsyncDownloadPdfTempleteService extends AsyncExportTaskTemplete {
-    private final static Logger log = LoggerFactory.getLogger(AsyncCreatePdfTempleteService.class);
+    private final static Logger log = LoggerFactory.getLogger(AsyncCreatePdfTemplateService.class);
 
     static final String OBJ_TITLE = "zip数据";
 
@@ -65,7 +64,8 @@ public class AsyncDownloadPdfTempleteService extends AsyncExportTaskTemplete {
             }
         } finally {//生成txt文件
             tbTask.setSummary(stringJoinerSummary.toString());
-            super.createTxt(tbTask);
+            tbTask.setStatus(TaskStatusEnum.FINISH);
+            tbTaskService.updateById(tbTask);
         }
         return ResultUtil.ok(map);
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncExaminationExportTemplateService.java

@@ -63,7 +63,8 @@ public class AsyncExaminationExportTemplateService extends AsyncExportTaskTemple
             }
         } finally {//生成txt文件
             tbTask.setSummary(stringJoinerSummary.toString());
-            super.createTxt(tbTask);
+            tbTask.setStatus(TaskStatusEnum.FINISH);
+            tbTaskService.updateById(tbTask);
         }
         return ResultUtil.ok();
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncExaminationImportTemplateService.java

@@ -126,10 +126,9 @@ public class AsyncExaminationImportTemplateService extends AsyncImportTaskTemple
 
         } finally {//生成txt文件
             tbTask.setSummary(stringJoinerSummary.toString());
-            super.createTxt(tbTask);
+            tbTask.setStatus(TaskStatusEnum.FINISH);
+            tbTaskService.updateById(tbTask);
 
-            // 当前任务结束后，其它任务开始
-//            examDetailService.startInitTask(tbTask.getSchoolId());
         }
         return ResultUtil.ok(map);
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncPaperReviewPdfExportService.java

@@ -60,7 +60,8 @@ public class AsyncPaperReviewPdfExportService extends AsyncExportTaskTemplete {
             }
         } finally {//生成txt文件
             tbTask.setSummary(stringJoinerSummary.toString());
-            super.createTxt(tbTask);
+            tbTask.setStatus(TaskStatusEnum.FINISH);
+            tbTaskService.updateById(tbTask);
         }
         return ResultUtil.ok();
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncScoreBatchDownloadService.java

@@ -60,7 +60,8 @@ public class AsyncScoreBatchDownloadService extends AsyncExportTaskTemplete {
             }
         } finally {//生成txt文件
             tbTask.setSummary(stringJoinerSummary.toString());
-            super.createTxt(tbTask);
+            tbTask.setStatus(TaskStatusEnum.FINISH);
+            tbTaskService.updateById(tbTask);
         }
         return ResultUtil.ok();
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncScoreExportService.java

@@ -58,7 +58,8 @@ public class AsyncScoreExportService extends AsyncExportTaskTemplete {
             }
         } finally {//生成txt文件
             tbTask.setSummary(stringJoinerSummary.toString());
-            super.createTxt(tbTask);
+            tbTask.setStatus(TaskStatusEnum.FINISH);
+            tbTaskService.updateById(tbTask);
         }
         return ResultUtil.ok();
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncStatisticsDataImportService.java

@@ -63,7 +63,8 @@ public class AsyncStatisticsDataImportService extends AsyncImportTaskTemplete {
             }
         } finally {//生成txt文件
             tbTask.setSummary(stringJoinerSummary.toString());
-            super.createTxt(tbTask);
+            tbTask.setStatus(TaskStatusEnum.FINISH);
+            tbTaskService.updateById(tbTask);
         }
         return ResultUtil.ok(map);
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncStudentDataImportService.java

@@ -76,7 +76,8 @@ public class AsyncStudentDataImportService extends AsyncImportTaskTemplete {
             }
         } finally {//生成txt文件
             tbTask.setSummary(stringJoinerSummary.toString());
-            super.createTxt(tbTask);
+            tbTask.setStatus(TaskStatusEnum.FINISH);
+            tbTaskService.updateById(tbTask);
         }
         return ResultUtil.ok(map);
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncSysUserDataImportService.java

@@ -75,7 +75,8 @@ public class AsyncSysUserDataImportService extends AsyncImportTaskTemplete {
             }
         } finally {//生成txt文件
             tbTask.setSummary(stringJoinerSummary.toString());
-            super.createTxt(tbTask);
+            tbTask.setStatus(TaskStatusEnum.FINISH);
+            tbTaskService.updateById(tbTask);
         }
         return ResultUtil.ok(map);
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/importData/AsyncImportTaskTemplete.java

@@ -105,12 +105,6 @@ public abstract class AsyncImportTaskTemplete {
         } finally {
             TBTaskService tbTaskService = SpringContextHolder.getBean(TBTaskService.class);
             tbTask.setStatus(TaskStatusEnum.FINISH);
-            if (tbTask.getType() == TaskTypeEnum.CREATE_PDF) {
-                tbTask.setResultFilePath(tbTask.getImportFilePath());
-                tbTask.setImportFileName(null);
-                tbTask.setImportFilePath(null);
-                tbTask.setErrorMessage(null);
-            }
             tbTaskService.updateById(tbTask);
         }
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/importData/SyncImportTaskTemplate.java

@@ -109,12 +109,6 @@ public abstract class SyncImportTaskTemplate {
         } finally {
             TBTaskService tbTaskService = SpringContextHolder.getBean(TBTaskService.class);
             tbTask.setStatus(TaskStatusEnum.FINISH);
-            if (tbTask.getType() == TaskTypeEnum.CREATE_PDF) {
-                tbTask.setResultFilePath(tbTask.getImportFilePath());
-                tbTask.setImportFileName(null);
-                tbTask.setImportFilePath(null);
-                tbTask.setErrorMessage(null);
-            }
             tbTaskService.updateById(tbTask);
         }
     }

distributed-print/install/mysql/upgrade/3.3.1.sql

@@ -696,4 +696,6 @@ INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
 VALUES(2033, '同步试卷蓝图结构', '/api/admin/course/degree/final_score/paper_struct_dimension/sync', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
 -- 2024/03/28
-DELETE FROM t_b_task where type in ('STUDENT_IMPORT', 'CLAZZ_IMPORT', 'CREATE_PDF');
+DELETE FROM t_b_task where type in ('STUDENT_IMPORT', 'CLAZZ_IMPORT', 'CREATE_PDF');
+UPDATE `sys_privilege` SET `enable` = '0', `default_auth` = '0', `front_display` = '0' WHERE (`id` = '163');
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '289');

distributed-print/install/nginx/teachcloud-utf8.conf

@@ -1,28 +0,0 @@
-server {
-        listen 7400;
-        access_log off;
-        charset utf-8;
- 
-        location ^~ / {
-                root  ../../teachcloud/web/print/;
-                try_files $uri $uri/ /index.html;
-		}
-
-        location /static/ {
-                alias ../../teachcloud/static/;
-                add_header Access-Control-Allow-Origin *;
-        }
-
-        location /mark/ {
-                alias  ../../teachcloud/web/mark/;
-                index  index.html index.htm;
-                try_files $uri $uri/ /mark/index.html;
-        }
-		
-        location ^~ /api/ {
-                proxy_pass http://127.0.0.1:7410;
-                proxy_set_header Host   $http_host;
-                proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
-}

distributed-print/install/nginx/teachcloud.conf

@@ -2,6 +2,7 @@ server {
         listen 7400;
         access_log off;
         charset utf-8;
+        client_max_body_size 512m;
  
         location ^~ / {
                 root  ../../teachcloud/web/print/;

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

@@ -67,20 +67,6 @@ public class BasicClazzController {
         return ResultUtil.ok(basicClazzService.removeBasicClazzBatch(idList.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList())));
     }
 
-//    @ApiOperation(value = "班级基本信息管理-批量导入（异步）")
-//    @RequestMapping(value = "/data_import", method = RequestMethod.POST)
-//    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
-//    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
-//    public Result basicClazzImportAsync(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file) throws Exception {
-//        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-//        Map<String, Object> map = printCommonService.saveTask(file, TaskTypeEnum.CLAZZ_IMPORT);
-//        map.put(SystemConstant.SYS_USER, sysUser);
-//
-//        asyncBasicClazzImportService.importTask(map);
-//        TBTask tbTask = Objects.nonNull(map.get(SystemConstant.TASK)) ? (TBTask) map.get(SystemConstant.TASK) : null;
-//        return Objects.nonNull(tbTask) ? ResultUtil.ok(tbTask.getId()) : ResultUtil.error("创建任务失败");
-//    }
-
     @ApiOperation(value = "班级数据源查询")
     @RequestMapping(value = "/datasource", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})

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

@@ -108,14 +108,15 @@ public class BasicStudentController {
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
     public Result basicStudentImportAysnc(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file) throws Exception {
 //        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        Map<String, Object> map = printCommonService.saveTask(file, TaskTypeEnum.STUDENT_IMPORT);
+//        Map<String, Object> map = printCommonService.saveTask(file, TaskTypeEnum.STUDENT_IMPORT);
 //        map.put(SystemConstant.SYS_USER, sysUser);
 //
 //        asyncStudentDataImportService.importTask(map);
 //        TBTask tbTask = Objects.nonNull(map.get(SystemConstant.TASK)) ? (TBTask) map.get(SystemConstant.TASK) : null;
 //        return Objects.nonNull(tbTask) ? ResultUtil.ok(tbTask.getId()) : ResultUtil.error("创建任务失败");
-        boolean success = basicStudentService.importBasicStudent(map, file);
-        return ResultUtil.ok(success, "");
+//        boolean success = basicStudentService.importBasicStudent(map, file);
+//        return ResultUtil.ok(success, "");
+        return null;
     }
 
     @ApiOperation(value = "学生管理-导出")

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

@@ -5,12 +5,10 @@ import com.qmth.distributed.print.business.bean.params.DownloadPaperFileParam;
 import com.qmth.distributed.print.business.service.DownloadService;
 import com.qmth.distributed.print.business.service.PrintCommonService;
 import com.qmth.distributed.print.business.templete.execute.AsyncDownloadPaperFileBatchService;
-import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.bean.result.TaskListResult;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.TBTask;
 import com.qmth.teachcloud.common.enums.TaskTypeEnum;
-import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.*;
 import org.springframework.validation.BindingResult;

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

@@ -174,19 +174,19 @@ public class ExamPrintTaskController {
     }
 
 
-    /**
-     * 重新提交
-     *
-     * @param examDetail
-     * @return
-     */
-    @ApiOperation(value = "印刷任务管理-重新提交")
-    @RequestMapping(value = "/task_resubmit", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
-    public Result taskResubmit(@RequestBody ExamDetail examDetail) throws IOException {
-        boolean isSuccess = examDetailService.resubmitTask(examDetail);
-        return ResultUtil.ok(isSuccess);
-    }
+//    /**
+//     * 重新提交
+//     *
+//     * @param examDetail
+//     * @return
+//     */
+//    @ApiOperation(value = "印刷任务管理-重新提交")
+//    @RequestMapping(value = "/task_resubmit", method = RequestMethod.POST)
+//    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+//    public Result taskResubmit(@RequestBody ExamDetail examDetail) throws IOException {
+//        boolean isSuccess = examDetailService.resubmitTask(examDetail);
+//        return ResultUtil.ok(isSuccess);
+//    }
 
     /**
      * 印刷任务管理-查看印品

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

@@ -51,26 +51,20 @@ public class ExamTaskAuditController {
 
     @Resource
     private ExamTaskService examTaskService;
-
     @Resource
     private AsyncTaskReviewSampleExportService asyncTaskReviewSampleExportService;
-
     @Resource
     private PrintCommonService printCommonService;
-
     @Resource
     private BasicMessageService basicMessageService;
-
     @Resource
-    TaskService taskService;
-
+    private TaskService taskService;
     @Resource
-    ActivitiService activitiService;
-
+    private ActivitiService activitiService;
     @Resource
-    GradeInitializeService gradeInitializeService;
+    private GradeInitializeService gradeInitializeService;
     @Resource
-    MarkPaperService markPaperService;
+    private MarkPaperService markPaperService;
 
 
     @ApiOperation(value = "审核-印刷员驳回后命题老师修改")

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

@@ -62,14 +62,9 @@ public class TBTaskController {
             for (TaskListResult taskListResult : taskListResultList) {
                 if (Objects.equals(taskListResult.getStatus(), TaskStatusEnum.FINISH.getTitle()) && Objects.equals(taskListResult.getResult(), TaskResultEnum.ERROR.getTitle())
 //                        && taskListResult.getResetCount() >= dictionaryConfig.sysDomain().getAutoCreatePdfResetMaxCount()
-                        && Objects.equals(taskListResult.getType(), TaskTypeEnum.CREATE_PDF.getTitle())
                         && Objects.isNull(taskListResult.getErrorMessage())) {
                     taskListResult.setResetCreatePdf(true);
                 }
-                // 类型为create_pdf,hasResultFile默认为false
-                if (Objects.equals(taskListResult.getType(), TaskTypeEnum.CREATE_PDF.getTitle())) {
-                    taskListResult.setHasResultFile(false);
-                }
                 // 下载类型
                 taskListResult.setDownloadType(taskListResult.getHasImportFile() ? DownloadFileEnum.IMPORT_FILE.name() : DownloadFileEnum.RESULT.name());
             }
@@ -94,7 +89,6 @@ public class TBTaskController {
             List<TaskListResult> taskListResultList = taskListResultIPage.getRecords();
             for (TaskListResult taskListResult : taskListResultList) {
                 if (Objects.equals(taskListResult.getStatus(), TaskStatusEnum.FINISH.getTitle()) && Objects.equals(taskListResult.getResult(), TaskResultEnum.ERROR.getTitle())
-                        && Objects.equals(taskListResult.getType(), TaskTypeEnum.CREATE_PDF.getTitle())
                         && Objects.isNull(taskListResult.getErrorMessage())) {
                     taskListResult.setResetCreatePdf(true);
                 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/TaskTypeEnum.java

@@ -22,8 +22,6 @@ public enum TaskTypeEnum {
     PAPER_AND_CARD_PDF_DOWNLOAD("卷库查询管理试卷、空白题卡批量下载pdf"),
     DATA_CALCULATE("数据计算"),
     CREATE_TASK_PRINT("发布印刷任务"),
-    CREATE_PDF(""),
-    STUDENT_IMPORT(""),
     STATISTICS_IMPORT("命题统计导入"),
     SCORE_EXPORT("成绩导出"),
     SCORE_DOWNLOAD("成绩轨迹下载"),

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/TBTaskService.java

@@ -119,16 +119,6 @@ public interface TBTaskService extends IService<TBTask> {
                                        TaskTypeEnum type,
                                        TaskResultEnum result);
 
-    /**
-     * 获取任务是否完成
-     *
-     * @param schoolId
-     * @param printPlanId
-     * @param entityIds
-     * @return
-     */
-    boolean countByPrintPlanIdAndEntityId(Long schoolId, Long printPlanId, List<Long> entityIds);
-
     /**
      * 保存task
      *

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/TBTaskServiceImpl.java

@@ -218,30 +218,6 @@ public class TBTaskServiceImpl extends ServiceImpl<TBTaskMapper, TBTask> impleme
         return tbTaskMapper.query(iPage, schoolId, semesterId, examId, courseCode, paperNumber, printPlanId, Objects.nonNull(status) ? status.name() : null, Objects.nonNull(type) ? type.name() : null, Objects.nonNull(result) ? result.name() : null, dpr);
     }
 
-    /**
-     * 获取任务是否完成
-     *
-     * @param schoolId
-     * @param printPlanId
-     * @param entityIds
-     * @return
-     */
-    @Override
-    public boolean countByPrintPlanIdAndEntityId(Long schoolId, Long printPlanId, List<Long> entityIds) {
-        QueryWrapper<TBTask> tbTaskQueryWrapper = new QueryWrapper<>();
-        tbTaskQueryWrapper.lambda().ne(TBTask::getStatus, TaskStatusEnum.FINISH)
-                .eq(TBTask::getType, TaskTypeEnum.CREATE_PDF);
-        if (Objects.nonNull(schoolId)) {
-            tbTaskQueryWrapper.lambda().eq(TBTask::getSchoolId, schoolId);
-        }
-        if (Objects.nonNull(printPlanId)) {
-            tbTaskQueryWrapper.lambda().eq(TBTask::getPrintPlanId, printPlanId);
-        }
-        if (Objects.nonNull(entityIds)) {
-            tbTaskQueryWrapper.lambda().in(TBTask::getEntityId, entityIds);
-        }
-        return this.count(tbTaskQueryWrapper) == 0;
-    }
 
     /**
      * 保存task

teachcloud-common/src/main/resources/mapper/BasicStudentMapper.xml

@@ -136,7 +136,7 @@
                 </foreach>
             </if>
         </where>
-        ORDER BY stu.create_time
+        ORDER BY stu.student_code
     </select>
     <select id="listExportData" resultType="com.qmth.teachcloud.common.bean.dto.BasicStudentExportDto">
         SELECT

teachcloud-task/src/main/java/com/qmth/teachcloud/task/config/RedisMessageListener.java

@@ -10,7 +10,7 @@ import com.qmth.distributed.print.business.bean.flow.dto.*;
 import com.qmth.distributed.print.business.bean.result.TFFlowLogResult;
 import com.qmth.distributed.print.business.service.ActivitiService;
 import com.qmth.distributed.print.business.service.TFFlowLogService;
-import com.qmth.distributed.print.business.templete.execute.AsyncCreatePdfTempleteService;
+import com.qmth.distributed.print.business.templete.execute.AsyncCreatePdfTemplateService;
 import com.qmth.teachcloud.common.bean.dto.MqDto;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicSchool;
@@ -56,7 +56,7 @@ public class RedisMessageListener implements MessageListener {
     TMMqMessageService tmMqMessageService;
 
     @Resource
-    AsyncCreatePdfTempleteService asyncCreatePdfTempleteService;
+    AsyncCreatePdfTemplateService asyncCreatePdfTempleteService;
 
     @Resource
     RedisMachineService redisMachineService;

teachcloud-task/src/main/java/com/qmth/teachcloud/task/job/ResetCreatePdfJob.java

@@ -1,35 +0,0 @@
-package com.qmth.teachcloud.task.job;
-
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.task.job.service.JobService;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.scheduling.quartz.QuartzJobBean;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-
-/**
- * @Description: 重新生成pdf job
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/5/6
- */
-public class ResetCreatePdfJob extends QuartzJobBean {
-    private final static Logger log = LoggerFactory.getLogger(ResetCreatePdfJob.class);
-
-    @Resource
-    JobService jobService;
-
-    @Override
-    protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        try {
-            jobService.resetCreatePdfTask();
-        } catch (IOException e) {
-            log.error(SystemConstant.LOG_ERROR, e);
-        }
-    }
-}

teachcloud-task/src/main/java/com/qmth/teachcloud/task/job/service/JobService.java

@@ -11,13 +11,6 @@ import java.io.IOException;
  */
 public interface JobService {
 
-    /**
-     * 重新生成pdf失败任务
-     *
-     * @throws IOException
-     */
-    void resetCreatePdfTask() throws IOException;
-
     /**
      * 发送即将到期数据
      */

teachcloud-task/src/main/java/com/qmth/teachcloud/task/job/service/impl/JobServiceImpl.java

@@ -2,13 +2,12 @@ package com.qmth.teachcloud.task.job.service.impl;
 
 import com.qmth.boot.redis.uid.RedisMachineService;
 import com.qmth.distributed.print.business.bean.dto.initMarkData.ExamDetailCourseInitMarkDto;
-import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.entity.ExamTaskDetail;
 import com.qmth.distributed.print.business.entity.TBSyncTask;
 import com.qmth.distributed.print.business.entity.TBTaskPdf;
 import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
 import com.qmth.distributed.print.business.service.*;
-import com.qmth.distributed.print.business.templete.execute.AsyncCreatePdfTempleteService;
+import com.qmth.distributed.print.business.templete.execute.AsyncCreatePdfTemplateService;
 import com.qmth.teachcloud.common.bean.dto.MqDto;
 import com.qmth.teachcloud.common.bean.vo.PaperInfoVo;
 import com.qmth.teachcloud.common.contant.SystemConstant;
@@ -19,7 +18,6 @@ import com.qmth.teachcloud.common.enums.mark.MarkPaperStatus;
 import com.qmth.teachcloud.common.util.DateDisposeUtils;
 import com.qmth.teachcloud.common.util.ExamTaskUtil;
 import com.qmth.teachcloud.common.util.RedisUtil;
-import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.mark.entity.MarkGroup;
 import com.qmth.teachcloud.mark.entity.MarkPaper;
 import com.qmth.teachcloud.mark.entity.MarkUserGroup;
@@ -35,7 +33,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -81,18 +78,7 @@ public class JobServiceImpl implements JobService {
     @Resource
     TBTaskPdfService tbTaskPdfService;
     @Resource
-    AsyncCreatePdfTempleteService asyncCreatePdfTempleteService;
-
-    /**
-     * 重新生成pdf失败任务
-     *
-     * @throws IOException
-     */
-    @Override
-    public void resetCreatePdfTask() throws IOException {
-        printCommonService.resetCreatePdfTask();
-    }
-
+    AsyncCreatePdfTemplateService asyncCreatePdfTempleteService;
     @Override
     public void sendSmsExpireTask() {
         smsSendService.sendSmsExpireTask();

teachcloud-task/src/main/java/com/qmth/teachcloud/task/start/StartRunning.java

@@ -31,14 +31,10 @@ public class StartRunning implements CommandLineRunner {
     @Resource
     JobService jobService;
 
-    @Resource
-    PrintCommonService printCommonService;
-
     @Override
-    public void run(String... args) throws Exception {
+    public void run(String... args) {
         log.info("服务器启动时执行 start");
         jobService.machineHeart();
-        printCommonService.updateStatus();
 
         log.info("增加任务到期提醒定时任务 start");
         Map expireJobMap = new HashMap();