Merge branch 'stmms_ft_dev' of http://git.qmth.com.cn/luoshi/stmms-ft.git into stmms_ft_dev

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

@@ -259,16 +259,18 @@ public class MarkServiceImpl implements MarkService {
     @Transactional
     public void resetMarker(Marker marker) {
         try {
-            lockService.lockGroup(marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber());
-            releaseByMarker(marker);
+            lockService.waitUnlockGroup(marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber());
+            lockService.lockMarker(marker.getId());
+
             libraryDao.resetByMarkerId(marker.getId(), LibraryStatus.WAITING);
             trackDao.deleteByMarkerId(marker.getId());
             specialTagDao.deleteByMarkerId(marker.getId());
             updateLibraryCount(marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber());
+            releaseByMarker(marker);
         } catch (Exception e) {
             throw e;
         } finally {
-            lockService.unlockGroup(marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber());
+            lockService.unlockMarker(marker.getId());
         }
     }
 

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

@@ -79,7 +79,7 @@ public class MarkTrackController extends BaseExamController {
         map.put("imageServer", imageServer);
         return map;
     }
-    
+
     @ResponseBody
     @RequestMapping("/byLibrary")
     public HashMap<String, Object> byLibrary(Integer libraryId) {
@@ -95,21 +95,21 @@ public class MarkTrackController extends BaseExamController {
         return map;
     }
 
-	private HashMap<String, Object> set(MarkLibrary library,ExamStudent examStudent, Campus campus) {
-		MarkGroup group = groupService.findOne(examStudent.getExamId(), examStudent.getSubjectCode(),
-		        library.getGroupNumber());
-		List<String> picUrls = PictureUrlBuilder.getSliceUrls(examStudent.getExamId(), campus.getId(),
-		        examStudent.getSubjectCode(), examStudent.getExamNumber(), examStudent.getSliceCount());
-		List<MarkTrack> markTracks = markTrackService.findByLibraryId(library.getId());
-		HashMap<String, Object> groups = new HashMap<String, Object>();
-		List<MarkSpecialTag> markSpecialTagList = markSpecialTagService.findByLibraryId(library.getId());
-		groups.put("picUrls", picUrls);
-		groups.put("pictureConfig", group.getPictureConfigList());
-		groups.put("markTracks", markTracks);
-		groups.put("groupTitle", group.getTitle());
-		groups.put("groupNumber", group.getNumber());
-		groups.put("markSpecialTagList", markSpecialTagList);
-		return groups;
-	}
+    private HashMap<String, Object> set(MarkLibrary library, ExamStudent examStudent, Campus campus) {
+        HashMap<String, Object> groups = new HashMap<String, Object>();
+        MarkGroup group = groupService.findOne(examStudent.getExamId(), examStudent.getSubjectCode(),
+                library.getGroupNumber());
+        List<String> picUrls = PictureUrlBuilder.getSliceUrls(examStudent.getExamId(), campus.getId(),
+                examStudent.getSubjectCode(), examStudent.getExamNumber(), examStudent.getSliceCount());
+        List<MarkTrack> markTracks = markTrackService.findByLibraryId(library.getId());
+        List<MarkSpecialTag> markSpecialTagList = markSpecialTagService.findByLibraryId(library.getId());
+        groups.put("picUrls", picUrls);
+        groups.put("pictureConfig", group.getPictureConfigList());
+        groups.put("markTracks", markTracks);
+        groups.put("groupTitle", group.getTitle());
+        groups.put("groupNumber", group.getNumber());
+        groups.put("markSpecialTagList", markSpecialTagList);
+        return groups;
+    }
 
 }

stmms-web/src/main/webapp/WEB-INF/views/include/trackView.jsp

@@ -110,6 +110,8 @@ function buildImages (imageServer,picUrls,config,canvas,ctx,markTracks,markSpeci
     		}
         }
 		for (var i = 0; i < markSpecialTagList.length; i++) {
+		    ctx.font ="60px Arial";
+            ctx.fillStyle ='red';
     		if(markSpecialTagList[i].positionX > 0 && markSpecialTagList[i].positionY > 0){
     			ctx.fillText(markSpecialTagList[i].tagName,markSpecialTagList[i].positionX*canvas.width ,markSpecialTagList[i].positionY*canvas.height);
         	}