WANG 5 năm trước cách đây
mục cha
commit
4141128724

+ 27 - 3
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/StudentController.java

@@ -50,6 +50,9 @@ import cn.com.qmth.examcloud.core.basic.dao.entity.UserEntity;
 import cn.com.qmth.examcloud.core.basic.service.StudentService;
 import cn.com.qmth.examcloud.core.basic.service.bean.StudentInfo;
 import cn.com.qmth.examcloud.core.basic.service.cache.StudentCache;
+import cn.com.qmth.examcloud.support.cache.CacheHelper;
+import cn.com.qmth.examcloud.support.cache.bean.OrgCacheBean;
+import cn.com.qmth.examcloud.support.cache.bean.StudentCacheBean;
 import cn.com.qmth.examcloud.support.privilege.PrivilegeDefine.DataAccess.ExamWorkData.StudentInfoData.AllStudentData;
 import cn.com.qmth.examcloud.support.privilege.PrivilegeDefine.DataAccess.ExamWorkData.StudentInfoData.OrgStudentData;
 import cn.com.qmth.examcloud.support.privilege.PrivilegeManager;
@@ -507,9 +510,30 @@ public class StudentController extends ControllerSupport {
 		User accessUser = getAccessUser();
 		Long rootOrgId = accessUser.getRootOrgId();
 		Long studentId = accessUser.getUserId();
-		StudentInfo studentInfo = studentService.getStudentInfo(rootOrgId, studentId, null, null,
-				null);
-		return studentInfo;
+
+		StudentCacheBean s = CacheHelper.getStudent(studentId);
+
+		OrgCacheBean org = CacheHelper.getOrg(s.getOrgId());
+		OrgCacheBean rootOrg = CacheHelper.getOrg(rootOrgId);
+
+		StudentInfo info = new StudentInfo();
+
+		info.setEnable(s.getEnable());
+		info.setId(s.getId());
+		info.setIdentityNumber(s.getIdentityNumber());
+		info.setName(s.getName());
+		info.setOrgCode(org.getCode());
+		info.setOrgId(org.getId());
+		info.setOrgName(org.getName());
+		info.setPhoneNumber(s.getPhoneNumber());
+		info.setPhotoPath(s.getPhotoPath());
+		info.setRemark(s.getRemark());
+		info.setRootOrgId(rootOrgId);
+		info.setRootOrgName(rootOrg.getName());
+		info.setSecurityPhone(s.getSecurityPhone());
+		info.setStudentCodeList(s.getStudentCodeList());
+
+		return info;
 	}
 
 	@ApiOperation(value = "查询学生")

+ 17 - 0
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/cache/StudentCache.java

@@ -1,12 +1,18 @@
 package cn.com.qmth.examcloud.core.basic.service.cache;
 
+import java.util.List;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.google.common.collect.Lists;
+
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.commons.util.UrlUtil;
+import cn.com.qmth.examcloud.core.basic.dao.StudentCodeRepo;
 import cn.com.qmth.examcloud.core.basic.dao.StudentRepo;
+import cn.com.qmth.examcloud.core.basic.dao.entity.StudentCodeEntity;
 import cn.com.qmth.examcloud.core.basic.dao.entity.StudentEntity;
 import cn.com.qmth.examcloud.support.cache.bean.StudentCacheBean;
 import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
@@ -19,6 +25,9 @@ public class StudentCache extends RandomObjectRedisCache<StudentCacheBean> {
 	@Autowired
 	StudentRepo studentRepo;
 
+	@Autowired
+	StudentCodeRepo studentCodeRepo;
+
 	@Override
 	public StudentCacheBean loadFromResource(Object... keys) {
 		Long studentId = (Long) keys[0];
@@ -47,6 +56,14 @@ public class StudentCache extends RandomObjectRedisCache<StudentCacheBean> {
 			b.setPhotoPath(path);
 		}
 
+		List<StudentCodeEntity> studentCodeEntityList = studentCodeRepo.findByStudentId(s.getId());
+
+		List<String> studentCodeList = Lists.newArrayList();
+		for (StudentCodeEntity cur : studentCodeEntityList) {
+			studentCodeList.add(cur.getStudentCode());
+		}
+		b.setStudentCodeList(studentCodeList);
+
 		return b;
 	}