3.0.0-bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamTaskMapper.java

@@ -93,7 +93,7 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
 
     List<ExamTask> listExamTaskAuditExpire(@Param("startTime") Long startTime, @Param("endTime") Long endTime);
 
-    List<ExamTaskDetailDto> listTaskPaper(@Param("schoolId") Long schoolId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("cardRuleId") Long cardRuleId, @Param("makeMethod") MakeMethodEnum makeMethod, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("orgIds") Set<Long> orgIds, @Param("containsQuestionTeacher") boolean containsQuestionTeacher, @Param("userId") Long userId);
+    List<ExamTaskDetailDto> listTaskPaper(@Param("schoolId") Long schoolId,@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("cardRuleId") Long cardRuleId, @Param("makeMethod") MakeMethodEnum makeMethod, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("orgIds") Set<Long> orgIds, @Param("containsQuestionTeacher") boolean containsQuestionTeacher, @Param("userId") Long userId);
 
     /**
      * 获取待办任务

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

@@ -2,6 +2,7 @@ package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.entity.BasicVerifyCode;
+import com.qmth.teachcloud.common.entity.SysUser;
 
 /**
  * <p>
@@ -13,5 +14,5 @@ import com.qmth.distributed.print.business.entity.BasicVerifyCode;
  */
 public interface BasicVerifyCodeService extends IService<BasicVerifyCode> {
 
-    void sendVeirfyCode(String mobileNumber, Long id);
+    void sendVeirfyCode(String mobileNumber, SysUser sysUser);
 }

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

