3.3.0 update

distributed-print/install/mysql/upgrade/3.3.0.sql

@@ -148,4 +148,6 @@ UPDATE `sys_privilege` SET `related` = '55,327,328' WHERE (`id` = '320');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('328', '查询考场下试卷列表', '/api/admin/exam/print/list_exam_detail_course', 'URL', '44', '9', 'AUTH', '1', '1', '1');
 ALTER TABLE `exam_student` ADD COLUMN `required_fields` MEDIUMTEXT NULL COMMENT '基础字段' AFTER `print_card`;
 
+INSERT INTO `sys_config` (`id`, `config_key`, `config_name`, `config_value`, `enable`, `sort`, `create_id`) VALUES ('41', 'package.barcode.position', '签到表条码坐标', '[0,0,0.5,0.5]', '1', '17', '1');
+
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -154,6 +154,7 @@ public class SystemConstant {
     //    public static final String SYS_MESSAGE_ENABLE = "sys.message.enable";
 //    public static final String SYS_MESSAGE_RESEND_COUNT = "sys.message.resendCount";
     public static final String SYS_CONFIG_KEY_CHARSETS = "sys.txt.charset";
+    public static final String PACKAGE_BARCODE_POSITION = "package.barcode.position";
     public static final String SYS_PDF_SIZE_LIST = "sys.pdf.size.list";
     public static final String ADMIN_LOGO_URL = "admin.logo.url";
     public static final String ATTACHMENT_TYPE = "attachment.type";

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/UploadFileEnum.java

@@ -13,27 +13,48 @@ public enum UploadFileEnum {
     /**
      * 客户端
      */
-    PAPER("paper","private"),
+    PAPER("paper", "private", ""),
     /**
      * 系统相关
      */
-    UPLOAD("upload","private"),
+    UPLOAD("upload", "private", ""),
     /**
      * 导入导出
      */
-    FILE("file","public"),
-
-    PDF("pdf","private"),
-    IMAGE("image","private"),
-
-    HTML("html","private");
+    FILE("file", "public", ""),
+    /**
+     * 打印pdf相关
+     */
+    PDF("pdf", "private", ""),
+    /**
+     * 题卡图片
+     */
+    IMAGE("image", "private", ""),
+    /**
+     * 题卡html文件
+     */
+    HTML("html", "private", ""),
+    /**
+     * 阅卷考生题卡原图
+     */
+    SHEET("sheet", "private", ""),
+    /**
+     * 卡格式文件
+     */
+    CARD("card", "private", ""),
+    /**
+     * 适配后卡格式文件
+     */
+    ADAPTE("adapte", "private", "");
 
     private String title;
     private String fssType;
+    private String pattern;
 
-    UploadFileEnum(String title, String fssType) {
+    UploadFileEnum(String title, String fssType, String pattern) {
         this.title = title;
         this.fssType = fssType;
+        this.pattern = pattern;
     }
 
     public String getTitle() {
@@ -44,6 +65,9 @@ public enum UploadFileEnum {
         return fssType;
     }
 
+    public String getPattern() {
+        return pattern;
+    }
 
     /**
      * 状态转换 toName

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/FilePathVo.java

@@ -0,0 +1,41 @@
+package com.qmth.teachcloud.mark.bean;
+
+public class FilePathVo {
+
+    private String path;
+    private String uploadType;
+    private String type;
+
+    public FilePathVo() {
+    }
+
+    public FilePathVo(String path, String uploadType, String type) {
+        this.path = path;
+        this.uploadType = uploadType;
+        this.type = type;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getUploadType() {
+        return uploadType;
+    }
+
+    public void setUploadType(String uploadType) {
+        this.uploadType = uploadType;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}