fixbugs

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

@@ -113,7 +113,7 @@ public class CardController extends BaseApiController {
             answerCardService.save(card);
             JSONObject result = new JSONObject();
             result.accumulate("number", number);
-            result.accumulate("updateTime", DateUtils.formatDateTime(new Date()));
+            result.accumulate("updateTime", System.currentTimeMillis());
             return result;
         } catch (Exception e) {
             log.error("card upload error", e);

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

@@ -1,15 +1,13 @@
 package cn.com.qmth.stmms.api.controller;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,23 +17,19 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
 
 import cn.com.qmth.stmms.api.exception.ApiException;
-import cn.com.qmth.stmms.biz.exam.model.AnswerCard;
 import cn.com.qmth.stmms.biz.exam.model.Exam;
-import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
 import cn.com.qmth.stmms.biz.exam.query.ExamSearchQuery;
 import cn.com.qmth.stmms.biz.exam.service.AnswerCardService;
 import cn.com.qmth.stmms.biz.exam.service.ExamService;
-import cn.com.qmth.stmms.biz.exam.service.ExamSubjectService;
-import cn.com.qmth.stmms.biz.file.service.FileService;
+import cn.com.qmth.stmms.biz.school.model.School;
+import cn.com.qmth.stmms.biz.school.service.SchoolService;
 import cn.com.qmth.stmms.common.annotation.RoleRequire;
 import cn.com.qmth.stmms.common.domain.ApiUser;
 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("scanExamController")
@@ -47,6 +41,9 @@ public class ExamController extends BaseApiController {
     @Autowired
     private ExamService examService;
 
+    @Autowired
+    private SchoolService schoolService;
+
     @Autowired
     private AnswerCardService answerCardService;
 
@@ -80,7 +77,7 @@ public class ExamController extends BaseApiController {
             obj.accumulate("id", exam.getId());
             obj.accumulate("name", exam.getName());
             obj.accumulate("examTime", exam.getExamTime().getTime());
-            obj.accumulate("config", exam.getScanConfig());
+            obj.accumulate("config", StringUtils.trimToEmpty(exam.getScanConfig()));
             array.add(obj);
         }
         return array;
@@ -92,10 +89,13 @@ public class ExamController extends BaseApiController {
     public JSONObject configSave(HttpServletRequest request, @RequestParam Integer examId, @RequestParam String config) {
         ApiUser au = RequestUtils.getApiUser(request);
         Exam exam = validateExam(au, examId, ExamType.SCAN_IMAGE);
-        exam.setScanConfig(config);
+        exam.setScanConfig(StringEscapeUtils.unescapeHtml(config));
         examService.save(exam);
         JSONObject result = new JSONObject();
         result.accumulate("id", examId);
+        result.accumulate("name", exam.getName());
+        School shcool = schoolService.findById(au.getSchoolId());
+        result.accumulate("schoolName", shcool.getName());
         result.accumulate("updateTime", System.currentTimeMillis());
         return result;
     }