wangliang 4 år sedan
förälder
incheckning
980c015a7a

+ 15 - 23
themis-business/src/main/java/com/qmth/themis/business/cache/ExamRecordCacheUtil.java

@@ -66,7 +66,7 @@ public class ExamRecordCacheUtil {
     }
 
     public static Date getFinishTime(Long recordId) {
-        return (Date) redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "finishTime");
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "finishTime")) ? (Date) redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "finishTime") : null;
     }
 
     public static void setDurationSeconds(Long recordId, Integer durationSeconds) {
@@ -80,11 +80,11 @@ public class ExamRecordCacheUtil {
     }
 
     public static FinishTypeEnum getFinishType(Long recordId) {
-        return (FinishTypeEnum) redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "finishType");
+        return Objects.nonNull(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "finishType"))) ? FinishTypeEnum.valueOf(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "finishType"))) : null;
     }
 
     public static Date getClientLastSyncTime(Long recordId) {
-        return (Date) redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "clientLastSyncTime");
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "clientLastSyncTime")) ? (Date) redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "clientLastSyncTime") : null;
     }
 
     public static Integer getLeftBreakResumeCount(Long recordId) {
@@ -97,7 +97,7 @@ public class ExamRecordCacheUtil {
     }
 
     public static ExamRecordStatusEnum getStatus(Long recordId) {
-        return ExamRecordStatusEnum.valueOf(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "status")));
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "status")) ? ExamRecordStatusEnum.valueOf(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "status"))) : null;
     }
 
     public static Long getLastBreakId(Long recordId) {
@@ -105,11 +105,7 @@ public class ExamRecordCacheUtil {
     }
 
     public static Date getLastBreakTime(Long recordId) {
-        return (Date) redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "lastBreakTime");
-    }
-
-    public static VerifyExceptionEnum getEntryAuthenticationResult(Long recordId) {
-        return (VerifyExceptionEnum) redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "entryAuthenticationResult");
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "lastBreakTime")) ? (Date) redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "lastBreakTime") : null;
     }
 
     public static void setEntryAuthenticationResult(Long recordId, VerifyExceptionEnum entryAuthenticationResult) {
@@ -117,10 +113,6 @@ public class ExamRecordCacheUtil {
         examRecordService.dataUpdateMq(recordId, "entry_authentication_result", entryAuthenticationResult);
     }
 
-    public static Long getEntryAuthenticationId(Long recordId) {
-        return Long.parseLong(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "entryAuthenticationId")));
-    }
-
     public static void setEntryAuthenticationId(Long recordId, Long entryAuthenticationId) {
         redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "entryAuthenticationId", entryAuthenticationId);
         examRecordService.dataUpdateMq(recordId, "entry_authentication_id", entryAuthenticationId);
@@ -166,27 +158,27 @@ public class ExamRecordCacheUtil {
         if (Objects.isNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "monitorKey"))) {
             setMonitorKey(recordId, String.valueOf(redisUtil.getRedisSequence()));
         }
-        return (String) redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "monitorKey");
+        return String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "monitorKey"));
     }
 
     public static String getMonitorLiveUrl(Long recordId, String source) {
-        return (String) redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + source);
+        return String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + source));
     }
 
     public static String getMonitorLiveUrlMobileFirst(Long recordId) {
-        return (String) redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + MonitorVideoSourceEnum.MOBILE_FIRST.name());
+        return String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + MonitorVideoSourceEnum.MOBILE_FIRST.name()));
     }
 
     public static String getMonitorLiveUrlMobileSecond(Long recordId) {
-        return (String) redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + MonitorVideoSourceEnum.MOBILE_SECOND.name());
+        return String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + MonitorVideoSourceEnum.MOBILE_SECOND.name()));
     }
 
     public static String getMonitorLiveUrlClientCamera(Long recordId) {
-        return (String) redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + MonitorVideoSourceEnum.CLIENT_CAMERA.name());
+        return String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + MonitorVideoSourceEnum.CLIENT_CAMERA.name()));
     }
 
     public static String getMonitorLiveUrlClientScreen(Long recordId) {
-        return (String) redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + MonitorVideoSourceEnum.CLIENT_SCREEN.name());
+        return String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + MonitorVideoSourceEnum.CLIENT_SCREEN.name()));
     }
 
     public static void setMonitorLiveUrl(Long recordId, String source, String liveUrl) {
@@ -195,7 +187,7 @@ public class ExamRecordCacheUtil {
     }
 
     public static MonitorStatusSourceEnum getMonitorStatus(Long recordId, String source) {
-        return MonitorStatusSourceEnum.valueOf(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_STATUS_ + source)));
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_STATUS_ + source)) ? MonitorStatusSourceEnum.valueOf(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_STATUS_ + source))) : null;
     }
 
     public static void setMonitorStatus(Long recordId, String source, MonitorStatusSourceEnum statusSourceEnum) {
@@ -204,7 +196,7 @@ public class ExamRecordCacheUtil {
     }
 
     public static MonitorCallStatusSourceEnum getMonitorCallStatus(Long recordId, String source) {
-        return MonitorCallStatusSourceEnum.valueOf(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_CALL_STATUS_ + source)));
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_CALL_STATUS_ + source)) ? MonitorCallStatusSourceEnum.valueOf(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_CALL_STATUS_ + source))) : null;
     }
 
     public static void setMonitorCallStatus(Long recordId, String source, MonitorCallStatusSourceEnum callStatusSourceEnum) {
@@ -212,7 +204,7 @@ public class ExamRecordCacheUtil {
     }
 
     public static WebsocketStatusEnum getClientWebsocketStatus(Long recordId) {
-        return WebsocketStatusEnum.valueOf(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "clientWebsocketStatus")));
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "clientWebsocketStatus")) ? WebsocketStatusEnum.valueOf(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "clientWebsocketStatus"))) : null;
     }
 
     public static void setClientWebsocketStatus(Long recordId, WebsocketStatusEnum websocketStatusEnum) {
@@ -264,6 +256,6 @@ public class ExamRecordCacheUtil {
     }
 
     public static Date getLastStartTime(Long recordId) {
-        return (Date) redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "lastStartTime");
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "lastStartTime")) ? (Date) redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "lastStartTime") : null;
     }
 }