测试bug修改

paper-library-business/src/main/java/com/qmth/paper/library/business/mapper/PaperScanTaskMapper.java

@@ -51,8 +51,7 @@ public interface PaperScanTaskMapper extends BaseMapper<PaperScanTask> {
      */
     IPage<PaperScanTaskDetailResult> findPaperScanTaskDetailPageByScanTaskId(@Param("iPage") Page<PaperScanTaskDetailResult> iPage,
                                                                              @Param("schoolId") Long schoolId,
-                                                                             @Param("paperScanTaskId") Long paperScanTaskId,
-                                                                             @Param("orgIds") Set<Long> orgIds);
+                                                                             @Param("paperScanTaskId") Long paperScanTaskId);
 
     /**
      * 根据扫描任务id查询扫描任务的绑定详情

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperScanTaskServiceImpl.java

@@ -186,7 +186,7 @@ public class PaperScanTaskServiceImpl extends ServiceImpl<PaperScanTaskMapper, P
     @Override
     public IPage<PaperScanTaskDetailResult> findPaperScanTaskDetailPageByScanTaskId(Long paperScanTaskId, int pageNumber, int pageSize, SysUser requestUser) {
         Long schoolId = requestUser.getSchoolId();
-        return this.baseMapper.findPaperScanTaskDetailPageByScanTaskId(new Page<>(pageNumber, pageSize), schoolId, paperScanTaskId, null);
+        return this.baseMapper.findPaperScanTaskDetailPageByScanTaskId(new Page<>(pageNumber, pageSize), schoolId, paperScanTaskId);
     }
 
     @Transactional(rollbackFor = Exception.class)

paper-library-business/src/main/java/com/qmth/paper/library/business/templete/execute/AsyncPaperScanTaskImportService.java

@@ -2,7 +2,7 @@ package com.qmth.paper.library.business.templete.execute;
 
 import cn.hutool.core.date.DateUtil;
 import com.qmth.boot.api.exception.ApiException;
-import com.qmth.paper.library.business.templete.importData.AsyncImportTaskTemplete;
+import com.qmth.paper.library.business.templete.importData.AsyncImportTaskTemplate;
 import com.qmth.paper.library.business.templete.service.TaskLogicService;
 import com.qmth.paper.library.common.contant.SpringContextHolder;
 import com.qmth.paper.library.common.contant.SystemConstant;
@@ -29,7 +29,7 @@ import java.util.StringJoiner;
  * @Date: 2022-09-29
  */
 @Service
