Ver código fonte

枚举改大写

xiatian 4 anos atrás
pai
commit
5d8955c076

+ 6 - 6
themis-business/src/main/java/com/qmth/themis/business/constant/SystemConstant.java

@@ -176,23 +176,23 @@ public class SystemConstant {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(now);
         Long redisExpire = REDIS_EXPIRE_TIME;
-        if (platform.getSource().contains(Source.admin_web.name())) {
+        if (platform.getSource().contains(Source.ADMIN_WEB.name())) {
             calendar.add(Calendar.DAY_OF_YEAR, SystemConstant.WEB_SESSION_EXPIRE);
         } else if (Objects.equals(platform.name(), Platform.win.name()) &&
-                (platform.getSource().contains(Source.admin_client.name()) || platform.getSource().contains(Source.oe_client.name()))) {
+                (platform.getSource().contains(Source.ADMIN_CLIENT.name()) || platform.getSource().contains(Source.OE_CLIENT.name()))) {
             calendar.add(Calendar.DAY_OF_YEAR, SystemConstant.WIN_SESSION_EXPIRE);
         } else if (Objects.equals(platform.name(), Platform.mac.name()) &&
-                (platform.getSource().contains(Source.admin_client.name()) || platform.getSource().contains(Source.oe_client.name()))) {
+                (platform.getSource().contains(Source.ADMIN_CLIENT.name()) || platform.getSource().contains(Source.OE_CLIENT.name()))) {
             calendar.add(Calendar.DAY_OF_YEAR, SystemConstant.MAC_SESSION_EXPIRE);
-        } else if (platform.getSource().contains(Source.oe_answer.name())) {
+        } else if (platform.getSource().contains(Source.OE_ANSWER.name())) {
             calendar.add(Calendar.DAY_OF_YEAR, SystemConstant.WXAPP_SESSION_EXPIRE);
             redisExpire = REDIS_PHONE_EXPIRE_TIME;
         } else if (Objects.equals(platform.name(), Platform.ios.name()) &&
-                (platform.getSource().contains(Source.oe_answer.name()) || platform.getSource().contains(Source.mobile_monitor_first.name()) || platform.getSource().contains(Source.mobile_monitor_second.name()))) {
+                (platform.getSource().contains(Source.OE_ANSWER.name()) || platform.getSource().contains(Source.MOBILE_FIRST.name()) || platform.getSource().contains(Source.MOBILE_SECOND.name()))) {
             calendar.add(Calendar.DAY_OF_YEAR, SystemConstant.IOS_SESSION_EXPIRE);
             redisExpire = REDIS_PHONE_EXPIRE_TIME;
         } else if (Objects.equals(platform.name(), Platform.android.name()) &&
-                (platform.getSource().contains(Source.oe_answer.name()) || platform.getSource().contains(Source.mobile_monitor_first.name()) || platform.getSource().contains(Source.mobile_monitor_second.name()))) {
+                (platform.getSource().contains(Source.OE_ANSWER.name()) || platform.getSource().contains(Source.MOBILE_FIRST.name()) || platform.getSource().contains(Source.MOBILE_SECOND.name()))) {
             calendar.add(Calendar.DAY_OF_YEAR, SystemConstant.ANDROID_SESSION_EXPIRE);
             redisExpire = REDIS_PHONE_EXPIRE_TIME;
         }

+ 1 - 1
themis-business/src/main/java/com/qmth/themis/business/service/impl/TEQrcodeServiceImpl.java

@@ -61,7 +61,7 @@ public class TEQrcodeServiceImpl implements TEQrcodeService {
 		String monitorVideoSource = exam.getMonitorVideoSource();
 		if (!monitorVideoSource.toUpperCase().contains(MonitorVideoSourceEnum.CLIENT_SCREEN.name())
 				&& !monitorVideoSource.toUpperCase().contains(MonitorVideoSourceEnum.CLIENT_CAMERA.name())
-				&& Source.mobile_monitor_first.equals(param.getSource())) {
+				&& Source.MOBILE_FIRST.equals(param.getSource())) {
 			return true;
 		}else {
 			return false;

+ 1 - 1
themis-common/src/main/java/com/qmth/themis/common/enums/Source.java

@@ -2,7 +2,7 @@ package com.qmth.themis.common.enums;
 
 public enum Source {
 
-    admin_web, admin_client, oe_client, oe_answer,mobile_monitor_first,mobile_monitor_second;
+    ADMIN_WEB, ADMIN_CLIENT, OE_CLIENT, OE_ANSWER,MOBILE_FIRST,MOBILE_SECOND;
 
     public static Source findByName(String name) {
         if (name == null) {

+ 2 - 2
themis-exam/src/main/java/com/qmth/themis/exam/api/TEQrcodeController.java

@@ -42,8 +42,8 @@ public class TEQrcodeController {
 		if (param.getSource() == null) {
 			throw new BusinessException("source不能为空");
 		}
-		if (!Source.mobile_monitor_first.equals(param.getSource())
-				&& !Source.mobile_monitor_first.equals(param.getSource())) {
+		if (!Source.MOBILE_FIRST.equals(param.getSource())
+				&& !Source.MOBILE_FIRST.equals(param.getSource())) {
 			throw new BusinessException("source 错误");
 		}
 		return ResultUtil.ok(qrcodeService.mobileMonitor(param));