xiatian 2 年之前
父節點
當前提交
322aad19ba

+ 12 - 0
src/main/java/cn/com/qmth/scancloud/tools/config/SysProperty.java

@@ -26,6 +26,10 @@ public class SysProperty {
     
     //科目代码
     public static String SUBJECT_CODE;
+    //卡格式张数
+    public static String PAPER_COUNT;
+    //卡格式是否单面
+    public static String SINGLE_PAGE;
 
     // 自定义导入模板的列分隔符,为空时采用默认分隔符"|",特殊字符请用双引号括起来!
     public static String TEMPLATE_SEPARATOR;
@@ -143,5 +147,13 @@ public class SysProperty {
     public void batchSize(Integer batchSize) {
         BATCH_SIZE = batchSize;
     }
+    @Value("${scan.tool.paper-count}")
+    public void paperCount(String paperCount) {
+        PAPER_COUNT = paperCount;
+    }
+    @Value("${scan.tool.single-page}")
+    public void singlePage(String singlePage) {
+        SINGLE_PAGE = singlePage;
+    }
     
 }

+ 19 - 2
src/main/java/cn/com/qmth/scancloud/tools/service/impl/CardImportTask.java

@@ -41,6 +41,23 @@ public class CardImportTask extends AbstractTask {
         if (StringUtils.isBlank(subjectCode)) {
             throw new StatusException("【scan.tool.subject-code】未配置!");
         }
+        String paperCount = SysProperty.PAPER_COUNT;
+        if (StringUtils.isBlank(paperCount)) {
+            throw new StatusException("【scan.tool.paper-count】未配置!");
+        }
+        try {
+            Integer.valueOf(paperCount);
+        } catch (Exception e) {
+            throw new StatusException("【scan.tool.paper-count】值应为数字!");
+        }
+        String singlePage = SysProperty.SINGLE_PAGE;
+        if (StringUtils.isBlank(singlePage)) {
+            throw new StatusException("【scan.tool.single-page】未配置!");
+        }
+        singlePage=singlePage.trim();
+        if(!"true".equals(singlePage)&&!"false".equals(singlePage)) {
+            throw new StatusException("【scan.tool.single-page】值应为true或者false!");
+        }
         if (CommonService.findExam(examId) == null) {
             throw new StatusException("当前考试不存在!examId = " + examId);
         }
@@ -53,8 +70,8 @@ public class CardImportTask extends AbstractTask {
         Map<String, String> params = Maps.newHashMap();
         params.put("examId", examId.toString());
         params.put("subjectCode", subjectCode);
-        params.put("paperCount","2");
-        params.put("singlePage", "false");
+        params.put("paperCount",paperCount);
+        params.put("singlePage", singlePage);
         params.put("md5", MD5Util.md5Hex(file));
         String ret=HttpHelper.post(url, params,file);
         log.info("处理完毕,卡格式编号:"+ret);

+ 2 - 0
src/main/resources/application.properties

@@ -18,6 +18,8 @@ scan.tool.schoolId=
 scan.tool.schoolName=
 scan.tool.exam-id=116
 scan.tool.subject-code=101001
+scan.tool.paper-count=2
+scan.tool.single-page=true/false
 scan.tool.year=22
 scan.tool.year.half=1
 #file path