fixbugs

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/model/AnswerCard.java

@@ -42,6 +42,8 @@ public class AnswerCard implements Serializable {
 
     private String remark;
 
+    private String md5;
+
     @Temporal(TemporalType.TIMESTAMP)
     @Column(name = "update_time")
     private Date updateTime;
@@ -130,4 +132,12 @@ public class AnswerCard implements Serializable {
         this.updateTime = updateTime;
     }
 
+    public String getMd5() {
+        return md5;
+    }
+
+    public void setMd5(String md5) {
+        this.md5 = md5;
+    }
+
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/file/service/impl/FileServiceImpl.java

@@ -304,7 +304,7 @@ public class FileServiceImpl implements FileService, InitializingBean, Disposabl
 
     @Override
     public String getAnswerCardUri(int examId, int number) {
-        return FileType.ANSWER_CARD.getPath(examId, number, FormatType.ZIP);
+        return FileType.ANSWER_CARD.getPath(examId, number, FormatType.JSON.getExtName());
     }
 
     public static void main(String[] args) throws Exception {

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/CardController.java

@@ -35,7 +35,6 @@ import cn.com.qmth.stmms.common.enums.CardSource;
 import cn.com.qmth.stmms.common.enums.ExamStatus;
 import cn.com.qmth.stmms.common.enums.ExamType;
 import cn.com.qmth.stmms.common.enums.Role;
-import cn.com.qmth.stmms.common.utils.DateUtils;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
 
 @Controller("cardController")
@@ -102,6 +101,7 @@ public class CardController extends BaseApiController {
                 card.setExamId(examId);
                 card.setNumber(number);
             }
+            card.setMd5(md5);
             card.setNeedAdapte(needAdapte);
             card.setPaperCount(paperCount);
             card.setParameter(parameter);
@@ -147,11 +147,12 @@ public class CardController extends BaseApiController {
                 result.accumulate("subjectName", "");
             }
             result.accumulate("paperCount", answerCard.getPaperCount() == null ? "" : answerCard.getPaperCount());
-            result.accumulate("path", answerCard.getNumber());
+            result.accumulate("path", fileService.getAnswerCardUri(answerCard.getExamId(), answerCard.getNumber()));
+            result.accumulate("md5", answerCard.getMd5());
             result.accumulate("source", answerCard.getSource().toString());
-            result.accumulate("parameter", answerCard.getParameter());
+            result.accumulate("parameter", StringUtils.trimToEmpty(answerCard.getParameter()));
             result.accumulate("singlePage", answerCard.getSinglePage());
-            result.accumulate("remark", StringUtils.trimToEmpty(answerCard.getRemark()));
+            result.accumulate("remark", StringUtils.trimToEmpty(StringUtils.trimToEmpty(answerCard.getRemark())));
             result.accumulate("updateTime", answerCard.getUpdateTime().getTime());
             array.add(result);
         }

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/ExamController.java

@@ -77,7 +77,9 @@ public class ExamController extends BaseApiController {
             obj.accumulate("id", exam.getId());
             obj.accumulate("name", exam.getName());
             obj.accumulate("examTime", exam.getExamTime().getTime());
-            obj.accumulate("config", StringUtils.trimToEmpty(exam.getScanConfig()));
+            if (StringUtils.isBlank(exam.getScanConfig())) {
+                obj.accumulate("config", exam.getScanConfig());
+            }
             array.add(obj);
         }
         return array;