3.2.2-开发测试bug

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/CardRuleDto.java

@@ -15,6 +15,8 @@ public class CardRuleDto {
     private String schoolId;
     private String name;
     private ExamNumberStyleEnum examNumberStyle;
+
+    private Integer examNumberDigit;
     private PaperTypeEnum paperType;
     private Boolean examAbsent;
     private Boolean writeSign;
@@ -72,6 +74,14 @@ public class CardRuleDto {
         this.examNumberStyle = examNumberStyle;
     }
 
+    public Integer getExamNumberDigit() {
+        return examNumberDigit;
+    }
+
+    public void setExamNumberDigit(Integer examNumberDigit) {
+        this.examNumberDigit = examNumberDigit;
+    }
+
     public PaperTypeEnum getPaperType() {
         return paperType;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/BasicCardRule.java

@@ -44,6 +44,13 @@ public class BasicCardRule extends BaseEntity implements Serializable {
      */
     @TableField("exam_number_style")
     private ExamNumberStyleEnum examNumberStyle;
+
+    /**
+     * 考号位数
+     */
+    @TableField("exam_number_digit")
+    private Integer examNumberDigit;
+
     /**
      * PRINT-印刷条码，FILL-卡号填涂
      */
@@ -155,6 +162,14 @@ public class BasicCardRule extends BaseEntity implements Serializable {
         this.examNumberStyle = examNumberStyle;
     }
 
+    public Integer getExamNumberDigit() {
+        return examNumberDigit;
+    }
+
+    public void setExamNumberDigit(Integer examNumberDigit) {
+        this.examNumberDigit = examNumberDigit;
+    }
+
     public PaperTypeEnum getPaperType() {
         return paperType;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/BasicExamRule.java

@@ -46,9 +46,6 @@ public class BasicExamRule extends BaseEntity implements Serializable {
     @TableField("extend_fields")
     private String extendFields;
 
-    @TableField("exam_number_digit")
-    private Integer examNumberDigit;
-
     @TableField("sign_scope")
     private String signScope;
 
@@ -91,14 +88,6 @@ public class BasicExamRule extends BaseEntity implements Serializable {
         this.extendFields = extendFields;
     }
 
-    public Integer getExamNumberDigit() {
-        return examNumberDigit;
-    }
-
-    public void setExamNumberDigit(Integer examNumberDigit) {
-        this.examNumberDigit = examNumberDigit;
-    }
-
     public String getSignScope() {
         return signScope;
     }

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

@@ -265,7 +265,7 @@ public interface PrintCommonService {
      * @param sysUser                        请求用户
      * @return 结果
      */
-    List<ExamStudent> createBatchStudentByStudentList(Long schoolId, String paperNumber, String extendFields, List<ExamTaskStudentObjectParam> examTaskStudentObjectParamList, Long examDetailCourseId, String examShortCode, String courseShortCode, SysUser sysUser);
+    List<ExamStudent> createBatchStudentByStudentList(Long schoolId, String paperNumber, String extendFields, List<ExamTaskStudentObjectParam> examTaskStudentObjectParamList, Long examDetailCourseId, String examShortCode, String courseShortCode, Long cardRuleId, SysUser sysUser);
 
     /**
      * 生成准考证号

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

@@ -68,7 +68,6 @@ public class BasicExamRuleServiceImpl extends ServiceImpl<BasicExamRuleMapper, B
             basicExamRule.setRequiredFields(JSON.toJSONString(requiredObjects));
             String emptyObject = JSON.toJSONString(new ArrayList<>());
             basicExamRule.setExtendFields(emptyObject);
-            basicExamRule.setExamNumberDigit(8);
             basicExamRule.setSignScope(emptyObject);
             basicExamRule.setPackageScope(emptyObject);
         }
@@ -130,9 +129,6 @@ public class BasicExamRuleServiceImpl extends ServiceImpl<BasicExamRuleMapper, B
                         throw ExceptionResultEnum.ERROR.exception("有未结束的印刷计划，不能修改扩展字段");
                     }
                 }
-                if (!basicExamRule.getExamNumberDigit().equals(examRule.getExamNumberDigit())) {
-                    throw ExceptionResultEnum.ERROR.exception("有未结束的印刷计划，不能修改考号位数");
-                }
             }
             examRule.updateInfo(sysUser.getId());
             examRule.setOrgId(sysUser.getOrgId());

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

@@ -635,7 +635,7 @@ public class ClientServiceImpl implements ClientService {
             if (printType.equals(contentMap.get("type").toString())) {
 //                vMap.put("htmlUrl", teachcloudCommonService.filePreviewByPathAndType(path.get("htmlPath").toString(), path.get("type").toString(), false));
 //                vMap.put("htmlMd5", path.get("htmlMd5"));
-                vMap.put("pdfUrl", teachcloudCommonService.filePreviewByPathAndType(path.get("pdfPath").toString(), path.get("type").toString(), false));
+                vMap.put("pdfUrl", teachcloudCommonService.filePreviewByPathAndType(path.get(SystemConstant.PDF_PATH).toString(), path.get(SystemConstant.UPLOAD_TYPE).toString(), path.get("type").toString(), false));
                 vMap.put("pdfMd5", path.get("pdfMd5").toString().toLowerCase());
             }
         }

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

@@ -184,7 +184,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
                 JSONObject object = jsonArray.getJSONObject(i);
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put(SystemConstant.TYPE, Objects.nonNull(object.get("printType")) ? PdfTypeEnum.valueOf((String) object.get("printType")) : null);
-                jsonObject.put("url", Objects.nonNull(object.get(SystemConstant.PDF_PATH)) ? teachcloudCommonService.filePreviewByPathAndType((String) object.get(SystemConstant.PDF_PATH), (String) object.get("type"), false) : null);
+                jsonObject.put("url", Objects.nonNull(object.get(SystemConstant.PDF_PATH)) ? teachcloudCommonService.filePreviewByPathAndType((String) object.get(SystemConstant.PDF_PATH),(String) object.get(SystemConstant.UPLOAD_TYPE), (String) object.get("type"), false) : null);
                 list.add(jsonObject);
             }
         }

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

@@ -1694,7 +1694,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
                         // 更新实际考生数量
                         List<ExamTaskStudentObjectParam> examTaskStudentObjectParamList = examDetailList.getExamTaskStudentObjectParamList();
-                        List<ExamStudent> examStudents = printCommonService.createBatchStudentByStudentList(schoolId, paperNumber, examDetailList.getExtendFields(), examTaskStudentObjectParamList, examDetailCourse.getId(), basicExam.getShortCode(), basicCourse.getShortCode(), sysUser);
+                        List<ExamStudent> examStudents = printCommonService.createBatchStudentByStudentList(schoolId, paperNumber, examDetailList.getExtendFields(), examTaskStudentObjectParamList, examDetailCourse.getId(), basicExam.getShortCode(), basicCourse.getShortCode(), basicPrintConfig.getCardRuleId(), sysUser);
                         if (!CollectionUtils.isEmpty(examStudents)) {
                             examStudentService.insertBatch(examStudents);
                         }

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

@@ -127,7 +127,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
     RedisUtil redisUtil;
 
     @Resource
-    BasicSchoolService basicSchoolService;
+    BasicCardRuleService basicCardRuleService;
 
     @Resource
     BasicExamService basicExamService;
@@ -297,9 +297,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
             object.put("pdfMd5", pdfFileMd5);
             object.put(SystemConstant.PDF_PATH, pdfDirName);
             object.put(SystemConstant.TYPE, ossStr);
-            object.put(SystemConstant.UPLOAD_TYPE, new UploadFileEnum[]{
-                    UploadFileEnum.PDF
-            });
+            object.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.PDF);
             jsonArray.add(object);
             attachmentPath.put(SystemConstant.PATH, jsonArray);
             examDetail.setAttachmentPath(attachmentPath.toJSONString());
@@ -1112,10 +1110,10 @@ public class PrintCommonServiceImpl implements PrintCommonService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public List<ExamStudent> createBatchStudentByStudentList(Long schoolId, String paperNumber, String extendFields, List<ExamTaskStudentObjectParam> examTaskStudentObjectParamList, Long examDetailCourseId, String examShortCode, String courseShortCode, SysUser sysUser) {
+    public List<ExamStudent> createBatchStudentByStudentList(Long schoolId, String paperNumber, String extendFields, List<ExamTaskStudentObjectParam> examTaskStudentObjectParamList, Long examDetailCourseId, String examShortCode, String courseShortCode, Long cardRuleId, SysUser sysUser) {
         AtomicInteger atomicInteger = new AtomicInteger(1);
 
-        BasicExamRule basicExamRule = basicExamRuleService.getBySchoolId(schoolId);
+        BasicCardRule basicCardRule = basicCardRuleService.getById(cardRuleId);
 
         Map<String, String> map = new HashMap<>();
         List<ExamStudent> examStudentList = new ArrayList<>();
@@ -1159,8 +1157,8 @@ public class PrintCommonServiceImpl implements PrintCommonService {
             examStudent.setPaperNumber(paperNumber);
             examStudent.setCollegeName(basicStudentResult.getCollegeName());
             examStudent.setMajorName(basicStudentResult.getMajorName());
-            String prefix = convertUtil.randomNumberPrefix(examShortCode, courseShortCode, map.get(String.valueOf(basicClazzId)), basicExamRule.getExamNumberDigit());
-            SerialNumberParams ticketNumberParams = new SerialNumberParams(SystemConstant.NUMBER_CACHE + "ticketNumber-" + schoolId, prefix, basicExamRule.getExamNumberDigit() - prefix.length());
+            String prefix = convertUtil.randomNumberPrefix(examShortCode, courseShortCode, map.get(String.valueOf(basicClazzId)), basicCardRule.getExamNumberDigit());
+            SerialNumberParams ticketNumberParams = new SerialNumberParams(SystemConstant.NUMBER_CACHE + "ticketNumber-" + schoolId, prefix, basicCardRule.getExamNumberDigit() - prefix.length());
             examStudent.setTicketNumber(createTempNumber(ticketNumberParams));
             examStudent.setSiteNumber(String.valueOf(atomicInteger.getAndIncrement()));
             examStudent.setExtendFields(extendFields);

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

@@ -131,9 +131,7 @@ public class CreatePdfUtil {
                 object.put(SystemConstant.PDF_PATH, localFile.getPath());
                 object.put(SystemConstant.TYPE, SystemConstant.OSS);
             }
-            object.put(SystemConstant.UPLOAD_TYPE, new UploadFileEnum[]{
-                    UploadFileEnum.PDF
-            });
+            object.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.PDF);
             PdfDto pdfDto = PdfUtil.addPdfPage(localFile);
 
             byte[] data = ByteArray.fromFile(localFile).value();

distributed-print-business/src/main/resources/mapper/BasicCardRuleMapper.xml

@@ -8,6 +8,7 @@
         <result column="school_id" property="schoolId" />
         <result column="name" property="name" />
         <result column="exam_number_style" property="examNumberStyle" />
+        <result column="exam_number_digit" property="examNumberDigit" />
         <result column="paper_type" property="paperType" />
         <result column="exam_absent" property="examAbsent" />
         <result column="write_sign" property="writeSign" />
@@ -29,7 +30,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        select id, school_id, name, exam_number_style, paper_type, exam_absent, write_sign, discipline, required_fields, extend_fields, title_rule, attention, objective_attention, subjective_attention, enable, remark, create_id, create_time, update_id, update_time, fill_number from basic_card_rule
+        select id, school_id, name, exam_number_style,exam_number_digit, paper_type, exam_absent, write_sign, discipline, required_fields, extend_fields, title_rule, attention, objective_attention, subjective_attention, enable, remark, create_id, create_time, update_id, update_time, fill_number from basic_card_rule
     </sql>
     <select id="listPage" resultType="com.qmth.distributed.print.business.bean.dto.CardRuleDto">
         <include refid="Base_Column_List"></include>

distributed-print-business/src/main/resources/mapper/BasicPrintConfigMapper.xml

@@ -7,6 +7,8 @@
         <result column="id" property="id" />
         <result column="school_id" property="schoolId" />
         <result column="enable" property="enable" />
+        <result column="review" property="review" />
+        <result column="print_method" property="printMethod" />
         <result column="card_rule_id" property="cardRuleId" />
         <result column="print_content" property="printContent" />
         <result column="backup_method" property="backupMethod" />
@@ -22,7 +24,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, school_id, enable, card_rule_id, print_content, backup_method, backup_count, draw_rule, variable_content, ordinary_content, create_id, create_time, update_id, update_time
+        id, school_id, enable,review, print_method, card_rule_id, print_content, backup_method, backup_count, draw_rule, variable_content, ordinary_content, create_id, create_time, update_id, update_time
     </sql>
 
     <select id="listPage" resultType="com.qmth.distributed.print.business.bean.dto.BasicPrintConfigDto">

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

@@ -434,7 +434,7 @@ public class SysController {
             SysConfig sysConfig = commonCacheService.addSysConfigCache(basicSchool.getId(), SystemConstant.ACCOUNT_SMS_VERIFY);
             Map<String, Object> map = new HashMap<>();
 
-            if (Objects.nonNull(basicSchool.getLogo()) && (!basicSchool.getLogo().startsWith("http") || !basicSchool.getLogo().startsWith("https"))) {
+            if (Objects.nonNull(basicSchool.getLogo()) && (!basicSchool.getLogo().startsWith("http") && !basicSchool.getLogo().startsWith("https") && !basicSchool.getLogo().startsWith("data:image/png;base64"))) {
                 map.put(SystemConstant.LOGO, SystemConstant.getLocalFilePath(basicSchool.getLogo()));
             } else {
                 map.put(SystemConstant.LOGO, basicSchool.getLogo());

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

@@ -131,7 +131,7 @@ public interface TeachcloudCommonService {
      * @param path
      * @return
      */
-    public String filePreviewByPathAndType(String path, String type, Boolean isExpire);
+    public String filePreviewByPathAndType(String path, String uploadType, String type, Boolean isExpire);
 
     /**
      * 文件预览

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

@@ -473,7 +473,7 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
      * @return
      */
     @Override
-    public String filePreviewByPathAndType(String path, String type, Boolean isExpire) {
+    public String filePreviewByPathAndType(String path, String uploadType, String type, Boolean isExpire) {
         if (StringUtils.isBlank(path)) {
             return null;
         }
@@ -484,7 +484,8 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
             } else if (path.contains(dictionaryConfig.fssPublicDomain().getServer())) {
                 pathUrl = path.substring(path.indexOf(dictionaryConfig.fssPublicDomain().getServer()), path.length());
             } else {
-                pathUrl = fileStoreUtil.getPrivateUrl(path, fileStoreUtil.getUploadEnumByPath(path).getFssType());
+                UploadFileEnum uploadFileEnum = UploadFileEnum.valueOf(uploadType);
+                pathUrl = fileStoreUtil.getPrivateUrl(path, uploadFileEnum.getFssType());
             }
         } else {
             pathUrl = fileStoreUtil.getPrivateUrl(path, fileStoreUtil.getUploadEnumByPath(path).getFssType());