-public class AsyncPaperScanTaskImportService extends AsyncImportTaskTemplete {
+public class AsyncPaperScanTaskImportService extends AsyncImportTaskTemplate {
 
     private final static Logger log = LoggerFactory.getLogger(AsyncPaperScanTaskImportService.class);
 

paper-library-business/src/main/java/com/qmth/paper/library/business/templete/execute/AsyncStudentDataImportService.java

@@ -2,7 +2,7 @@ package com.qmth.paper.library.business.templete.execute;
 
 import cn.hutool.core.date.DateUtil;
 import com.qmth.boot.api.exception.ApiException;
-import com.qmth.paper.library.business.templete.importData.AsyncImportTaskTemplete;
+import com.qmth.paper.library.business.templete.importData.AsyncImportTaskTemplate;
 import com.qmth.paper.library.business.templete.service.TaskLogicService;
 import com.qmth.paper.library.common.contant.SpringContextHolder;
 import com.qmth.paper.library.common.contant.SystemConstant;
@@ -28,7 +28,7 @@ import java.util.StringJoiner;
  * @Date: 2021-04-07
  */
 @Service
-public class AsyncStudentDataImportService extends AsyncImportTaskTemplete {
+public class AsyncStudentDataImportService extends AsyncImportTaskTemplate {
 
     private final static Logger log = LoggerFactory.getLogger(AsyncStudentDataImportService.class);
 

paper-library-business/src/main/java/com/qmth/paper/library/business/templete/execute/AsyncSysOrgImportService.java

@@ -2,7 +2,7 @@ package com.qmth.paper.library.business.templete.execute;
 
 import cn.hutool.core.date.DateUtil;
 import com.qmth.boot.api.exception.ApiException;
-import com.qmth.paper.library.business.templete.importData.AsyncImportTaskTemplete;
+import com.qmth.paper.library.business.templete.importData.AsyncImportTaskTemplate;
 import com.qmth.paper.library.business.templete.service.TaskLogicService;
 import com.qmth.paper.library.common.contant.SpringContextHolder;
 import com.qmth.paper.library.common.contant.SystemConstant;
@@ -16,7 +16,6 @@ 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;
@@ -29,14 +28,14 @@ import java.util.StringJoiner;
  * @Date: 2022-08-16
  */
 @Service
-public class AsyncSysOrgImportService extends AsyncImportTaskTemplete {
+public class AsyncSysOrgImportService extends AsyncImportTaskTemplate {
     private final static Logger log = LoggerFactory.getLogger(AsyncSysOrgImportService.class);
 
     public static final String ORG_TITLE = "机构数据";
 
 
     @Override
-    public Result importTask(Map<String, Object> map) throws IOException, Exception {
+    public Result importTask(Map<String, Object> map) throws Exception {
         TBTask tbTask = (TBTask) map.get(SystemConstant.TASK);
         InputStream inputStream = super.getUploadFileInputStream(tbTask);
         map.put("inputStream", inputStream);

paper-library-business/src/main/java/com/qmth/paper/library/business/templete/export/AsyncExportTaskTemplete.java → paper-library-business/src/main/java/com/qmth/paper/library/business/templete/export/AsyncExportTaskTemplate.java

@@ -3,7 +3,7 @@ package com.qmth.paper.library.business.templete.export;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.qmth.boot.api.exception.ApiException;
-import com.qmth.paper.library.business.templete.importData.AsyncImportTaskTemplete;
+import com.qmth.paper.library.business.templete.importData.AsyncImportTaskTemplate;
 import com.qmth.paper.library.common.config.DictionaryConfig;
 import com.qmth.paper.library.common.contant.SpringContextHolder;
 import com.qmth.paper.library.common.contant.SystemConstant;
@@ -41,11 +41,11 @@ import java.util.StringJoiner;
  * @Author: wangliang
  * @Date: 2021/3/29
  */
-public abstract class AsyncExportTaskTemplete {
+public abstract class AsyncExportTaskTemplate {
     @Resource
     SysConfigService sysConfigService;
 
-    private final static Logger log = LoggerFactory.getLogger(AsyncImportTaskTemplete.class);
+    private final static Logger log = LoggerFactory.getLogger(AsyncImportTaskTemplate.class);
     public static final String BEGIN_TITLE = "->开始准备处理导出的";
     public static final String FINISH_TITLE = "->数据处理结束，共处理了";
     public static final String FINISH_SIZE = "条数据。";
@@ -75,7 +75,7 @@ public abstract class AsyncExportTaskTemplete {
         ByteArrayOutputStream out = null;
         InputStream inputStream = null;
         try {
-            JSONObject jsonObject = JSONObject.parseObject(tbTask.getResultFilePath());
+            JSONObject jsonObject = JSONObject.parseObject(tbTask.getExportFilePath());
             if (Objects.isNull(jsonObject)) {
                 DictionaryConfig dictionaryConfig = SpringContextHolder.getBean(DictionaryConfig.class);
 
@@ -133,7 +133,7 @@ public abstract class AsyncExportTaskTemplete {
             json.put(SystemConstant.TYPE, type);
             json.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.FILE);
             String result = json.toJSONString();
-            tbTask.setReportFilePath(json.toJSONString());
+            tbTask.setTxtFilePath(json.toJSONString());
         } catch (Exception e) {
             log.error(SystemConstant.LOG_ERROR, e);
             StringJoiner stringJoinerSummary = new StringJoiner("").add(tbTask.getSummary()).add("\n");

paper-library-business/src/main/java/com/qmth/paper/library/business/templete/importData/AsyncImportTaskTemplete.java → paper-library-business/src/main/java/com/qmth/paper/library/business/templete/importData/AsyncImportTaskTemplate.java

@@ -7,7 +7,10 @@ import com.qmth.paper.library.common.contant.SpringContextHolder;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.SysConfig;
 import com.qmth.paper.library.common.entity.TBTask;
-import com.qmth.paper.library.common.enums.*;
+import com.qmth.paper.library.common.enums.LocalCatalogEnum;
+import com.qmth.paper.library.common.enums.TaskResultEnum;
+import com.qmth.paper.library.common.enums.TaskStatusEnum;
+import com.qmth.paper.library.common.enums.UploadFileEnum;
 import com.qmth.paper.library.common.service.CommonCacheService;
 import com.qmth.paper.library.common.service.TBTaskService;
 import com.qmth.paper.library.common.util.FileStoreUtil;
@@ -34,9 +37,9 @@ import java.util.StringJoiner;
  * @Author: wangliang
  * @Date: 2021/3/29
  */
-public abstract class AsyncImportTaskTemplete {
+public abstract class AsyncImportTaskTemplate {
 
-    private final static Logger log = LoggerFactory.getLogger(AsyncImportTaskTemplete.class);
+    private final static Logger log = LoggerFactory.getLogger(AsyncImportTaskTemplate.class);
 
     public static final String BEGIN_TITLE = "->开始准备处理导入的";
     public static final String EXCEPTION_TITLE = "->数据处理发生异常!";
@@ -54,7 +57,7 @@ public abstract class AsyncImportTaskTemplete {
      * @throws IOException
      */
     @Async
-    public abstract Result importTask(Map<String, Object> map) throws IOException, Exception;
+    public abstract Result importTask(Map<String, Object> map) throws Exception;
 
     /**
      * 获取上传的文件
@@ -73,9 +76,7 @@ public abstract class AsyncImportTaskTemplete {
         if (Objects.equals(type, SystemConstant.OSS)) {
             inputStream = fileStoreUtil.ossDownloadIs(path, uploadType.getFssType());
         } else {
-//            StringJoiner localPath = new StringJoiner("").add(SystemConstant.TEMP_FILES_DIR).add(File.separator).add(path);
             inputStream = new FileInputStream(new File(path));
-//            inputStream = fileStoreUtil.ossDownloadIs(path, "localfile");
         }
         return inputStream;
     }
@@ -86,7 +87,6 @@ public abstract class AsyncImportTaskTemplete {
      * @param tbTask
      */
     public void createTxt(TBTask tbTask) {
-//        OssUtil ossUtil = SpringContextHolder.getBean(OssUtil.class);
         TBTaskService tbTaskService = SpringContextHolder.getBean(TBTaskService.class);
         ByteArrayOutputStream out = null;
         InputStream inputStream = null;
@@ -122,9 +122,6 @@ public abstract class AsyncImportTaskTemplete {
             byte[] bookByteAry = out.toByteArray();
             inputStream = new ByteArrayInputStream(bookByteAry);
             StringJoiner stringJoiner = new StringJoiner("");
-//            if (tbTask.getType() == TaskTypeEnum.CREATE_PDF) {
-//                path = path.replaceAll(UploadFileEnum.PDF.getTitle(), UploadFileEnum.FILE.getTitle());
-//            }
 
             path = path.substring(0, path.lastIndexOf("/") + 1);
             stringJoiner.add(path).add(SystemConstant.getUuid()).add(TXT_PREFIX).toString();
@@ -134,14 +131,14 @@ public abstract class AsyncImportTaskTemplete {
                 fileStoreUtil.ossUpload(stringJoiner.toString(), inputStream, DigestUtils.md5Hex(new ByteArrayInputStream(bookByteAry)), fileStoreUtil.getUploadEnumByPath(stringJoiner.toString()).getFssType());
             } else {//上传至服务器
                 FileStoreUtil fileStoreUtil = SpringContextHolder.getBean(FileStoreUtil.class);
-                fileStoreUtil.copyInputStreamToFile(inputStream,new File(stringJoiner.toString()),DigestUtils.md5Hex(new ByteArrayInputStream(bookByteAry)), LocalCatalogEnum.LOCAL_FILE);
+                fileStoreUtil.copyInputStreamToFile(inputStream, new File(stringJoiner.toString()), DigestUtils.md5Hex(new ByteArrayInputStream(bookByteAry)), LocalCatalogEnum.LOCAL_FILE);
             }
             JSONObject json = new JSONObject();
             json.put(SystemConstant.PATH, stringJoiner.toString());
             json.put(SystemConstant.TYPE, type);
             json.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.FILE);
 
-            tbTask.setReportFilePath(json.toJSONString());
+            tbTask.setTxtFilePath(json.toJSONString());
         } catch (Exception e) {
             log.error(SystemConstant.LOG_ERROR, e);
             StringJoiner stringJoinerSummary = new StringJoiner("").add(tbTask.getSummary()).add("\n");
@@ -154,10 +151,6 @@ public abstract class AsyncImportTaskTemplete {
 
             tbTask.setSummary(summary);
             tbTask.setResult(TaskResultEnum.ERROR);
-//            TBTask dbTask = tbTaskService.getById(tbTask.getId());
-//            if (tbTask.getVersion() == dbTask.getVersion()) {
-//                tbTask.setResetCount(new AtomicInteger(tbTask.getResetCount()).incrementAndGet());
-//            }
             if (e instanceof ApiException) {
                 ResultUtil.error((ApiException) e, e.getMessage());
             } else {

paper-library-business/src/main/java/com/qmth/paper/library/business/templete/importData/SyncImportTaskTemplete.java → paper-library-business/src/main/java/com/qmth/paper/library/business/templete/importData/SyncImportTaskTemplate.java

@@ -12,7 +12,7 @@ import java.util.Map;
  * @Author: wangliang
  * @Date: 2021/3/29
  */
-public interface SyncImportTaskTemplete {
+public interface SyncImportTaskTemplate {
 
     /**
      * 同步导入任务

paper-library-business/src/main/resources/mapper/PaperLibraryMapper.xml

@@ -159,7 +159,7 @@
                 and pstd.paper_scan_task_id = #{paperScanTaskId}
             </if>
             <if test="param != null and param != ''">
-                and (bs.student_name like  concat(#{param}, '%') or bs.student_code like  concat(#{param}, '%'))
+                and (bs.student_name like  concat('%', #{param}, '%') or bs.student_code like  concat('%', #{param}, '%'))
             </if>
         </where>
     </select>

paper-library-business/src/main/resources/mapper/PaperScanTaskMapper.xml

@@ -73,11 +73,11 @@
                  paper_library
              GROUP BY paper_scan_task_detail_id) pl ON pl.paper_scan_task_detail_id = pstd.id
         <where>
-            <if test="schoolId != null and schoolId != ''">
+            <if test="schoolId != null">
                 AND pst.school_id = #{schoolId}
             </if>
-            <if test="paperScanTaskId != null and paperScanTaskId != ''">
-                AND pst.id = #{paperScanTaskId}
+            <if test="paperScanTaskId != null">
+                AND pstd.paper_scan_task_id = #{paperScanTaskId}
             </if>
         </where>
         ORDER BY scanCount desc

paper-library-common/src/main/java/com/qmth/paper/library/common/bean/result/TaskListResult.java

@@ -1,178 +1,12 @@
 package com.qmth.paper.library.common.bean.result;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.common.enums.TaskResultEnum;
-import com.qmth.paper.library.common.enums.TaskStatusEnum;
-import com.qmth.paper.library.common.enums.TaskTypeEnum;
-import io.swagger.annotations.ApiModelProperty;
+import com.qmth.paper.library.common.entity.TBTask;
 
 import java.io.Serializable;
-import java.util.Objects;
 
 /**
- * @Description: 任务列表result
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/3/25
+ * 异步任务记录表
  */
-public class TaskListResult implements Serializable {
+public class TaskListResult extends TBTask implements Serializable {
 
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "id")
-    Long id;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "印刷计划id")
-    Long printPlanId;
-
-    @ApiModelProperty(value = "学校名称")
-    String printPlanName;
-
-    @ApiModelProperty(value = "任务类型，IMPORT_STUDENT_PHOTO：照片导入，EXPORT_STUDENT_PHOTO：照片导出，IMPORT_EXAM_STUDENT：考生导入，EXPORT_EXAM_STUDENT：考生导出，IMPORT_BATCH_PAPER：试卷批量导入，EXPORT_BATCH_PAPER：试卷批量导出，IMPORT_CUSTOM_TEMPLATE：模版批量导入，EXPORT_CUSTOM_TEMPLATE：模版批量导出，DOWNLOAD_BOX_STICKER：箱贴下载")
-    String type;
-
-    @ApiModelProperty(value = "任务状态，INIT：未开始，RUNNING：进行中，FINISH：已完成")
-    String status;
-
-    @ApiModelProperty(value = "数据结果，SUCCESS：成功，ERROR：失败")
-    String result;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "创建人id")
-    Long createId;
-
-    @ApiModelProperty(value = "创建人")
-    String createName;
-
-    @ApiModelProperty(value = "创建时间")
-    Long createTime;
-
-    @ApiModelProperty(value = "是否有导出文件")
-    Boolean hasResultFile;
-
-    @ApiModelProperty(value = "是否有报告文件")
-    Boolean hasReportFile;
-
-    @ApiModelProperty(value = "是否重新生成pdf")
-    boolean resetCreatePdf;
-
-    @ApiModelProperty(value = "重新生成次数")
-    int resetCount;
-
-    @ApiModelProperty(value = "人工错误原因")
-    String errorMessage;
-
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
-    public void setErrorMessage(String errorMessage) {
-        this.errorMessage = errorMessage;
-    }
-
-    public int getResetCount() {
-        return resetCount;
-    }
-
-    public void setResetCount(int resetCount) {
-        this.resetCount = resetCount;
-    }
-
-    public boolean isResetCreatePdf() {
-        return resetCreatePdf;
-    }
-
-    public void setResetCreatePdf(boolean resetCreatePdf) {
-        this.resetCreatePdf = resetCreatePdf;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getPrintPlanId() {
-        return printPlanId;
-    }
-
-    public void setPrintPlanId(Long printPlanId) {
-        this.printPlanId = printPlanId;
-    }
-
-    public String getPrintPlanName() {
-        return printPlanName;
-    }
-
-    public void setPrintPlanName(String printPlanName) {
-        this.printPlanName = printPlanName;
-    }
-
-    public String getType() {
-        return TaskTypeEnum.valueOf(type).getTitle();
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getStatus() {
-        return Objects.nonNull(status) ? TaskStatusEnum.valueOf(status).getTitle() : status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getResult() {
-        return Objects.nonNull(result) ? TaskResultEnum.valueOf(result).getTitle() : null;
-    }
-
-    public void setResult(String result) {
-        this.result = result;
-    }
-
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
-    public String getCreateName() {
-        return createName;
-    }
-
-    public void setCreateName(String createName) {
-        this.createName = createName;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public Boolean getHasResultFile() {
-        return hasResultFile;
-    }
-
-    public void setHasResultFile(Boolean hasResultFile) {
-        this.hasResultFile = hasResultFile;
-    }
-
-    public Boolean getHasReportFile() {
-        return hasReportFile;
-    }
-
-    public void setHasReportFile(Boolean hasReportFile) {
-        this.hasReportFile = hasReportFile;
-    }
 }

paper-library-common/src/main/java/com/qmth/paper/library/common/entity/TBTask.java

@@ -22,20 +22,11 @@ import java.io.Serializable;
  * @author wangliang
  * @since 2021-03-19
  */
-@ApiModel(value = "TBTask对象", description = "导入导出任务表")
+@ApiModel(value = "TBTask对象", description = "异步操作任务表")
 public class TBTask extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "任务类型，USER_IMPORT：用户导入， QUESTION_MISSION_BATCH_CREATE：批量新建命题任务， SAMPLE_EXPORT：导出审核样本， PAPER_DOWNLOAD：卷库下载， EXAMINATION_IMPORT：考务数据导入， EXAMINATION_EXPORT：考务数据导出， PRINT_PDF_DOWNLOAD：批量下载pdf， CREATE_PDF：生成pdf， COURSE_IMPORT：课程导入，STATISTICS_IMPORT：命题统计导入")
-    @TableField(value = "type")
-    private TaskTypeEnum type;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "关联业务对象id")
-    @TableField(value = "entity_id")
-    private Long entityId;
-
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "学校id")
     @TableField(value = "school_id")
@@ -46,10 +37,9 @@ public class TBTask extends BaseEntity implements Serializable {
     @TableField(value = "org_id")
     private Long orgId;
 
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "印刷计划id")
-    @TableField(value = "print_plan_id")
-    private Long printPlanId;
+    @ApiModelProperty(value = "任务类型")
+    @TableField(value = "type")
+    private TaskTypeEnum type;
 
     @ApiModelProperty(value = "任务状态，INIT：未开始，RUNNING：进行中，FINISH：已完成")
     @TableField(value = "status")
@@ -59,18 +49,10 @@ public class TBTask extends BaseEntity implements Serializable {
     @TableField(value = "summary")
     private String summary;
 
-    @ApiModelProperty(value = "执行进度")
-    @TableField(value = "progress")
-    private Double progress;
-
     @ApiModelProperty(value = "数据结果，SUCCESS：成功，ERROR：失败")
     @TableField(value = "result")
     private TaskResultEnum result;
 
-    @ApiModelProperty(value = "是否启用，false：停用，true：启用")
-    @TableField(value = "enable")
-    private Boolean enable;
-
     @ApiModelProperty(value = "导入文件名")
     @TableField(value = "import_file_name", updateStrategy = FieldStrategy.IGNORED)
     private String importFileName;
@@ -80,98 +62,21 @@ public class TBTask extends BaseEntity implements Serializable {
     private String importFilePath;
 
     @ApiModelProperty(value = "导出文件路径")
-    @TableField(value = "result_file_path")
-    private String resultFilePath;
+    @TableField(value = "export_file_path")
+    private String exportFilePath;
 
     @ApiModelProperty(value = "报告路径")
-    @TableField(value = "report_file_path")
-    private String reportFilePath;
+    @TableField(value = "txt_file_path")
+    private String txtFilePath;
 
     @ApiModelProperty(value = "备注")
     @TableField(value = "remark")
     private String remark;
 
-    @ApiModelProperty(value = "实体名称")
-    @TableField(value = "obj_name")
-    private String objName;
-
-    @ApiModelProperty(value = "重试次数")
-    @TableField(value = "reset_count")
-    private int resetCount;
-
-    @ApiModelProperty(value = "更新版本号")
-    @TableField(value = "version")
-    private int version;
-
-    @ApiModelProperty(value = "人工错误")
-    @TableField(value = "error_message", updateStrategy = FieldStrategy.IGNORED)
-    private String errorMessage;
-
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
-    public void setErrorMessage(String errorMessage) {
-        this.errorMessage = errorMessage;
-    }
-
-    public int getVersion() {
-        return version;
-    }
-
-    public void setVersion(int version) {
-        this.version = version;
-    }
-
-    public int getResetCount() {
-        return resetCount;
-    }
-
-    public void setResetCount(int resetCount) {
-        this.resetCount = resetCount;
-    }
-
-    public String getObjName() {
-        return objName;
-    }
-
-    public void setObjName(String objName) {
-        this.objName = objName;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public Long getPrintPlanId() {
-        return printPlanId;
-    }
-
-    public void setPrintPlanId(Long printPlanId) {
-        this.printPlanId = printPlanId;
-    }
-
     public TBTask() {
 
     }
 
-    public TBTask(TaskTypeEnum type, Long entityId, TaskStatusEnum status, String summary, String importFileName, String importFilePath, Long createId, Long schoolId) {
-        setId(SystemConstant.getDbUuid());
-        this.type = type;
-        this.entityId = entityId;
-        this.status = status;
-        this.summary = summary;
-        this.importFileName = importFileName;
-        this.importFilePath = importFilePath;
-        setCreateId(createId);
-        setCreateTime(System.currentTimeMillis());
-        this.schoolId = schoolId;
-    }
-
     public TBTask(TaskTypeEnum type, TaskStatusEnum status, String summary, String importFileName, String importFilePath, Long createId, Long schoolId) {
         setId(SystemConstant.getDbUuid());
         this.type = type;
@@ -211,34 +116,6 @@ public class TBTask extends BaseEntity implements Serializable {
         this.orgId = orgId;
     }
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getEntityId() {
-        return entityId;
-    }
-
-    public void setEntityId(Long entityId) {
-        this.entityId = entityId;
-    }
-
-    public String getSummary() {
-        return summary;
-    }
-
-    public void setSummary(String summary) {
-        this.summary = summary;
-    }
-
-    public Double getProgress() {
-        return progress;
-    }
-
-    public void setProgress(Double progress) {
-        this.progress = progress;
-    }
-
     public TaskTypeEnum getType() {
         return type;
     }
@@ -255,20 +132,20 @@ public class TBTask extends BaseEntity implements Serializable {
         this.status = status;
     }
 
-    public TaskResultEnum getResult() {
-        return result;
+    public String getSummary() {
+        return summary;
     }
 
-    public void setResult(TaskResultEnum result) {
-        this.result = result;
+    public void setSummary(String summary) {
+        this.summary = summary;
     }
 
-    public Boolean getEnable() {
-        return enable;
+    public TaskResultEnum getResult() {
+        return result;
     }
 
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
+    public void setResult(TaskResultEnum result) {
+        this.result = result;
     }
 
     public String getImportFileName() {
@@ -287,19 +164,27 @@ public class TBTask extends BaseEntity implements Serializable {
         this.importFilePath = importFilePath;
     }
 
-    public String getResultFilePath() {
-        return resultFilePath;
+    public String getExportFilePath() {
+        return exportFilePath;
     }
 
-    public void setResultFilePath(String resultFilePath) {
-        this.resultFilePath = resultFilePath;
+    public void setExportFilePath(String exportFilePath) {
+        this.exportFilePath = exportFilePath;
     }
 
-    public String getReportFilePath() {
-        return reportFilePath;
+    public String getTxtFilePath() {
+        return txtFilePath;
     }
 
-    public void setReportFilePath(String reportFilePath) {
-        this.reportFilePath = reportFilePath;
+    public void setTxtFilePath(String txtFilePath) {
+        this.txtFilePath = txtFilePath;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
     }
 }

paper-library-common/src/main/java/com/qmth/paper/library/common/enums/TaskStatusEnum.java

@@ -15,8 +15,6 @@ public enum TaskStatusEnum {
 
     INIT("未开始"),
 
-    DATA_VALID("数据校验中"),
-
     RUNNING("进行中"),
 
     FINISH("已完成");

paper-library-common/src/main/java/com/qmth/paper/library/common/enums/TaskTypeEnum.java

@@ -10,43 +10,15 @@ import java.util.Objects;
  * @Date: 2021/3/29
  */
 public enum TaskTypeEnum {
-    ORG_IMPORT("机构导入"),
+    ORG_IMPORT("导入组织架构"),
 
-    USER_IMPORT("用户导入"),
+    USER_IMPORT("导入用户"),
 
-    STUDENT_IMPORT("学生导入"),
+    STUDENT_IMPORT("导入学生"),
 
-    COURSE_IMPORT("课程导入"),
+    PAPER_SCAN_TASK_IMPORT("导入任务"),
 
-    CLAZZ_IMPORT("班级导入"),
-
-    QUESTION_MISSION_BATCH_CREATE("批量新建命题任务"),
-
-    SAMPLE_EXPORT("导出审核样本"),
-
-    EXAMINATION_IMPORT("考务数据导入"),
-
-    EXAMINATION_EXPORT("考务数据导出"),
-
-    PRINT_PDF_DOWNLOAD("批量下载pdf"),
-
-    PAPER_AND_CARD_PDF_DOWNLOAD("卷库查询管理试卷、空白题卡批量下载pdf"),
-
-    CREATE_PDF("生成pdf"),
-
-    DATA_CALCULATE("数据计算"),
-
-    CREATE_TASK_PRINT("发布印刷任务"),
-
-    STATISTICS_IMPORT("命题统计导入"),
-
-    SCORE_EXPORT("成绩导出"),
-
-    SCORE_DOWNLOAD("成绩轨迹下载"),
-
-    DOWNLOAD_PAPER_FILE_BATCH("批量下载试卷文件"),
-
-    PAPER_SCAN_TASK_IMPORT("批量导入扫描任务");
+    PAPER_DOWNLOAD("批量下载");
 
     private String title;
 

paper-library-common/src/main/java/com/qmth/paper/library/common/mapper/TBTaskMapper.java

@@ -19,9 +19,8 @@ import java.util.Set;
  */
 public interface TBTaskMapper extends BaseMapper<TBTask> {
 
-    public IPage<TaskListResult> query(IPage<Map> iPage,
+    public IPage<TaskListResult> query(IPage<TaskListResult> iPage,
                                        @Param("schoolId") Long schoolId,
-                                       @Param("printPlanId") Long printPlanId,
                                        @Param("status") String status,
                                        @Param("type") String type,
                                        @Param("result") String result,

paper-library-common/src/main/java/com/qmth/paper/library/common/service/TBTaskService.java

@@ -25,88 +25,16 @@ import java.util.Map;
  */
 public interface TBTaskService extends IService<TBTask> {
 
-    /**
-     * 保存任务
-     *
-     * @param file
-     * @param taskTypeEnum
-     * @param objId
-     * @return
-     */
-    public Map<String, Object> saveTask(MultipartFile file, TaskTypeEnum taskTypeEnum, Object objId);
-
-    /**
-     * 保存任务
-     *
-     * @param file
-     * @param taskTypeEnum
-     * @param orgId
-     * @return
-     */
-    public Map<String, Object> saveTask(MultipartFile file, TaskTypeEnum taskTypeEnum, Long orgId);
-
-    /**
-     * 保存任务
-     *
-     * @param file
-     * @param taskTypeEnum
-     * @param objId
-     * @param orgId
-     * @return
-     */
-    public Map<String, Object> saveTask(MultipartFile file, TaskTypeEnum taskTypeEnum, Object objId, Long orgId);
-
-    /**
-     * 保存任务
-     *
-     * @param taskTypeEnum
-     * @param printPlanId
-     * @return
-     */
-    public Map<String, Object> saveTask(TaskTypeEnum taskTypeEnum, Long printPlanId);
-
-    /**
-     * 保存任务
-     *
-     * @param taskTypeEnum
-     * @param printPlanId
-     * @param sysUser
-     * @param entityId
-     * @return
-     */
-    public Map<String, Object> saveTask(TaskTypeEnum taskTypeEnum, Long printPlanId, SysUser sysUser, Long entityId);
-
-    /**
-     * 保存任务
-     *
-     * @param taskTypeEnum
-     * @param arraysParams
-     * @param sysUser
-     * @return
-     */
-    public Map<String, Object> saveTask(TaskTypeEnum taskTypeEnum, ArraysParams arraysParams, SysUser sysUser);
-
-    /**
-     * 保存任务
-     * @param taskTypeEnum 任务类型
-     * @return 结果
-     */
-    public Map<String,Object> saveTask(TaskTypeEnum taskTypeEnum);
-
     /**
      * 查询任务列表
      *
      * @param iPage
-     * @param schoolId
-     * @param printPlanId
      * @param status
      * @param type
      * @param result
      * @return
      */
-    public IPage<TaskListResult> query(IPage<Map> iPage,
-                                       Long schoolId,
-                                       Long printPlanId,
+    public IPage<TaskListResult> query(IPage<TaskListResult> iPage,
                                        TaskStatusEnum status,
                                        TaskTypeEnum type,
                                        TaskResultEnum result);

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

@@ -2,8 +2,6 @@ package com.qmth.paper.library.common.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.boot.api.exception.ApiException;
-import com.qmth.paper.library.common.bean.params.ArraysParams;
 import com.qmth.paper.library.common.bean.result.TaskListResult;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.BasicAttachment;
@@ -15,17 +13,12 @@ import com.qmth.paper.library.common.enums.TaskTypeEnum;
 import com.qmth.paper.library.common.mapper.TBTaskMapper;
 import com.qmth.paper.library.common.service.LibraryCommonService;
 import com.qmth.paper.library.common.service.TBTaskService;
-import com.qmth.paper.library.common.util.JacksonUtil;
-import com.qmth.paper.library.common.util.ResultUtil;
 import com.qmth.paper.library.common.util.ServletUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -48,163 +41,21 @@ public class TBTaskServiceImpl extends ServiceImpl<TBTaskMapper, TBTask> impleme
     @Resource
     TBTaskMapper tbTaskMapper;
 
-    /**
-     * 保存任务
-     *
-     * @param file
-     * @param taskTypeEnum
-     * @param objId
-     * @return
-     */
-    @Override
-    public Map<String, Object> saveTask(MultipartFile file, TaskTypeEnum taskTypeEnum, Object objId) {
-        return null;
-    }
-
-    /**
-     * 保存任务
-     *
-     * @param file
-     * @param taskTypeEnum
-     * @param projectId
-     * @return
-     */
-    @Override
-    public Map<String, Object> saveTask(MultipartFile file, TaskTypeEnum taskTypeEnum, Long projectId) {
-        return null;
-    }
-
-    /**
-     * 保存任务
-     *
-     * @param file
-     * @param taskTypeEnum
-     * @param objId
-     * @param projectId
-     * @return
-     */
-    @Override
-    public Map<String, Object> saveTask(MultipartFile file, TaskTypeEnum taskTypeEnum, Object objId, Long projectId) {
-        return null;
-    }
-
-    /**
-     * 保存任务
-     *
-     * @param taskTypeEnum
-     * @param printPlanId
-     * @return
-     */
-    @Override
-    @Transactional
-    public Map<String, Object> saveTask(TaskTypeEnum taskTypeEnum, Long printPlanId) {
-        Map<String, Object> map = new HashMap<>();
-        try {
-            TBTask tbTask = saveTaskCommon(null, taskTypeEnum, map, null);
-            tbTask.setPrintPlanId(printPlanId);
-            this.save(tbTask);
-        } catch (Exception e) {
-            log.error(SystemConstant.LOG_ERROR, e);
-            if (e instanceof ApiException) {
-                ResultUtil.error((ApiException) e, e.getMessage());
-            } else {
-                ResultUtil.error(e.getMessage());
-            }
-        }
-        return map;
-    }
-
-    /**
-     * 保存任务
-     *
-     * @param taskTypeEnum
-     * @param printPlanId
-     * @param sysUser
-     * @param entityId
-     * @return
-     */
-    @Override
-    public Map<String, Object> saveTask(TaskTypeEnum taskTypeEnum, Long printPlanId, SysUser sysUser, Long entityId) {
-        Map<String, Object> map = new HashMap<>();
-        try {
-            if (Objects.nonNull(entityId)) {
-                map.computeIfAbsent("entityId", v -> entityId);
-            }
-            TBTask tbTask = saveTaskCommon(null, taskTypeEnum, map, sysUser);
-            tbTask.setPrintPlanId(printPlanId);
-            this.save(tbTask);
-        } catch (Exception e) {
-            log.error(SystemConstant.LOG_ERROR, e);
-            if (e instanceof ApiException) {
-                ResultUtil.error((ApiException) e, e.getMessage());
-            } else {
-                ResultUtil.error(e.getMessage());
-            }
-        }
-        return map;
-    }
-
-    /**
-     * 保存任务
-     *
-     * @param taskTypeEnum
-     * @param arraysParams
-     * @param sysUser
-     * @return
-     */
-    @Override
-    public Map<String, Object> saveTask(TaskTypeEnum taskTypeEnum, ArraysParams arraysParams, SysUser sysUser) {
-        Map<String, Object> map = new HashMap<>();
-        try {
-            TBTask tbTask = saveTaskCommon(null, taskTypeEnum, map, sysUser);
-            if (Objects.nonNull(arraysParams)) {
-                tbTask.setRemark(JacksonUtil.parseJson(arraysParams.getIds()));
-            }
-            this.save(tbTask);
-        } catch (Exception e) {
-            log.error(SystemConstant.LOG_ERROR, e);
-            if (e instanceof ApiException) {
-                ResultUtil.error((ApiException) e, e.getMessage());
-            } else {
-                ResultUtil.error(e.getMessage());
-            }
-        }
-        return map;
-    }
-
-    @Override
-    public Map<String, Object> saveTask(TaskTypeEnum taskTypeEnum) {
-        Map<String, Object> map = new HashMap<>();
-        try {
-            TBTask tbTask = saveTaskCommon(null, taskTypeEnum, map, null);
-            this.save(tbTask);
-        } catch (Exception e) {
-            log.error(SystemConstant.LOG_ERROR, e);
-            if (e instanceof ApiException) {
-                ResultUtil.error((ApiException) e, e.getMessage());
-            } else {
-                ResultUtil.error(e.getMessage());
-            }
-        }
-        return map;
-    }
-
     /**
      * 查询任务列表
      *
      * @param iPage
-     * @param schoolId
-     * @param printPlanId
      * @param status
      * @param type
      * @param result
      * @return
      */
     @Override
-    public IPage<TaskListResult> query(IPage<Map> iPage, Long schoolId, Long printPlanId, TaskStatusEnum status, TaskTypeEnum type, TaskResultEnum result) {
+    public IPage<TaskListResult> query(IPage<TaskListResult> iPage, TaskStatusEnum status, TaskTypeEnum type, TaskResultEnum result) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Set<Long> orgIds = libraryCommonService.listSubOrgIds(null);
-        return tbTaskMapper.query(iPage, schoolId, printPlanId, Objects.nonNull(status) ? status.name() : null, Objects.nonNull(type) ? type.name() : null, Objects.nonNull(result) ? result.name() : null, sysUser.getId(), orgIds);
+        return tbTaskMapper.query(iPage, schoolId, Objects.nonNull(status) ? status.name() : null, Objects.nonNull(type) ? type.name() : null, Objects.nonNull(result) ? result.name() : null, sysUser.getId(), orgIds);
     }
 
     /**
@@ -225,9 +76,6 @@ public class TBTaskServiceImpl extends ServiceImpl<TBTaskMapper, TBTask> impleme
                 Objects.nonNull(basicAttachment) ? basicAttachment.getPath() : null,
                 requestUser.getId(),
                 requestUser.getSchoolId());
-        if (Objects.nonNull(map.get("entityId"))) {
-            tbTask.setEntityId((Long) map.get("entityId"));
-        }
         map.computeIfAbsent(SystemConstant.TASK, v -> tbTask);
         map.computeIfAbsent(SystemConstant.USER, v -> requestUser);
         map.computeIfAbsent(SystemConstant.TB_TASK_ID, v -> tbTask.getId());

paper-library-common/src/main/resources/mapper/TBTaskMapper.xml

@@ -5,37 +5,33 @@
     <select id="query" resultType="com.qmth.paper.library.common.bean.result.TaskListResult">
         select
             tbt.id,
-            tbt.print_plan_id as printPlanId,
-            concat_ws('-', epp.name, tbt.obj_name) as printPlanName,
+            tbt.school_id schoolId,
+            tbt.org_id orgId,
             tbt.`type`,
             tbt.status,
             tbt.`result`,
+            tbt.import_file_name importFileName,
+            tbt.import_file_path importFilePath,
+            tbt.export_file_path exportFilePath,
+            tbt.txt_file_path txtFilePath,
+            tbt.`remark`,
             tbt.create_time as createTime,
             tbt.create_id as createId,
-            su.real_name as createName,
-            if(ISNULL(tbt.result_file_path),false,true) as hasResultFile,
-            if(ISNULL(tbt.report_file_path),false,true) as hasReportFile,
-            tbt.reset_count as resetCount,
-            tbt.error_message as errorMessage
-            from
+            su.real_name as createName
+        from
             t_b_task tbt
-            left join exam_print_plan epp on
-            epp.id = tbt.print_plan_id
             left join sys_user su on su.id = tbt.create_id
             <where>
                 <if test="schoolId != null and schoolId != ''">
                     and tbt.school_id = #{schoolId}
                 </if>
-                <if test="printPlanId != null and printPlanId != ''">
-                    and tbt.print_plan_id = #{printPlanId}
-                </if>
                 <if test="status != null and status != ''">
                     and tbt.status = #{status}
                 </if>
-                <if test="type != null and type != ''">
+                <if test="type != null">
                     and tbt.type = #{type}
                 </if>
-                <if test="result != null and result != ''">
+                <if test="result != null'">
                     and tbt.result = #{result}
                 </if>
                 <if test="orgIds != null and orgIds != '' and orgIds.size > 0">

paper-library/src/main/java/com/qmth/paper/library/api/PaperArchivesController.java

@@ -6,8 +6,12 @@ import com.qmth.paper.library.business.bean.result.EditResult;
 import com.qmth.paper.library.business.entity.PaperArchives;
 import com.qmth.paper.library.business.service.PaperArchivesService;
 import com.qmth.paper.library.common.contant.SystemConstant;
+import com.qmth.paper.library.common.entity.SysUser;
+import com.qmth.paper.library.common.enums.TaskTypeEnum;
+import com.qmth.paper.library.common.service.TBTaskService;
 import com.qmth.paper.library.common.util.Result;
 import com.qmth.paper.library.common.util.ResultUtil;
+import com.qmth.paper.library.common.util.ServletUtil;
 import io.swagger.annotations.*;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
@@ -17,6 +21,10 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * <p>
@@ -31,6 +39,9 @@ public class PaperArchivesController {
     @Resource
     private PaperArchivesService paperArchivesService;
 
+    @Resource
+    private TBTaskService tbTaskService;
+
     @ApiOperation(value = "分页查询")
     @PostMapping("/page")
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
@@ -78,4 +89,25 @@ public class PaperArchivesController {
         return ResultUtil.ok(paperArchivesService.delete(ids));
     }
 
+    @ApiOperation(value = "批量下载")
+    @PostMapping("/paper_download")
+    @ApiResponses({@ApiResponse(code = 200, message = "下载成功", response = EditResult.class)})
+    public Result paperDownload(@ApiParam(value = "档案ID") @RequestParam Long paperArchivesId,
+                                @ApiParam(value = "学院") @RequestParam(required = false) Long belongOrgId,
+                                @ApiParam(value = "专业") @RequestParam(required = false) String majorName,
+                                @ApiParam(value = "班级") @RequestParam(required = false) String clazzName,
+                                @ApiParam(value = "课程") @RequestParam(required = false) String courseName,
+                                @ApiParam(value = "任课老师") @RequestParam(required = false) String teacherName,
+                                @ApiParam(value = "教学班") @RequestParam(required = false) String teachClazzName,
+                                @ApiParam(value = "是否绑定") @RequestParam(required = false) Boolean isBind,
+                                @ApiParam(value = "模糊查询（姓名/学号）") @RequestParam(required = false) String param,
+                                @ApiParam(value = "id数组") @RequestParam(required = false) String ids) throws Exception {
+//        Map<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.PAPER_DOWNLOAD, arraysParams, (SysUser) ServletUtil.getRequestUser());
+//        asyncDownloadPdfTempleteService.exportTask(map);
+//        TBTask tbTask = Objects.nonNull(map.get(SystemConstant.TASK)) ? (TBTask) map.get(SystemConstant.TASK) : null;
+//        return Objects.nonNull(tbTask) ? ResultUtil.ok(new EditResult(tbTask.getId())) : ResultUtil.error("创建任务失败");
+        return ResultUtil.ok();
+    }
+
+
 }

paper-library/src/main/java/com/qmth/paper/library/api/TBTaskController.java

@@ -9,24 +9,20 @@ import com.qmth.paper.library.common.enums.TaskResultEnum;
 import com.qmth.paper.library.common.enums.TaskStatusEnum;
 import com.qmth.paper.library.common.enums.TaskTypeEnum;
 import com.qmth.paper.library.common.service.TBTaskService;
-import com.qmth.paper.library.common.util.RedisUtil;
 import com.qmth.paper.library.common.util.Result;
 import com.qmth.paper.library.common.util.ResultUtil;
-import com.qmth.paper.library.common.util.ServletUtil;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * <p>
@@ -46,30 +42,15 @@ public class TBTaskController {
     @Resource
     TBTaskService tbTaskService;
 
-    @Resource
-    RedisUtil redisUtil;
-
     @ApiOperation(value = "任务管理查询接口")
-    @RequestMapping(value = "/task/query", method = RequestMethod.POST)
+    @PostMapping("/t_b_task/query")
     @ApiResponses({@ApiResponse(code = 200, message = "任务管理列表信息", response = TaskListResult.class)})
-    public Result taskQuery(@ApiParam(value = "印刷计划id", required = false) @RequestParam(required = false) String printPlanId,
-                            @ApiParam(value = "任务状态", required = false) @RequestParam(required = false) TaskStatusEnum status,
+    public Result taskQuery(@ApiParam(value = "任务状态", required = false) @RequestParam(required = false) TaskStatusEnum status,
                             @ApiParam(value = "任务类型", required = false) @RequestParam(required = false) TaskTypeEnum type,
                             @ApiParam(value = "任务数据结果", required = false) @RequestParam(required = false) TaskResultEnum result,
                             @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                             @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        IPage<TaskListResult> taskListResultIPage = tbTaskService.query(new Page<>(pageNumber, pageSize), Objects.nonNull(ServletUtil.getRequestHeaderSchoolId()) ? Long.parseLong(ServletUtil.getRequestHeaderSchoolId().toString()) : null, SystemConstant.convertIdToLong(printPlanId), status, type, result);
-//        if (Objects.nonNull(taskListResultIPage) && Objects.nonNull(taskListResultIPage.getRecords()) && taskListResultIPage.getRecords().size() > 0) {
-//            List<TaskListResult> taskListResultList = taskListResultIPage.getRecords();
-//            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);
-//                }
-//            }
-//        }
+        IPage<TaskListResult> taskListResultIPage = tbTaskService.query(new Page<>(pageNumber, pageSize), status, type, result);
         return ResultUtil.ok(taskListResultIPage);
     }
 }

paper-library/src/main/resources/application-offline.properties

@@ -96,3 +96,8 @@ sms.config.aliyunSMSSecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
 sms.config.aliyunSMSSignName=\u9038\u6559\u4E91
 sms.config.aliyunSMSTplCode=SMS_147416565
 sms.config.aliyunSMSAuditPassCode=SMS_216425141
+
+
+ocr.config.appId=27869327
+ocr.config.appKey=0EatsWDMu4Ts4Q4I9eYZdgV7
+ocr.config.appSecret=rlEolf9jVqS9V0tsi6x4l9Eu4ATKnfYv

sql/paper-library-1.0.0.sql

@@ -368,7 +368,7 @@ INSERT INTO `sys_privilege` VALUES (5, '用户管理', 'UserManage', 'MENU', 2,
 INSERT INTO `sys_privilege` VALUES (6, '角色管理', 'RoleManage', 'MENU', 2, 3, NULL, NULL, 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (7, '权限管理', 'MenuManage', 'MENU', 129, 6, NULL, NULL, 0, 1, 1);
 INSERT INTO `sys_privilege` VALUES (8, '档案管理', 'archives', 'MENU', 1, 2, NULL, NULL, 1, 0, 1);
-INSERT INTO `sys_privilege` VALUES (9, '档案管理', 'ArchivesManage', 'MENU', 8, 1, NULL, '37,410', 1, 0, 1);
+INSERT INTO `sys_privilege` VALUES (9, '档案管理', 'ArchivesManage', 'MENU', 8, 1, NULL, '27,34,37,410', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (10, '列表', 'List', 'LIST', 9, 1, 'AUTH', '15,410', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (11, '新增', 'Add', 'BUTTON', 9, 2, 'AUTH', '16', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (12, '编辑', 'Edit', 'LINK', 9, 3, 'AUTH', '16', 1, 0, 1);