1.0.4 优化联调bug

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

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface PaperLibraryOtherService extends IService<PaperLibraryOther> {
 
+    void removeByPaperScanTaskId(Long paperScanTaskId);
 }

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

@@ -277,6 +277,10 @@ public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentMapper, ExamS
                 }
             }
 
+            if(StringUtils.isNotBlank(errorMsg.toString())){
+                throw ExceptionResultEnum.ERROR.exception(errorMsg.toString());
+            }
+
             basicStudent.setId(SystemConstant.getDbUuid());
             basicStudent.setSchoolId(sysUser.getSchoolId());
             basicStudent.setSemesterId(semesterId);

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

@@ -8,7 +8,6 @@ import com.itextpdf.text.pdf.PdfReader;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.paper.library.business.bean.vo.FilePathVo;
 import com.qmth.paper.library.business.bean.vo.PathSequenceVo;
-import com.qmth.paper.library.business.entity.PaperLibrary;
 import com.qmth.paper.library.business.entity.PaperScanTask;
 import com.qmth.paper.library.business.service.BasicExamService;
 import com.qmth.paper.library.business.service.BusinessCacheService;
@@ -17,7 +16,6 @@ import com.qmth.paper.library.business.service.PaperLibraryCommonService;
 import com.qmth.paper.library.common.bean.dto.OrgDto;
 import com.qmth.paper.library.common.config.DictionaryConfig;
 import com.qmth.paper.library.common.contant.SpringContextHolder;
-import com.qmth.paper.library.common.contant.SysSettingConstant;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.*;
 import com.qmth.paper.library.common.enums.ExceptionResultEnum;
@@ -30,10 +28,8 @@ import com.qmth.paper.library.common.util.ResultUtil;
 import com.qmth.paper.library.common.util.ServletUtil;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -277,7 +273,7 @@ public class PaperLibraryCommonServiceImpl implements PaperLibraryCommonService
             rootPath = fileStoreUtil.buildPath(UploadFileEnum.IMAGE, false, basicSchool.getName(), basicSemester.getName(), basicExam.getName(), courseNameCode, examStudent.getExamRoom());
         } else if (StoreTypeEnum.CLASS.equals(paperScanTask.getStoreType())) {
             rootPath = fileStoreUtil.buildPath(UploadFileEnum.IMAGE, false, basicSchool.getName(), basicSemester.getName(), basicExam.getName(), courseNameCode, examStudent.getClassName());
-        } else if(StoreTypeEnum.COURSE.equals(paperScanTask.getStoreType())) {
+        } else if (StoreTypeEnum.COURSE.equals(paperScanTask.getStoreType())) {
             rootPath = fileStoreUtil.buildPath(UploadFileEnum.IMAGE, false, basicSchool.getName(), basicSemester.getName(), basicExam.getName(), courseNameCode, examStudent.getStudentCode());
         }
         // 根目录
@@ -310,8 +306,10 @@ public class PaperLibraryCommonServiceImpl implements PaperLibraryCommonService
     @Override
     public PathSequenceVo saveLibraryOtherFile(PaperScanTask paperScanTask, UploadFileEnum uploadFileEnum, MultipartFile... files) {
         BasicSchool basicSchool = basicSchoolService.getById(paperScanTask.getSchoolId());
+        BasicExam basicExam = basicExamService.getById(paperScanTask.getExamId());
+        BasicSemester basicSemester = basicSemesterService.getById(basicExam.getSemesterId());
         String courseNameCode = String.format("%s(%s)", paperScanTask.getCourseName(), paperScanTask.getCourseCode());
-        String rootPath = fileStoreUtil.buildPath(UploadFileEnum.IMAGE, false, basicSchool.getCode(), courseNameCode, "other");
+        String rootPath = fileStoreUtil.buildPath(UploadFileEnum.IMAGE, false, basicSchool.getName(), basicSemester.getName(), basicExam.getName(), courseNameCode, "other");
         // 根目录
         List<FilePathVo> objects = new ArrayList<>();
         try {

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

@@ -1,5 +1,7 @@
 package com.qmth.paper.library.business.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.qmth.paper.library.business.entity.PaperLibrary;
 import com.qmth.paper.library.business.entity.PaperLibraryOther;
 import com.qmth.paper.library.business.mapper.PaperLibraryOtherMapper;
 import com.qmth.paper.library.business.service.PaperLibraryOtherService;
@@ -17,4 +19,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class PaperLibraryOtherServiceImpl extends ServiceImpl<PaperLibraryOtherMapper, PaperLibraryOther> implements PaperLibraryOtherService {
 
+    @Override
+    public void removeByPaperScanTaskId(Long paperScanTaskId) {
+        QueryWrapper<PaperLibraryOther> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(PaperLibraryOther::getPaperScanTaskId, paperScanTaskId);
+        this.remove(queryWrapper);
+    }
 }

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

@@ -9,6 +9,7 @@ import com.qmth.paper.library.business.bean.result.PaperScanTaskDetailResult;
 import com.qmth.paper.library.business.bean.result.PaperScanTaskResult;
 import com.qmth.paper.library.business.entity.ExamCourse;
 import com.qmth.paper.library.business.entity.PaperLibrary;
+import com.qmth.paper.library.business.entity.PaperLibraryOther;
 import com.qmth.paper.library.business.entity.PaperScanTask;
 import com.qmth.paper.library.business.mapper.PaperScanTaskMapper;
 import com.qmth.paper.library.business.service.*;
@@ -41,6 +42,7 @@ public class PaperScanTaskServiceImpl extends ServiceImpl<PaperScanTaskMapper, P
     private PaperLibraryCommonService paperLibraryCommonService;
     @Resource
     private PaperLibraryService paperLibraryService;
+    private PaperLibraryOtherService paperLibraryOtherService;
     @Resource
     private ExamStudentService examStudentService;
     @Resource
@@ -76,6 +78,8 @@ public class PaperScanTaskServiceImpl extends ServiceImpl<PaperScanTaskMapper, P
         }
         // 删除该任务扫描的的数据
         paperLibraryService.removeByPaperScanTaskId(paperScanTaskId);
+        // 删除任务扫描的其它文件
+        paperLibraryOtherService.removeByPaperScanTaskId(paperScanTaskId);
 
         // 重置扫描数量为0
         paperScanTask.setScanCount(0);