fix bug

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

@@ -22,15 +22,15 @@ public class ExamRecordCacheUtil {
     private static RedisUtil redisUtil = SpringContextHolder.getBean(RedisUtil.class);
 
     public static Long getId(Long recordId) {
-        return Long.parseLong(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "id")));
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "id")) ? Long.parseLong(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "id"))) : null;
     }
 
     public static Long getExamStudentId(Long recordId) {
-        return Long.parseLong(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "examStudentId")));
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "examStudentId")) ? Long.parseLong(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "examStudentId"))) : null;
     }
 
     public static Long getPaperId(Long recordId) {
-        return Long.parseLong(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "paperId")));
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "paperId")) ? Long.parseLong(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "paperId"))) : null;
     }
 
     public static void setFirstStartTime(Long recordId, Date date) {
@@ -48,11 +48,11 @@ public class ExamRecordCacheUtil {
     }
 
     public static Double getObjectiveScore(Long recordId) {
-        return Double.parseDouble(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "objectiveScore")));
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "objectiveScore")) ? Double.parseDouble(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "objectiveScore"))) : null;
     }
 
     public static Long getExamId(Long recordId) {
-        return Long.parseLong(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "examId")));
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "examId")) ? Long.parseLong(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "examId"))) : null;
     }
 
     public static void setObjectiveScore(Long recordId, Double objectiveScore) {
@@ -88,7 +88,7 @@ public class ExamRecordCacheUtil {
     }
 
     public static Integer getLeftBreakResumeCount(Long recordId) {
-        return Integer.parseInt(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "leftBreakResumeCount")));
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "leftBreakResumeCount")) ? Integer.parseInt(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "leftBreakResumeCount"))) : null;
     }
 
     public static void setLeftBreakResumeCount(Long recordId, Integer leftBreakResumeCount) {
@@ -101,7 +101,7 @@ public class ExamRecordCacheUtil {
     }
 
     public static Long getLastBreakId(Long recordId) {
-        return Long.parseLong(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "lastBreakId")));
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "lastBreakId")) ? Long.parseLong(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "lastBreakId"))) : null;
     }
 
     public static Date getLastBreakTime(Long recordId) {
@@ -128,7 +128,7 @@ public class ExamRecordCacheUtil {
     }
 
     public static Integer getWarningCount(Long recordId) {
-        return Integer.parseInt(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "warningCount")));
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "warningCount")) ? Integer.parseInt(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "warningCount"))) : null;
     }
 
     public static void setBreachStatus(Long recordId, Integer breachStatus) {
@@ -137,7 +137,7 @@ public class ExamRecordCacheUtil {
     }
 
     public static Integer getBreachStatus(Long recordId) {
-        return Integer.parseInt(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "breachStatus")));
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "breachStatus")) ? Integer.parseInt(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "breachStatus"))) : null;
     }
 
     public static void setInProcessLivenessVerifyCount(Long recordId, Integer inProcessLivenessVerifyCount) {
@@ -146,7 +146,7 @@ public class ExamRecordCacheUtil {
     }
 
     public static Integer getInProcessLivenessVerifyCount(Long recordId) {
-        return Integer.parseInt(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "inProcessLivenessVerifyCount")));
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "inProcessLivenessVerifyCount")) ? Integer.parseInt(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "inProcessLivenessVerifyCount"))) : null;
     }
 
     public static void setMonitorKey(Long recordId, String monitorKey) {
@@ -162,23 +162,23 @@ public class ExamRecordCacheUtil {
     }
 
     public static String getMonitorLiveUrl(Long recordId, String source) {
-        return String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + source));
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + source)) ? String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + source)) : null;
     }
 
     public static String getMonitorLiveUrlMobileFirst(Long recordId) {
-        return String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + MonitorVideoSourceEnum.MOBILE_FIRST.name()));
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + MonitorVideoSourceEnum.MOBILE_FIRST.name())) ? String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + MonitorVideoSourceEnum.MOBILE_FIRST.name())) : null;
     }
 
     public static String getMonitorLiveUrlMobileSecond(Long recordId) {
-        return String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + MonitorVideoSourceEnum.MOBILE_SECOND.name()));
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + MonitorVideoSourceEnum.MOBILE_SECOND.name())) ? String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + MonitorVideoSourceEnum.MOBILE_SECOND.name())) : null;
     }
 
     public static String getMonitorLiveUrlClientCamera(Long recordId) {
-        return String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + MonitorVideoSourceEnum.CLIENT_CAMERA.name()));
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + MonitorVideoSourceEnum.CLIENT_CAMERA.name())) ? String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + MonitorVideoSourceEnum.CLIENT_CAMERA.name())) : null;
     }
 
     public static String getMonitorLiveUrlClientScreen(Long recordId) {
-        return String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + MonitorVideoSourceEnum.CLIENT_SCREEN.name()));
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + MonitorVideoSourceEnum.CLIENT_SCREEN.name())) ? String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), SystemConstant.MONITOR_LIVE_URL_ + MonitorVideoSourceEnum.CLIENT_SCREEN.name())) : null;
     }
 
     public static void setMonitorLiveUrl(Long recordId, String source, String liveUrl) {

themis-business/src/main/java/com/qmth/themis/business/cache/MobileAuthCacheUtil.java

@@ -5,6 +5,8 @@ import com.qmth.themis.business.enums.MobileModeEnum;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.common.enums.Source;
 
+import java.util.Objects;
+
 /**
  * 移动端临时认证
  *
@@ -32,7 +34,7 @@ public class MobileAuthCacheUtil {
     }
 
     public static MobileModeEnum getMode(MobileModeEnum mode, String code) {
-        return (MobileModeEnum) redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "mode");
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "mode")) ? MobileModeEnum.valueOf(String.valueOf(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "mode"))) : null;
     }
 
     public static void setCode(MobileModeEnum mode, String code) {
@@ -40,7 +42,7 @@ public class MobileAuthCacheUtil {
     }
 
     public static String getCode(MobileModeEnum mode, String code) {
-        return (String) redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "code");
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "code")) ? String.valueOf(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "code")) : null;
     }
 
     public static void setRecordId(MobileModeEnum mode, String code, Long recordId) {
@@ -48,7 +50,7 @@ public class MobileAuthCacheUtil {
     }
 
     public static Long getRecordId(MobileModeEnum mode, String code) {
-        return (Long) redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "recordId");
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "recordId")) ? Long.parseLong(String.valueOf(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "recordId"))) : null;
     }
 
     public static void setMainNumber(MobileModeEnum mode, String code, Integer mainNumber) {
@@ -56,7 +58,7 @@ public class MobileAuthCacheUtil {
     }
 
     public static Integer getMainNumber(MobileModeEnum mode, String code) {
-        return (Integer) redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "mainNumber");
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "mainNumber")) ? Integer.parseInt(String.valueOf(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "mainNumber"))) : null;
     }
 
     public static void setSubNumber(MobileModeEnum mode, String code, Integer subNumber) {
@@ -64,7 +66,7 @@ public class MobileAuthCacheUtil {
     }
 
     public static Integer getSubNumber(MobileModeEnum mode, String code) {
-        return (Integer) redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "subNumber");
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "subNumber")) ? Integer.parseInt(String.valueOf(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "subNumber"))) : null;
     }
 
     public static void setSubIndex(MobileModeEnum mode, String code, Integer subIndex) {
@@ -72,7 +74,7 @@ public class MobileAuthCacheUtil {
     }
 
     public static Integer getSubIndex(MobileModeEnum mode, String code) {
-        return (Integer) redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "subIndex");
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "subIndex")) ? Integer.parseInt(String.valueOf(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "subIndex"))) : null;
     }
 
     public static void setMonitorKey(MobileModeEnum mode, String code, String monitorKey) {
@@ -80,7 +82,7 @@ public class MobileAuthCacheUtil {
     }
 
     public static String getMonitorKey(MobileModeEnum mode, String code) {
-        return (String) redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "monitorKey");
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "monitorKey")) ? String.valueOf(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "monitorKey")) : null;
     }
 
     public static void setMonitorVideoSource(MobileModeEnum mode, String code, Source monitorVideoSource) {
@@ -88,7 +90,7 @@ public class MobileAuthCacheUtil {
     }
 
     public static Source getMonitorVideoSource(MobileModeEnum mode, String code) {
-        return (Source) redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "monitorVideoSource");
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "monitorVideoSource")) ? Source.valueOf(String.valueOf(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "monitorVideoSource"))) : null;
     }
 
     public static void setMonitorAudioEnable(MobileModeEnum mode, String code, Boolean monitorAudioEnable) {
@@ -96,19 +98,19 @@ public class MobileAuthCacheUtil {
     }
 
     public static Boolean getMonitorAudioEnable(MobileModeEnum mode, String code) {
-        return (Boolean) redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "monitorAudioEnable");
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "monitorAudioEnable")) ? Boolean.valueOf(String.valueOf(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "monitorAudioEnable"))) : null;
     }
 
     public static Source getSource(MobileModeEnum mode, String code) {
-        return (Source) redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "source");
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "source")) ? Source.valueOf(String.valueOf(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "source"))) : null;
     }
 
     public static String getSessionId(MobileModeEnum mode, String code) {
-        return (String) redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "sessionId");
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "sessionId")) ? String.valueOf(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "sessionId")) : null;
     }
 
     public static String getPlatformSource(MobileModeEnum mode, String code) {
-        return (String) redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "platformSource");
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "platformSource")) ? String.valueOf(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "platformSource")) : null;
     }
 
     public static void setPlatformSource(MobileModeEnum mode, String code, String source) {
@@ -116,6 +118,6 @@ public class MobileAuthCacheUtil {
     }
 
     public static String getUserType(MobileModeEnum mode, String code) {
-        return (String) redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "userType");
+        return Objects.nonNull(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "userType")) ? String.valueOf(redisUtil.get(RedisKeyHelper.mobileAuthCacheKey(mode, code), "userType")) : null;
     }
 }