.....

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamController.java

@@ -93,8 +93,8 @@ import cn.com.qmth.examcloud.core.oe.admin.api.ExamRecordCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.CheckExamIsStartedReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.CheckExamIsStartedResp;
 import cn.com.qmth.examcloud.support.cache.CacheHelper;
-import cn.com.qmth.examcloud.support.cache.bean.OrgExamConfigCacheBean;
-import cn.com.qmth.examcloud.support.cache.bean.OrgExamPropertyCacheBean;
+import cn.com.qmth.examcloud.support.cache.bean.ExamOrgSettingsCacheBean;
+import cn.com.qmth.examcloud.support.cache.bean.ExamOrgPropertyCacheBean;
 import cn.com.qmth.examcloud.support.cache.bean.StudentCacheBean;
 import cn.com.qmth.examcloud.task.api.DataSyncCloudService;
 import cn.com.qmth.examcloud.task.api.request.SyncExamReq;
@@ -663,7 +663,7 @@ public class ExamController extends ControllerSupport {
 
 	@ApiOperation(value = "查询考生的考试批次配置")
 	@GetMapping("examConfigFromCache4StudentSession/{examId}")
-	public OrgExamConfigCacheBean getExamConfigFromCacheByStudentSession(
+	public ExamOrgSettingsCacheBean getExamConfigFromCacheByStudentSession(
 			@PathVariable Long examId) {
 
 		User accessUser = getAccessUser();
@@ -676,7 +676,7 @@ public class ExamController extends ControllerSupport {
 		StudentCacheBean student = CacheHelper.getStudent(studentId);
 		Long orgId = student.getOrgId();
 
-		OrgExamConfigCacheBean orgExamConfig = CacheHelper.getOrgExamConfig(examId, orgId);
+		ExamOrgSettingsCacheBean orgExamConfig = CacheHelper.getExamOrgSettings(examId, orgId);
 		return orgExamConfig;
 	}
 
@@ -699,7 +699,7 @@ public class ExamController extends ControllerSupport {
 
 		Map<String, String> map = Maps.newHashMap();
 		for (String key : keyArray) {
-			OrgExamPropertyCacheBean orgExamProperty = CacheHelper.getOrgExamProperty(examId, orgId,
+			ExamOrgPropertyCacheBean orgExamProperty = CacheHelper.getExamOrgProperty(examId, orgId,
 					key);
 			map.put(key, orgExamProperty.getValue());
 		}

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/cache/OrgExamPropertyCache.java → examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/cache/ExamOrgPropertyCache.java

@@ -4,24 +4,24 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.core.examwork.service.ExamService;
-import cn.com.qmth.examcloud.support.cache.bean.OrgExamPropertyCacheBean;
+import cn.com.qmth.examcloud.support.cache.bean.ExamOrgPropertyCacheBean;
 import cn.com.qmth.examcloud.web.cache.RandomObjectRedisCache;
 
 @Service
-public class OrgExamPropertyCache extends RandomObjectRedisCache<OrgExamPropertyCacheBean> {
+public class ExamOrgPropertyCache extends RandomObjectRedisCache<ExamOrgPropertyCacheBean> {
 
 	@Autowired
 	private ExamService examService;
 
 	@Override
-	public OrgExamPropertyCacheBean loadFromResource(Object... keys) {
+	public ExamOrgPropertyCacheBean loadFromResource(Object... keys) {
 		Long examId = (Long) keys[0];
 		Long orgId = (Long) keys[1];
 		String key = (String) keys[3];
 
 		String value = examService.getOrgProperty(examId, orgId, key);
 
-		OrgExamPropertyCacheBean b = new OrgExamPropertyCacheBean();
+		ExamOrgPropertyCacheBean b = new ExamOrgPropertyCacheBean();
 		b.setExamId(examId);
 		b.setOrgId(orgId);
 		b.setKey(key);
@@ -31,7 +31,7 @@ public class OrgExamPropertyCache extends RandomObjectRedisCache<OrgExamProperty
 
 	@Override
 	protected String getKeyPrefix() {
-		return "E_ORG_EXAM_PROP:";
+		return "E_EXAM_ORG_PROP:";
 	}
 
 	@Override

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/cache/OrgExamConfigCache.java → examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/cache/ExamOrgSettingsCache.java

@@ -8,12 +8,12 @@ import cn.com.qmth.examcloud.core.examwork.dao.ExamRepo;
 import cn.com.qmth.examcloud.core.examwork.dao.ExamSpecialSettingsRepo;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamEntity;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamSpecialSettingsEntity;
-import cn.com.qmth.examcloud.support.cache.bean.OrgExamConfigCacheBean;
+import cn.com.qmth.examcloud.support.cache.bean.ExamOrgSettingsCacheBean;
 import cn.com.qmth.examcloud.web.cache.RandomObjectRedisCache;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 
 @Service
-public class OrgExamConfigCache extends RandomObjectRedisCache<OrgExamConfigCacheBean> {
+public class ExamOrgSettingsCache extends RandomObjectRedisCache<ExamOrgSettingsCacheBean> {
 
 	@Autowired
 	ExamRepo examRepo;
@@ -22,7 +22,7 @@ public class OrgExamConfigCache extends RandomObjectRedisCache<OrgExamConfigCach
 	ExamSpecialSettingsRepo examSpecialSettingsRepo;
 
 	@Override
-	public OrgExamConfigCacheBean loadFromResource(Object... keys) {
+	public ExamOrgSettingsCacheBean loadFromResource(Object... keys) {
 		Long examId = (Long) keys[0];
 		Long orgId = (Long) keys[1];
 
@@ -32,7 +32,7 @@ public class OrgExamConfigCache extends RandomObjectRedisCache<OrgExamConfigCach
 			throw new StatusException("002005", "考试不存在");
 		}
 
-		OrgExamConfigCacheBean bean = new OrgExamConfigCacheBean();
+		ExamOrgSettingsCacheBean bean = new ExamOrgSettingsCacheBean();
 
 		bean.setId(exam.getId());
 		bean.setBeginTime(exam.getBeginTime());
@@ -66,7 +66,7 @@ public class OrgExamConfigCache extends RandomObjectRedisCache<OrgExamConfigCach
 
 	@Override
 	protected String getKeyPrefix() {
-		return "E_ORG_EXAM_CONF:";
+		return "E_EXAM_ORG_SETTINGS:";
 	}
 
 	@Override