...

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/service/examwork/api/ExamApi.java

@@ -42,9 +42,9 @@ import cn.com.qmth.examcloud.service.examwork.dao.CourseGroupRepo;
 import cn.com.qmth.examcloud.service.examwork.dao.ExamOrgRepo;
 import cn.com.qmth.examcloud.service.examwork.dao.ExamStudentRepo;
 import cn.com.qmth.examcloud.service.examwork.entity.Exam;
-import cn.com.qmth.examcloud.service.examwork.entity.CourseGroup;
+import cn.com.qmth.examcloud.service.examwork.entity.CourseGroupEntity;
 import cn.com.qmth.examcloud.service.examwork.entity.CourseGroupRelation;
-import cn.com.qmth.examcloud.service.examwork.entity.ExamOrg;
+import cn.com.qmth.examcloud.service.examwork.entity.ExamOrgEntity;
 import cn.com.qmth.examcloud.service.examwork.entity.ExamOrgPK;
 import cn.com.qmth.examcloud.service.examwork.entity.ExamStudent;
 import cn.com.qmth.examcloud.service.examwork.enums.ExamType;
@@ -281,11 +281,11 @@ public class ExamApi extends ControllerSupport {
 			@PathVariable Integer curPage, @PathVariable Integer pageSize) {
 
 		Pageable pageable = new PageRequest(curPage-1, pageSize, Sort.Direction.DESC, "updateTime");
-		List<CourseGroup> groupList = courseGroupRepo.findAllByExamId(examId, pageable);
+		List<CourseGroupEntity> groupList = courseGroupRepo.findAllByExamId(examId, pageable);
 
 		List<CourseGroupBean> ret = Lists.newArrayList();
 
-		for (CourseGroup curCourseGroup : groupList) {
+		for (CourseGroupEntity curCourseGroup : groupList) {
 			CourseGroupBean bean = new CourseGroupBean();
 			bean.setBeginTime(curCourseGroup.getBeginTime());
 			bean.setCreationTime(curCourseGroup.getCreationTime());
@@ -326,12 +326,12 @@ public class ExamApi extends ControllerSupport {
 			groupIdList.add(groupId);
 		}
 
-		List<CourseGroup> groupList = courseGroupRepo
+		List<CourseGroupEntity> groupList = courseGroupRepo
 				.findAllByIdInOrderByUpdateTimeDesc(groupIdList);
 
 		List<CourseGroupBean> ret = Lists.newArrayList();
 
-		for (CourseGroup curCourseGroup : groupList) {
+		for (CourseGroupEntity curCourseGroup : groupList) {
 			CourseGroupBean bean = new CourseGroupBean();
 			bean.setBeginTime(curCourseGroup.getBeginTime());
 			bean.setCreationTime(curCourseGroup.getCreationTime());
@@ -361,7 +361,7 @@ public class ExamApi extends ControllerSupport {
 	public void updateCourseGroup(@RequestBody CourseGroupBean courseGroupBean,
 			HttpServletRequest request) {
 
-		CourseGroup courseGroup = new CourseGroup();
+		CourseGroupEntity courseGroup = new CourseGroupEntity();
 		courseGroup.setBeginTime(courseGroupBean.getBeginTime());
 		courseGroup.setCreationTime(courseGroupBean.getCreationTime());
 		courseGroup.setDescription(courseGroupBean.getDescription());
@@ -400,28 +400,28 @@ public class ExamApi extends ControllerSupport {
 	public List<?> getExamOrgList(@PathVariable Long examId, @PathVariable Integer curPage,
 			@PathVariable Integer pageSize) {
 		Pageable pageable = new PageRequest(curPage-1, pageSize, Sort.Direction.DESC, "updateTime");
-		List<ExamOrg> allByExamId = examOrgRepo.findAllByExamId(examId, pageable);
+		List<ExamOrgEntity> allByExamId = examOrgRepo.findAllByExamId(examId, pageable);
 		return allByExamId;
 	}
 
 	@ApiOperation(value = "新增考试相关的学习中心设置", notes = "")
 	@PostMapping("/exam/examOrg")
-	public ExamOrg addExamOrg(@RequestBody ExamOrg examOrg) {
-		ExamOrg ret = examOrgRepo.save(examOrg);
+	public ExamOrgEntity addExamOrg(@RequestBody ExamOrgEntity examOrg) {
+		ExamOrgEntity ret = examOrgRepo.save(examOrg);
 		return ret;
 	}
 
 	@ApiOperation(value = "更新考试相关的学习中心设置", notes = "")
 	@PutMapping("/exam/examOrg")
-	public ExamOrg updateExamOrg(@RequestBody ExamOrg examOrg) {
-		ExamOrg ret = examOrgRepo.save(examOrg);
+	public ExamOrgEntity updateExamOrg(@RequestBody ExamOrgEntity examOrg) {
+		ExamOrgEntity ret = examOrgRepo.save(examOrg);
 		return ret;
 	}
 	
 	@ApiOperation(value = "删除考试相关的学习中心设置", notes = "")
 	@DeleteMapping("/exam/examOrg/{examId}/{orgId}")
 	public void deleteExamOrg(@PathVariable Long examId, @PathVariable Long orgId) {
-		ExamOrg examOrg = new ExamOrg();
+		ExamOrgEntity examOrg = new ExamOrgEntity();
 		examOrg.setExamId(examId);
 		examOrg.setOrgId(orgId);
 		examOrgRepo.delete(examOrg);

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/dao/CourseGroupRepo.java

@@ -6,7 +6,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.service.examwork.entity.CourseGroup;
+import cn.com.qmth.examcloud.service.examwork.entity.CourseGroupEntity;
 
 /**
  * 类注释
@@ -17,11 +17,11 @@ import cn.com.qmth.examcloud.service.examwork.entity.CourseGroup;
  */
 public interface CourseGroupRepo
 		extends
-			JpaRepository<CourseGroup, Long>,
-			QueryByExampleExecutor<CourseGroup> {
+			JpaRepository<CourseGroupEntity, Long>,
+			QueryByExampleExecutor<CourseGroupEntity> {
 
-	List<CourseGroup> findAllByExamId(Long examId, Pageable pageable);
+	List<CourseGroupEntity> findAllByExamId(Long examId, Pageable pageable);
 
-	List<CourseGroup> findAllByIdInOrderByUpdateTimeDesc(List<Long> idList);
+	List<CourseGroupEntity> findAllByIdInOrderByUpdateTimeDesc(List<Long> idList);
 
 }

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/dao/ExamOrgRepo.java

@@ -6,15 +6,15 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.service.examwork.entity.ExamOrg;
+import cn.com.qmth.examcloud.service.examwork.entity.ExamOrgEntity;
 
 public interface ExamOrgRepo
 		extends
-			JpaRepository<ExamOrg, Long>,
-			QueryByExampleExecutor<ExamOrg> {
+			JpaRepository<ExamOrgEntity, Long>,
+			QueryByExampleExecutor<ExamOrgEntity> {
 
-	List<ExamOrg> findAllByExamId(Long examId, Pageable pageable);
+	List<ExamOrgEntity> findAllByExamId(Long examId, Pageable pageable);
 
-	List<ExamOrg> findAllByExamIdAndOrgId(Long examId, Long orgId, Pageable pageable);
+	List<ExamOrgEntity> findAllByExamIdAndOrgId(Long examId, Long orgId, Pageable pageable);
 
 }

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/CourseGroup.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/CourseGroupEntity.java

@@ -19,7 +19,7 @@ import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
  */
 @Entity
 @Table(name = "ecs_e_course_group")
-public class CourseGroup extends JpaEntity {
+public class CourseGroupEntity extends JpaEntity {
 
 	private static final long serialVersionUID = -3335725218626631530L;
 

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/ExamOrg.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/ExamOrgEntity.java

@@ -21,7 +21,7 @@ import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
 @Entity
 @Table(name = "ecs_e_exam_org")
 @IdClass(ExamOrgPK.class)
-public class ExamOrg extends JpaEntity {
+public class ExamOrgEntity extends JpaEntity {
 
 	private static final long serialVersionUID = -3335725218626631530L;