线下版本-一键定档日志，打分任务发送-20201126

stmms-ms-log/src/main/java/cn/com/qmth/stmms/ms/log/aop/MarkLogAop.java

@@ -387,8 +387,12 @@ public class MarkLogAop {
         if (Objects.nonNull(markTask)) {
             markUser = markUserRepo.findOne(markTask.getMarkerId());
         } else {
-            String[] strs = token.split("#");
-            markUser = strs == null || strs[2] == null || strs[2] == "null" ? null : markUserRepo.findOne(Long.parseLong(strs[2]));
+            String userId = request.getHeader("userId");
+            markUser = markUserRepo.findOne(Long.valueOf(userId));
+            if(Objects.isNull(markUser)) {
+                String[] strs = token.split("#");
+                markUser = strs == null || strs[2] == null || strs[2] == "null" ? null : markUserRepo.findOne(Long.parseLong(strs[2]));
+            }
         }
         LOGGER.info("markUser:{}", JSONObject.toJSONString(markUser));
 //        String[] argNames = ((MethodSignature) joinPoint.getSignature()).getParameterNames();//参数名

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/service/AssignTaskService.java

@@ -158,7 +158,7 @@ public class AssignTaskService {
                     //设置新值
                     map.put(paper.getLevel() + idx, seq);
 
-                    int seqNew = 100000;
+                    int seqNew = 0;
                     if(seqNewMap.containsKey(paper.getLevel())){
                         seqNew = (int) seqNewMap.get(paper.getLevel());
                     }
@@ -173,7 +173,9 @@ public class AssignTaskService {
                     markTask = new MarkTask(marker, paper, markSubject.getStage(), random, markSubject.getTest());
                     String levelValue = String.valueOf(levelMap.get(paper.getLevel()).getLevelValue() + 1);
                     if (Objects.nonNull(serialNumber)) {
-                        markTask.setRandomSeqNew(Long.valueOf(levelValue + seqNewNumber));
+                        //和随机数位数保持一致（8位）
+                        String randomSeqNew = String.format("%08d", seqNewNumber);
+                        markTask.setRandomSeqNew(Long.valueOf(levelValue + randomSeqNew));
                     } else {
                         markTask.setRandomSeqNew(Long.valueOf(levelValue + markTask.getRandomSeqNew()));
                     }