@@ -152,9 +152,9 @@ public interface ExamTaskService extends IService<ExamTask> {
      */
     void sendSmsOverdueTask();
 
-    List<ExamTaskDetailDto> listTaskPaper(String courseCode, String paperNumber, Long cardRuleId, MakeMethodEnum makeMethod, Long startTime, Long endTime);
+    List<ExamTaskDetailDto> listTaskPaper(Long semesterId, Long examId, String courseCode, String paperNumber, Long cardRuleId, MakeMethodEnum makeMethod, Long startTime, Long endTime);
 
-    TBTask taskDownloadPdf(String courseCode, String paperNumber, Long cardRuleId, MakeMethodEnum makeMethod, Long startTime, Long endTime);
+    TBTask taskDownloadPdf(Long semesterId , Long examId, String courseCode, String paperNumber, Long cardRuleId, MakeMethodEnum makeMethod, Long startTime, Long endTime);
 
     /**
      * 获取待办任务

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

@@ -15,12 +15,15 @@ import com.qmth.distributed.print.business.mapper.BasicVerifyCodeMapper;
 import com.qmth.distributed.print.business.service.BasicVerifyCodeService;
 import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.entity.SysConfig;
+import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.service.SysConfigService;
+import com.qmth.teachcloud.common.service.SysUserService;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -42,7 +45,7 @@ public class BasicVerifyCodeServiceImpl extends ServiceImpl<BasicVerifyCodeMappe
     private SysConfigService sysConfigService;
 
     @Override
-    public void sendVeirfyCode(String mobileNumber, Long userId) {
+    public void sendVeirfyCode(String mobileNumber, SysUser sysUser) {
         SysConfig sysConfig = sysConfigService.getByKey("sys.code.enable");
         if (sysConfig.getConfigValue() == null) {
             throw ExceptionResultEnum.ERROR.exception("短信验证码启用开关未设置");
@@ -50,9 +53,8 @@ public class BasicVerifyCodeServiceImpl extends ServiceImpl<BasicVerifyCodeMappe
         if (sysConfig.getConfigValue().equals("false")) {
             throw ExceptionResultEnum.ERROR.exception("短信验证码已关闭");
         }
-        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         QueryWrapper<BasicVerifyCode> wrapper = new QueryWrapper<>();
-        wrapper.lambda().eq(BasicVerifyCode::getSchoolId, schoolId).eq(BasicVerifyCode::getMobileNumber, mobileNumber).eq(BasicVerifyCode::getUserId, userId);
+        wrapper.lambda().eq(BasicVerifyCode::getMobileNumber, mobileNumber).eq(BasicVerifyCode::getUserId, sysUser.getId());
         BasicVerifyCode basicVerifyCode = this.getOne(wrapper);
         if (basicVerifyCode != null) {
             Date oldCreateTime = new Date(basicVerifyCode.getCreateTime());
@@ -101,20 +103,20 @@ public class BasicVerifyCodeServiceImpl extends ServiceImpl<BasicVerifyCodeMappe
                 Integer codeExpiredTime = dictionaryConfig.smsDomain().getCodeExpiredTime();
                 if (basicVerifyCode == null) {
                     basicVerifyCode = new BasicVerifyCode();
-                    basicVerifyCode.setUserId(userId);
-                    basicVerifyCode.setSchoolId(schoolId);
+                    basicVerifyCode.setUserId(sysUser.getId());
+                    basicVerifyCode.setSchoolId(sysUser.getSchoolId());
                     basicVerifyCode.setMobileNumber(mobileNumber);
                     basicVerifyCode.setExpireTime(processMiniute(new Date(), codeExpiredTime));
                     basicVerifyCode.setValidPeriod(codeExpiredTime);
                     basicVerifyCode.setVerifyCode(verifyCode);
-                    basicVerifyCode.setCreateId(userId);
+                    basicVerifyCode.setCreateId(sysUser.getId());
                     basicVerifyCode.setCreateTime(System.currentTimeMillis());
                     this.save(basicVerifyCode);
                 } else {
                     basicVerifyCode.setExpireTime(processMiniute(new Date(), codeExpiredTime));
                     basicVerifyCode.setValidPeriod(codeExpiredTime);
                     basicVerifyCode.setVerifyCode(verifyCode);
-                    basicVerifyCode.setUpdateId(userId);
+                    basicVerifyCode.setUpdateId(sysUser.getId());
                     basicVerifyCode.setUpdateTime(System.currentTimeMillis());
                     this.updateById(basicVerifyCode);
                 }

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

@@ -1364,7 +1364,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     }
 
     @Override
-    public List<ExamTaskDetailDto> listTaskPaper(String courseCode, String paperNumber, Long cardRuleId, MakeMethodEnum makeMethod, Long startTime, Long
+    public List<ExamTaskDetailDto> listTaskPaper(Long semesterId, Long examId, String courseCode, String paperNumber, Long cardRuleId, MakeMethodEnum makeMethod, Long startTime, Long
             endTime) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         // 查询用户角色是否包含命题老师
@@ -1372,13 +1372,12 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         boolean containsQuestionTeacher = list.stream().filter(m -> RoleTypeEnum.QUESTION_TEACHER.equals(m.getType())).count() > 0;
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
-        List<ExamTaskDetailDto> examTaskDetailDtos = this.baseMapper.listTaskPaper(schoolId, courseCode, paperNumber, cardRuleId, makeMethod, startTime, endTime, orgIds, containsQuestionTeacher, sysUser.getId());
-        return examTaskDetailDtos;
+        return this.baseMapper.listTaskPaper(schoolId, semesterId, examId, courseCode, paperNumber, cardRuleId, makeMethod, startTime, endTime, orgIds, containsQuestionTeacher, sysUser.getId());
     }
 
     @Override
-    public TBTask taskDownloadPdf(String courseCode, String paperNumber, Long cardRuleId, MakeMethodEnum makeMethod, Long startTime, Long endTime) {
-        List<ExamTaskDetailDto> examTasks = this.listTaskPaper(courseCode, paperNumber, cardRuleId, makeMethod, startTime, endTime);
+    public TBTask taskDownloadPdf(Long semesterId, Long examId, String courseCode, String paperNumber, Long cardRuleId, MakeMethodEnum makeMethod, Long startTime, Long endTime) {
+        List<ExamTaskDetailDto> examTasks = this.listTaskPaper(semesterId, examId, courseCode, paperNumber, cardRuleId, makeMethod, startTime, endTime);
         if (CollectionUtils.isEmpty(examTasks)) {
             throw ExceptionResultEnum.ERROR.exception("没有可导出数据");
         }

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

@@ -1025,7 +1025,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                 throw ExceptionResultEnum.ERROR.exception("找不到答题卡");
             }
             MakeMethodEnum makeMethodEnum = examCard.getMakeMethod();
-            if (MakeMethodEnum.SELECT.equals(makeMethodEnum)) {
+            if (MakeMethodEnum.SELECT.equals(makeMethodEnum) && CardCreateMethodEnum.UPLOAD.equals(examCard.getCreateMethod())) {
                 Long attachmentId = examCard.getAttachmentId();
                 if (attachmentId == null || attachmentId == 0) {
                     throw ExceptionResultEnum.ERROR.exception("找不到模板对应的附件");

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -1022,8 +1022,15 @@ public class CreatePdfUtil {
         String packageCode = examDetail.getPackageCode() + sequence;
         String packageCodeImg = GoogleBarCodeUtil.createBarCode(packageCode, false);
 
-        String packageCodeDiv = "<div class=\"page-box page-box-0\"><div class=\"package-number\" style=\"position: absolute;width: 200px;height: 40px;top: 10px;right: 25%;margin-left: -100px;text-align: center;z-index: 99;\"><img src=\"data:image/png;base64," + packageCodeImg + "\" style=\"display: block; height: 28px; width: 100%\" /><p style=\"line-height: 1; font-size: 12px; margin: 0;\">" + packageCode + "</p></div>";
-        cardTemp = cardTemp.replaceAll("<div class=\"page-box page-box-0\">", packageCodeDiv);
+        if(cardTemp.contains("<div class=\"page-box page-box-A3 page-box-0\">")){
+            String packageCodeDiv = "<div class=\"page-box page-box-A3 page-box-0\"><div class=\"package-number\" style=\"position: absolute;width: 200px;height: 40px;top: 10px;right: 25%;margin-left: -100px;text-align: center;z-index: 99;\"><img src=\"data:image/png;base64," + packageCodeImg + "\" style=\"display: block; height: 28px; width: 100%\" /><p style=\"line-height: 1; font-size: 12px; margin: 0;\">" + packageCode + "</p></div>";
+            cardTemp = cardTemp.replaceAll("<div class=\"page-box page-box-A3 page-box-0\">", packageCodeDiv);
+        } else if(cardTemp.contains("<div class=\"page-box page-box-A4 page-box-0\">")){
+            String packageCodeDiv = "<div class=\"page-box page-box-A4 page-box-0\"><div class=\"package-number\" style=\"position: absolute;width: 200px;height: 40px;top: 10px;right: 25%;margin-left: -100px;text-align: center;z-index: 99;\"><img src=\"data:image/png;base64," + packageCodeImg + "\" style=\"display: block; height: 28px; width: 100%\" /><p style=\"line-height: 1; font-size: 12px; margin: 0;\">" + packageCode + "</p></div>";
+            cardTemp = cardTemp.replaceAll("<div class=\"page-box page-box-A4 page-box-0\">", packageCodeDiv);
+        }
+
+
         BasicAttachment cardAttachment = printCommonService.saveAttachmentHtml(examDetail.getSchoolId() + "|" + examDetailCourse.getCourseCode(), cardTemp, userId, cardPdfList);
         JSONObject object = new JSONObject();
         object.put("name", examDetailCourse.getPaperType());

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

@@ -595,13 +595,15 @@ public class ExamTaskController {
     @ApiOperation(value = "卷库查询-批量下载试卷PDF、题卡")
     @RequestMapping(value = "/paper_card_download_pdf", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
-    public Result paperCardDownloadPdf(@RequestParam(value = "courseCode", required = false) String courseCode,
+    public Result paperCardDownloadPdf(@RequestParam(value = "semesterId", required = false) Long semesterId,
+                                       @RequestParam(value = "examId", required = false) Long examId,
+                                       @RequestParam(value = "courseCode", required = false) String courseCode,
                                        @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                        @RequestParam(value = "cardRuleId", required = false) Long cardRuleId,
                                        @RequestParam(value = "makeMethod", required = false) MakeMethodEnum makeMethod,
                                        @RequestParam(value = "startTime", required = false) Long startTime,
                                        @RequestParam(value = "endTime", required = false) Long endTime) {
-        TBTask tbTask = examTaskService.taskDownloadPdf(courseCode, paperNumber, cardRuleId, makeMethod, startTime, endTime);
+        TBTask tbTask = examTaskService.taskDownloadPdf(semesterId, examId, courseCode, paperNumber, cardRuleId, makeMethod, startTime, endTime);
         return Objects.nonNull(tbTask) ? ResultUtil.ok(new EditResult(tbTask.getId())) : ResultUtil.error("创建任务失败");
     }
 

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

@@ -274,7 +274,7 @@ public class SysController {
         }
 
         if (SystemConstant.strNotNull(mobileNumber)) {
-            basicVerifyCodeService.sendVeirfyCode(mobileNumber, sysUser.getId());
+            basicVerifyCodeService.sendVeirfyCode(mobileNumber, sysUser);
         }
         int pwdCount = sysUser.getPwdCount();
         List<SysRole> sysRoleList = sysUserRoleService.listRoleByUserId(sysUser.getId());
@@ -340,7 +340,7 @@ public class SysController {
         }
 
         // 发送短信验证码
-        basicVerifyCodeService.sendVeirfyCode(mobileNumber, sysUser.getId());
+        basicVerifyCodeService.sendVeirfyCode(mobileNumber, sysUser);
 
         int pwdCount = sysUser.getPwdCount();
         List<SysRole> sysRoleList = sysUserRoleService.listRoleByUserId(sysUser.getId());

distributed-print/src/test/java/com/qmth/distributed/print/ServiceTest.java

@@ -114,7 +114,7 @@ public class ServiceTest {
 
     @Test
     public void sendVerifyCode() {
-        basicVerifyCodeService.sendVeirfyCode("18903719928", 1L);
+        basicVerifyCodeService.sendVeirfyCode("18903719928", null);
     }
 
     @Test

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/SysController.java

@@ -212,7 +212,7 @@ public class SysController {
 
             throw ExceptionResultEnum.ERROR.exception("用户未绑定手机号码");
         }
-        basicVerifyCodeService.sendVeirfyCode(mobileNumber, user.getId());
+        basicVerifyCodeService.sendVeirfyCode(mobileNumber, user);
         return ResultUtil.ok(mobileNumber, "");
     }