代码调整

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

@@ -114,8 +114,9 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
                     String type = jsonObject.getString(SystemConstant.TYPE);
                     if (Objects.nonNull(type) && type.equalsIgnoreCase(SystemConstant.LOCAL)) {
                         File file = new File(jsonObject.getString(SystemConstant.PATH));
-                        if (file.exists())
+                        if (file.exists()) {
                             FileUtils.forceDelete(file);
+                        }
                     }
                 }
             }

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

@@ -1,49 +1,49 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.qmth.boot.core.concurrent.annotation.Lockable;
-import com.qmth.distributed.print.business.entity.*;
-import com.qmth.distributed.print.business.enums.AssignModeEnum;
-import com.qmth.distributed.print.business.mapper.ExamTaskAssignPaperTypeMapper;
-import com.qmth.distributed.print.business.service.ExamDetailService;
-import com.qmth.distributed.print.business.service.ExamTaskAssignPaperTypeService;
-import com.qmth.distributed.print.business.util.CreatePdfUtil;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author xf
- * @since 2024-02-07
- */
-@Service
-public class ExamTaskAssignPaperTypeServiceImpl extends MppServiceImpl<ExamTaskAssignPaperTypeMapper, ExamTaskAssignPaperType> implements ExamTaskAssignPaperTypeService {
-
-    @Resource
-    ExamDetailService examDetailService;
-    @Resource
-    CreatePdfUtil createPdfUtil;
-
-    @Lockable(name = "#p0.examId + '-' + #p1.paperNumber")
-    @Override
-    public ExamTaskAssignPaperType extractPaperType(TBTaskPdf tbTaskPdf, ExamDetailCourse examDetailCourse) {
-        ExamDetail examDetail = examDetailService.getById(tbTaskPdf.getId());
-        if (examDetail.getExamStartTime() == null) {
-            examDetail.setExamStartTime(-1l);
-        }
-        if (examDetail.getExamEndTime() == null) {
-            examDetail.setExamEndTime(-1l);
-        }
-        ExamTaskAssignPaperType examTaskAssignPaperType = this.selectByMultiId(new ExamTaskAssignPaperType(tbTaskPdf.getExamId(), examDetailCourse.getPaperNumber(), examDetail.getExamStartTime(), examDetail.getExamEndTime()));
-        if (examTaskAssignPaperType == null) {
-            String paperType = createPdfUtil.getPaperType(examDetail.getPrintPlanId(), examDetail.getExamId(), examDetailCourse.getPaperNumber());
-            examTaskAssignPaperType = new ExamTaskAssignPaperType(tbTaskPdf.getExamId(), examDetailCourse.getPaperNumber(), examDetail.getExamStartTime(), examDetail.getExamEndTime(), paperType, AssignModeEnum.AUTO);
-            this.saveOrUpdateByMultiId(examTaskAssignPaperType);
-        }
-        return examTaskAssignPaperType;
-    }
-}
+package com.qmth.distributed.print.business.service.impl;
+
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.qmth.boot.core.concurrent.annotation.Lockable;
+import com.qmth.distributed.print.business.entity.*;
+import com.qmth.distributed.print.business.enums.AssignModeEnum;
+import com.qmth.distributed.print.business.mapper.ExamTaskAssignPaperTypeMapper;
+import com.qmth.distributed.print.business.service.ExamDetailService;
+import com.qmth.distributed.print.business.service.ExamTaskAssignPaperTypeService;
+import com.qmth.distributed.print.business.util.CreatePdfUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author xf
+ * @since 2024-02-07
+ */
+@Service
+public class ExamTaskAssignPaperTypeServiceImpl extends MppServiceImpl<ExamTaskAssignPaperTypeMapper, ExamTaskAssignPaperType> implements ExamTaskAssignPaperTypeService {
+
+    @Resource
+    ExamDetailService examDetailService;
+    @Resource
+    CreatePdfUtil createPdfUtil;
+
+    @Lockable(name = "#p0.examId + '-' + #p1.paperNumber")
+    @Override
+    public ExamTaskAssignPaperType extractPaperType(TBTaskPdf tbTaskPdf, ExamDetailCourse examDetailCourse) {
+        ExamDetail examDetail = examDetailService.getById(tbTaskPdf.getId());
+        if (examDetail.getExamStartTime() == null) {
+            examDetail.setExamStartTime(-1L);
+        }
+        if (examDetail.getExamEndTime() == null) {
+            examDetail.setExamEndTime(-1L);
+        }
+        ExamTaskAssignPaperType examTaskAssignPaperType = this.selectByMultiId(new ExamTaskAssignPaperType(tbTaskPdf.getExamId(), examDetailCourse.getPaperNumber(), examDetail.getExamStartTime(), examDetail.getExamEndTime()));
+        if (examTaskAssignPaperType == null) {
+            String paperType = createPdfUtil.getPaperType(examDetail.getPrintPlanId(), examDetail.getExamId(), examDetailCourse.getPaperNumber());
+            examTaskAssignPaperType = new ExamTaskAssignPaperType(tbTaskPdf.getExamId(), examDetailCourse.getPaperNumber(), examDetail.getExamStartTime(), examDetail.getExamEndTime(), paperType, AssignModeEnum.AUTO);
+            this.saveOrUpdateByMultiId(examTaskAssignPaperType);
+        }
+        return examTaskAssignPaperType;
+    }
+}

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

@@ -1043,7 +1043,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
             SysUser requestUser = (SysUser) map.get(SystemConstant.USER);
             DataPermissionRule dpr = null;
             if (CollectionUtils.isEmpty(idSet)) {
-                dpr = basicRoleDataPermissionService.findDataPermission(653l, requestUser);
+                dpr = basicRoleDataPermissionService.findDataPermission(653L, requestUser);
             }
             // 查询待下载数据
             List<ExamTaskDetailDto> examTaskDetailDtoList = downloadService.listExamQuery(semesterId, examId, orgId, courseName, idSet, dpr);