Merge remote-tracking branch 'origin/dev_200331_multimedia' into dev_200331_multimedia

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/model/Task.java

@@ -51,6 +51,11 @@ public class Task extends MarkResult implements Serializable {
      */
     private String paperUrl;
 
+    /**
+     * 多媒体答案地址
+     */
+    private String jsonUrl;
+
     /**
      * 客观题总分
      */
@@ -317,4 +322,12 @@ public class Task extends MarkResult implements Serializable {
         this.markerId = markerId;
     }
 
+    public String getJsonUrl() {
+        return jsonUrl;
+    }
+
+    public void setJsonUrl(String jsonUrl) {
+        this.jsonUrl = jsonUrl;
+    }
+
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/TaskServiceImpl.java

@@ -117,11 +117,10 @@ public class TaskServiceImpl implements TaskService {
         task.setSheetUrls(PictureUrlBuilder.getSheetUrls(student.getExamId(), campusId, student.getSubjectCode(),
                 student.getExamNumber(), student.getSheetCount()));
         if (examType.equals(ExamType.MULTI_MEDIA)) {
-            task.setAnswerUrl(PictureUrlBuilder.getAnswerJson(student.getExamId(), student.getSubjectCode(),
+            task.setJsonUrl(PictureUrlBuilder.getAnswerJson(student.getExamId(), student.getSubjectCode(),
                     student.getPaperType(), student.getExamNumber()));
-        } else {
-            task.setAnswerUrl(PictureUrlBuilder.getAnswerUrl(student.getExamId(), student.getSubjectCode()));
         }
+        task.setAnswerUrl(PictureUrlBuilder.getAnswerUrl(student.getExamId(), student.getSubjectCode()));
         task.setPaperUrl(PictureUrlBuilder.getPaperUrl(student.getExamId(), student.getSubjectCode()));
         task.setObjectiveScore(student.getObjectiveScore() != null ? student.getObjectiveScore() : 0);
         task.setMarkTime(history.getUpdateTime());
@@ -161,11 +160,10 @@ public class TaskServiceImpl implements TaskService {
         task.setSheetUrls(PictureUrlBuilder.getSheetUrls(library.getExamId(), library.getCampusId(),
                 library.getSubjectCode(), library.getExamNumber(), student.getSheetCount()));
         if (examType.equals(ExamType.MULTI_MEDIA)) {
-            task.setAnswerUrl(PictureUrlBuilder.getAnswerJson(library.getExamId(), library.getSubjectCode(),
+            task.setJsonUrl(PictureUrlBuilder.getAnswerJson(library.getExamId(), library.getSubjectCode(),
                     student.getPaperType(), student.getExamNumber()));
-        } else {
-            task.setAnswerUrl(PictureUrlBuilder.getAnswerUrl(library.getExamId(), library.getSubjectCode()));
         }
+        task.setAnswerUrl(PictureUrlBuilder.getAnswerUrl(library.getExamId(), library.getSubjectCode()));
         task.setPaperUrl(PictureUrlBuilder.getPaperUrl(library.getExamId(), library.getSubjectCode()));
         task.setObjectiveScore(student != null ? student.getObjectiveScore() : 0);
         task.setMarkTime(library.getMarkerTime());

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ArbitrateController.java

@@ -92,8 +92,8 @@ public class ArbitrateController extends BaseExamController {
     @Value("${card.server}")
     private String cardServer;
 
-    @Value("${answer.server}")
-    private String answerServer;
+    @Value("${json.server}")
+    private String jsonServer;
 
     // 并发处理互斥锁
     private Map<Integer, Integer> currentTaskMap = new HashMap<Integer, Integer>();
@@ -153,7 +153,7 @@ public class ArbitrateController extends BaseExamController {
         model.addAttribute("subject", subjectService.find(group.getExamId(), group.getSubjectCode()));
         model.addAttribute("group", group);
         model.addAttribute("history", history);
-        model.addAttribute("answerServer", answerServer);
+        model.addAttribute("jsonServer", jsonServer);
         Exam exam = examService.findById(examId);
         if (ExamType.MULTI_MEDIA.equals(exam.getType())) {
             return "modules/exam/arbitrateSingleProcessJson";
@@ -180,7 +180,7 @@ public class ArbitrateController extends BaseExamController {
         model.addAttribute("cardServer", cardServer);
         model.addAttribute("subject", subjectService.find(group.getExamId(), group.getSubjectCode()));
         model.addAttribute("group", group);
-        model.addAttribute("answerServer", answerServer);
+        model.addAttribute("jsonServer", jsonServer);
         Exam exam = examService.findById(examId);
         if (ExamType.MULTI_MEDIA.equals(exam.getType())) {
             return "modules/exam/arbitrateBatchProcessJson";

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/LibraryController.java

@@ -72,8 +72,8 @@ public class LibraryController extends BaseExamController {
     @Autowired
     private ExamService examService;
 
-    @Value("${answer.server}")
-    private String answerServer;
+    @Value("${json.server}")
+    private String jsonServer;
 
     @RequestMapping
     public String list(Model model, HttpServletRequest request, MarkLibrarySearchQuery query,
@@ -128,7 +128,7 @@ public class LibraryController extends BaseExamController {
         model.addAttribute("markerList",
                 markerService.findByExamAndSubjectAndGroup(examId, query.getSubjectCode(), query.getGroupNumber()));
         model.addAttribute("inspectedCount", inspectedCount);
-        model.addAttribute("answerServer", answerServer);
+        model.addAttribute("jsonServer", jsonServer);
         Exam exam = examService.findById(examId);
         model.addAttribute("examType", exam.getType());
         return "modules/exam/libraryList";
@@ -188,7 +188,7 @@ public class LibraryController extends BaseExamController {
             String questionNumbers = String.join(",", strings);
             model.addAttribute("questionNumbers", questionNumbers);
         }
-        model.addAttribute("answerServer", answerServer);
+        model.addAttribute("jsonServer", jsonServer);
         model.addAttribute(
                 "answerUrl",
                 PictureUrlBuilder.getAnswerJson(examId, student.getSubjectCode(), student.getPaperType(),

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ScoreController.java

@@ -100,8 +100,8 @@ public class ScoreController extends BaseExamController {
     @Value("${card.server}")
     private String cardServer;
 
-    @Value("${answer.server}")
-    private String answerServer;
+    @Value("${json.server}")
+    private String jsonServer;
 
     @RequestMapping
     public ModelAndView list(HttpServletRequest request, ExamStudentSearchQuery query, @RequestParam(defaultValue = "0") Integer filter) {
@@ -146,7 +146,7 @@ public class ScoreController extends BaseExamController {
         view.addObject("imageServer", imageServer);
         view.addObject("packageServer", packageServer);
         view.addObject("cardServer", cardServer);
-        view.addObject("answerServer", answerServer);
+        view.addObject("jsonServer", jsonServer);
         Exam exam = examService.findById(examId);
         view.addObject("examType", exam.getType());
         return view;

stmms-web/src/main/java/cn/com/qmth/stmms/mark/MarkController.java

@@ -105,8 +105,8 @@ public class MarkController extends BaseController {
     @Value("${marker.forceMode}")
     private String forceMarkMode;
 
-    @Value("${answer.server}")
-    private String answerServer;
+    @Value("${json.server}")
+    private String jsonServer;
 
     @RequestMapping(value = "/reset", method = RequestMethod.GET)
     public ModelAndView reset(HttpServletRequest request) {
@@ -194,7 +194,7 @@ public class MarkController extends BaseController {
         modelAndView.addObject("sliceServer", sliceServer);
         modelAndView.addObject("sheetServer", sheetServer);
         modelAndView.addObject("cardServer", cardServer);
-        modelAndView.addObject("answerServer", answerServer);
+        modelAndView.addObject("jsonServer", jsonServer);
         modelAndView.addObject("marker", marker);
         ExamSubject subject = subjectService.find(marker.getExamId(), marker.getSubjectCode());
         modelAndView.addObject("subject", subject);

stmms-web/src/main/webapp/WEB-INF/application.properties

@@ -15,7 +15,7 @@ slice.image.server=https://ft-slice.markingcloud.com
 sheet.image.server=https://ft-sheet.markingcloud.com
 package.image.server=http://ft-package.markingcloud.com
 card.server=http://ft-card.markingcloud.com
-answer.server=/file/answer/
+json.server=/file/answer/
 ##slice.image.server=http://${local.ip}:9000/gx-slice
 ##sheet.image.server=http://${local.ip}:9000/gx-sheet
 ##package.image.server=http://${local.ip}:9000/gx-package

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/arbitrateBatchProcessJson.jsp

@@ -50,7 +50,7 @@
 				clearUrl: '${ctx}/admin/exam/arbitrate/clear',
 				modules : {
 					'json-loader': {
-	                    answerServer: '${answerServer}'
+	                    jsonServer: '${jsonServer}'
 	                },
 	                'json-view': {},
 					'header-mark-status': {

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/arbitrateSingleProcessJson.jsp

@@ -50,7 +50,7 @@
 				submitUrl: '${ctx}/admin/exam/arbitrate/saveTask',
 				modules : {
 					'json-loader': {
-	                    answerServer: '${answerServer}'
+	                    jsonServer: '${jsonServer}'
 	                },
 	                'json-view': {},
 					'header-mark-status': {

stmms-web/src/main/webapp/WEB-INF/views/modules/mark/markJson.jsp

@@ -61,7 +61,7 @@
             settingSyncUrl: '${ctx}/mark/update-setting',
             modules: {
                 'json-loader': {
-                    answerServer: '${answerServer}'
+                    jsonServer: '${jsonServer}'
                 },
                 'json-view': {},
                 'mark-status': {

stmms-web/src/main/webapp/static/mark-json/js/json-loader.js

@@ -7,17 +7,17 @@ var json_loader = function (option, success) {
 
 function JsonLoader(option) {
     this.markControl = option.markControl;
-    this.answerServer = option.answerServer;
+    this.jsonServer = option.jsonServer;
 }
 
 JsonLoader.prototype.build = function (task, callback) {
     var self = this;
-    if (task != undefined && task.answerUrl != undefined) {
+    if (task != undefined && task.jsonUrl != undefined) {
 //      TODO-测试代码，读取固定的json文件
 //    	var result ='[{"mainNumber": 2,"subNumber": 10,"body": {"sections": [{ "blocks":[{"type": "text","value": "我是题目我是题目我是题目"}]}]},"answer": {"sections": [{"blocks":[{"type": "image","value": "https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/20/3_8_20_15748452889591137.jpeg"},{"type": "audio","value": "https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/19/3_8_19_15748452552644264.mp3"}]}]},"studentAnswer": {"sections": [{"blocks":[{"type": "image","value": "https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/20/3_8_20_15748452889591137.jpeg"},{"type": "image","value": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1582709869784&di=39683b1330bd09bebd93c95fe925ca70&imgtype=0&src=http%3A%2F%2Fn.sinaimg.cn%2Fsinacn10108%2F170%2Fw600h370%2F20190222%2Fd6de-htknpmh2595255.jpg"},{"type": "text","value": "我是答案答案daan"}]}]}}]';
 //    	task.jsonData = JSON.parse(result);
 //    	callback();
-    	var url = this.answerServer + task.answerUrl;
+    	var url = this.jsonServer + task.jsonUrl;
         $.get(url, function (result) {
             task.jsonData = result;
             callback();