数据检查功能屏蔽；多媒体下文本改为为html处理；增加任务数设置验证

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

@@ -7,6 +7,9 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -18,14 +21,15 @@ import org.springframework.web.servlet.ModelAndView;
 
 import cn.com.qmth.stmms.biz.campus.model.Campus;
 import cn.com.qmth.stmms.biz.campus.service.CampusService;
+import cn.com.qmth.stmms.biz.exam.model.Exam;
 import cn.com.qmth.stmms.biz.exam.model.ExamQuestion;
 import cn.com.qmth.stmms.biz.exam.model.ExamStudent;
 import cn.com.qmth.stmms.biz.exam.query.ExamStudentSearchQuery;
 import cn.com.qmth.stmms.biz.exam.service.ExamQuestionService;
+import cn.com.qmth.stmms.biz.exam.service.ExamService;
 import cn.com.qmth.stmms.biz.exam.service.ExamStudentService;
+import cn.com.qmth.stmms.common.enums.ExamType;
 import cn.com.qmth.stmms.common.utils.PictureUrlBuilder;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
 
 @Controller
 @RequestMapping("/admin/exam/check/answer")
@@ -40,6 +44,9 @@ public class AnswerCheckController extends BaseExamController {
     @Autowired
     private CampusService campusService;
 
+    @Autowired
+    private ExamService examService;
+
     @Value("${sheet.image.server}")
     private String sheetServer;
 
@@ -47,7 +54,11 @@ public class AnswerCheckController extends BaseExamController {
     public ModelAndView index(HttpServletRequest request) {
         int examId = getSessionExamId(request);
         if (examId > 0) {
+            Exam exam = examService.findById(examId);
             ModelAndView view = new ModelAndView("modules/exam/checkAnswer");
+            if (ExamType.MULTI_MEDIA.equals(exam.getType())) {
+                view = new ModelAndView("modules/exam/permission");
+            }
             return view;
         } else {
             return new ModelAndView("redirect:/admin/exam/list");
@@ -128,13 +139,15 @@ public class AnswerCheckController extends BaseExamController {
         result.accumulate("absent", student.isAbsent());
 
         Campus campus = campusService.findBySchoolAndName(student.getSchoolId(), student.getCampusName());
-        result.accumulate("sheetUrls", PictureUrlBuilder.getSheetUrls(student.getExamId(), campus.getId(),
-                student.getSubjectCode(), student.getExamNumber(), student.getSheetCount()));
+        result.accumulate(
+                "sheetUrls",
+                PictureUrlBuilder.getSheetUrls(student.getExamId(), campus.getId(), student.getSubjectCode(),
+                        student.getExamNumber(), student.getSheetCount()));
 
         JSONArray array = new JSONArray();
         Map<Integer, String> titles = new HashMap<Integer, String>();
-        List<ExamQuestion> questions = questionService.findByExamAndSubjectAndObjectiveAndPaperType(student.getExamId(),
-                student.getSubjectCode(), true, student.getPaperType());
+        List<ExamQuestion> questions = questionService.findByExamAndSubjectAndObjectiveAndPaperType(
+                student.getExamId(), student.getSubjectCode(), true, student.getPaperType());
         List<String> answers = student.getAnswerList();
         if (questions.isEmpty()) {
             // 未设置客观题或无客观题

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

@@ -130,10 +130,11 @@ public class DataSyncController extends BaseExamController {
                     dataSyncService, examService, studentService, subjectService);
             taskExecutor.submit(thread);
         }
-        if (lockService.isLocked(LockType.DATA_SYNC, examId)) {
-            addMessage(redirectAttributes, "同步失败");
-        } else {
+        dataSync = dataSyncService.findByExamId(examId);
+        if (lockService.isLocked(LockType.DATA_SYNC, examId) || (dataSync != null && dataSync.isFinished())) {
             addMessage(redirectAttributes, "创建成功");
+        } else {
+            addMessage(redirectAttributes, "同步失败");
         }
         return "redirect:/admin/exam-list";
     }

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

@@ -335,6 +335,10 @@ function showTaskWin(obj){
 	           wrongMessage.html('请输入正整数!');
 	           return false;
 	         }
+	         if(taskCount>2147483647 ){
+		       wrongMessage.html('数量不合法!');
+		       return false;
+		     }
 	       }
 	  $.post('${ctx}/admin/exam/marker/setTaskCount', {id: markerId,taskCount:taskCount}, function(result){
 	    if(result.success==true){

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

@@ -0,0 +1,12 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+	<title>云阅卷</title>
+	<meta name="decorator" content="default"/>
+	<%@include file="/WEB-INF/views/include/head.jsp" %>
+</head>
+<body>
+	多媒体阅卷无此功能权限
+</body>
+</html>

stmms-web/src/main/webapp/static/rich-text/js/render.js

@@ -31,7 +31,7 @@ function renderBlock(block, inline) {
                 }
             })
         }
-        container.textContent = block.value;
+        container.innerHTML = block.value;
     } else if (block.type === 'image') {
         type = 'image loading';
         if (inline === true) {