deason 2 лет назад
Родитель
Сommit
2b31d2e136

+ 4 - 4
examcloud-core-oe-student-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/controller/FaceBiopsyController.java

@@ -9,7 +9,7 @@ import cn.com.qmth.examcloud.core.oe.student.dao.entity.FaceBiopsyItemEntity;
 import cn.com.qmth.examcloud.core.oe.student.dao.entity.FaceBiopsyItemStepEntity;
 import cn.com.qmth.examcloud.core.oe.student.dao.enums.FaceBiopsyType;
 import cn.com.qmth.examcloud.core.oe.student.service.*;
-import cn.com.qmth.examcloud.support.Constants;
+import cn.com.qmth.examcloud.support.CacheConstants;
 import cn.com.qmth.examcloud.support.enums.ExamRecordStatus;
 import cn.com.qmth.examcloud.support.enums.FaceBiopsyScheme;
 import cn.com.qmth.examcloud.support.enums.HandInExamType;
@@ -72,7 +72,7 @@ public class FaceBiopsyController extends ControllerSupport {
     public FaceBiopsyBaseInfo getFaceBiopsyBaseInfo(@RequestParam Long examRecordDataId) {
         User user = getAccessUser();
         Long studentId = user.getUserId();
-        String sequenceLockKey = Constants.GET_FACE_BIOPSY_INFO_PREFIX + studentId;
+        String sequenceLockKey = CacheConstants.LOCK_GET_FACE_BIOPSY + studentId;
         //系统在请求结束后会,自动释放锁,无需手动解锁
         SequenceLockHelper.getLock(sequenceLockKey);
 
@@ -133,7 +133,7 @@ public class FaceBiopsyController extends ControllerSupport {
     public FaceBiopsyInfo getFaceBiopsyInfo(@RequestParam Long examRecordDataId) {
         User user = getAccessUser();
         Long studentId = user.getUserId();
-        String sequenceLockKey = Constants.GET_FACE_BIOPSY_INFO_PREFIX + studentId;
+        String sequenceLockKey = CacheConstants.LOCK_GET_FACE_BIOPSY + studentId;
         //系统在请求结束后会,自动释放锁,无需手动解锁
         SequenceLockHelper.getLock(sequenceLockKey);
 
@@ -170,7 +170,7 @@ public class FaceBiopsyController extends ControllerSupport {
     public SaveFaceBiopsyResultResp saveFaceBiopsyResult(@RequestBody SaveFaceBiopsyResultReq req) {
         User user = getAccessUser();
         Long studentId = user.getUserId();
-        String sequenceLockKey = Constants.GET_FACE_BIOPSY_INFO_PREFIX + studentId;
+        String sequenceLockKey = CacheConstants.LOCK_GET_FACE_BIOPSY + studentId;
         //系统在请求结束后会,自动释放锁,无需手动解锁
         SequenceLockHelper.getLock(sequenceLockKey);
 

+ 2 - 1
examcloud-core-oe-student-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/controller/client/ExamProcessController.java

@@ -8,6 +8,7 @@ import cn.com.qmth.examcloud.core.oe.student.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.student.bean.*;
 import cn.com.qmth.examcloud.core.oe.student.bean.client.*;
 import cn.com.qmth.examcloud.core.oe.student.service.*;
+import cn.com.qmth.examcloud.support.CacheConstants;
 import cn.com.qmth.examcloud.support.Constants;
 import cn.com.qmth.examcloud.support.examing.ExamQuestion;
 import cn.com.qmth.examcloud.support.examing.ExamRecordPaperStruct;
@@ -166,7 +167,7 @@ public class ExamProcessController extends ControllerSupport {
             reason = StringUtils.substring(reason, 0, 1000);
         }
 
-        String cacheKey = Constants.OE_DISCIPLINE_ILLEGAL_CLIENT + examingSession.getExamRecordDataId();
+        String cacheKey = CacheConstants.CACHE_OE_DISCIPLINE_ILLEGAL_CLIENT + examingSession.getExamRecordDataId();
         redisClient.set(cacheKey, reason, 3 * 60 * 60);
     }
 

+ 4 - 4
examcloud-core-oe-student-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/service/impl/ExamDataCleanServiceImpl.java

@@ -4,7 +4,7 @@ import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.commons.util.DateUtil;
 import cn.com.qmth.examcloud.commons.util.ThreadLocalUtil;
 import cn.com.qmth.examcloud.core.oe.student.service.ExamDataCleanService;
-import cn.com.qmth.examcloud.support.Constants;
+import cn.com.qmth.examcloud.support.CacheConstants;
 import cn.com.qmth.examcloud.support.redis.RedisKeyHelper;
 import cn.com.qmth.examcloud.web.redis.RedisClient;
 import cn.com.qmth.examcloud.web.support.SpringContextHolder;
@@ -42,12 +42,12 @@ public class ExamDataCleanServiceImpl implements ExamDataCleanService {
                 throw new StatusException("日期格式错误,正确格式:" + DateUtil.DatePatterns.CHINA_DEFAULT);
             }
         }
-        if (redisClient.setIfAbsent(Constants.EXAM_DATA_CLEAN_LOCK_PREFIX, ThreadLocalUtil.getTraceId(), 60)) {
+        if (redisClient.setIfAbsent(CacheConstants.LOCK_EXAM_DATA_CLEAN, ThreadLocalUtil.getTraceId(), 60)) {
             try {
                 doLog("start");
                 diposeClean(dateBefore);
             } finally {
-                redisClient.delete(Constants.EXAM_DATA_CLEAN_LOCK_PREFIX);
+                redisClient.delete(CacheConstants.LOCK_EXAM_DATA_CLEAN);
                 doLog("finish");
             }
         } else {
@@ -143,7 +143,7 @@ public class ExamDataCleanServiceImpl implements ExamDataCleanService {
     }
 
     private void refreshLock() {
-        redisClient.expire(Constants.EXAM_DATA_CLEAN_LOCK_PREFIX, 60);
+        redisClient.expire(CacheConstants.LOCK_EXAM_DATA_CLEAN, 60);
     }
 
 }

+ 2 - 1
examcloud-core-oe-student-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/service/impl/ExamRecordQuestionsServiceImpl.java

@@ -31,6 +31,7 @@ import cn.com.qmth.examcloud.starters.crypto.common.CryptoGroup;
 import cn.com.qmth.examcloud.starters.crypto.common.CryptoHelper;
 import cn.com.qmth.examcloud.starters.crypto.common.FieldPair;
 import cn.com.qmth.examcloud.starters.crypto.service.CryptoFactory;
+import cn.com.qmth.examcloud.support.CacheConstants;
 import cn.com.qmth.examcloud.support.Constants;
 import cn.com.qmth.examcloud.support.cache.CacheHelper;
 import cn.com.qmth.examcloud.support.cache.bean.QuestionCacheBean;
@@ -318,7 +319,7 @@ public class ExamRecordQuestionsServiceImpl implements ExamRecordQuestionsServic
         long examRecordDataId = examSessionInfo.getExamRecordDataId();
 
         if (StringUtils.isEmpty(referer) || StringUtils.isEmpty(agent) || !agent.contains(Constants.ELECTRON_EXAM_SHELL)) {
-            String cacheKey = Constants.OE_DISCIPLINE_ILLEGAL_DATA + examSessionInfo.getExamRecordDataId();
+            String cacheKey = CacheConstants.CACHE_OE_DISCIPLINE_ILLEGAL_DATA + examSessionInfo.getExamRecordDataId();
             redisClient.set(cacheKey, true, 6 * 60 * 60);
         }