wangwei 7 years ago
parent
commit
4abff943ff

+ 25 - 27
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/CourseCloudServiceProvider.java

@@ -1,9 +1,5 @@
 package cn.com.qmth.examcloud.core.basic.api.provider;
 
-import java.util.Date;
-
-import io.swagger.annotations.ApiOperation;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,11 +11,12 @@ import cn.com.qmth.examcloud.core.basic.api.CourseCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.CourseReq;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Course;
 import cn.com.qmth.examcloud.core.basic.service.impl.CourseService;
+import io.swagger.annotations.ApiOperation;
 
 @RestController
-@RequestMapping("${url.prefix}/course")
+@RequestMapping("${$rmp}" + "course")
 public class CourseCloudServiceProvider implements CourseCloudService {
-	
+
 	@Autowired
 	CourseService courseService;
 
@@ -27,29 +24,30 @@ public class CourseCloudServiceProvider implements CourseCloudService {
 	@PostMapping
 	@Override
 	public void saveCourse(CourseReq courseReq) throws Exception {
-		Course course = courseService.findByOrgIdAndCode(courseReq.getOrgId(), courseReq.getCourseCode());
-		if(course == null){
+		Course course = courseService.findByOrgIdAndCode(courseReq.getOrgId(),
+				courseReq.getCourseCode());
+		if (course == null) {
 			course = new Course();
-            course.setOrgId(courseReq.getOrgId());
-            course.setName(courseReq.getCourseName());
-            course.setCode(courseReq.getCourseCode());
-            course.setLevel(getCourseLevelByCName(courseReq.getCourseLevel()));
-            courseService.save(course);
+			course.setOrgId(courseReq.getOrgId());
+			course.setName(courseReq.getCourseName());
+			course.setCode(courseReq.getCourseCode());
+			course.setLevel(getCourseLevelByCName(courseReq.getCourseLevel()));
+			courseService.save(course);
+		}
+	}
+
+	private CourseLevel getCourseLevelByCName(String cname) {
+		CourseLevel courseLevel = null;
+		for (CourseLevel level : CourseLevel.values()) {
+			if (cname.equals(level.getName())) {
+				courseLevel = level;
+			}
+		}
+		if (courseLevel == null) {
+			throw new StatusException("CORE-BASIC-courseLevel not exists", "课程层次不存在");
+		} else {
+			return courseLevel;
 		}
 	}
-	
-	private CourseLevel getCourseLevelByCName(String cname){
-    	CourseLevel courseLevel = null;
-        for(CourseLevel level:CourseLevel.values()){
-        	if(cname.equals(level.getName())){
-        		courseLevel = level;
-        	}
-        }
-        if(courseLevel==null){
-        	throw new StatusException("CORE-BASIC-courseLevel not exists","课程层次不存在");
-        }else{
-        	return courseLevel;
-        }
-    }
 
 }

+ 1 - 1
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/DemoCloudServiceProvider.java

@@ -13,7 +13,7 @@ import cn.com.qmth.examcloud.core.basic.service.DemoService;
 import io.swagger.annotations.ApiOperation;
 
 @RestController
-@RequestMapping("${url.prefix}/demo")
+@RequestMapping("${$rmp}" + "demo")
 public class DemoCloudServiceProvider extends ControllerSupport implements DemoCloudService {
 
 	private static final long serialVersionUID = 1688796399486678855L;

+ 1 - 1
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/OrgCloudServiceProvider.java

@@ -24,7 +24,7 @@ import cn.com.qmth.examcloud.core.basic.service.impl.OrgService;
 import io.swagger.annotations.ApiOperation;
 
 @RestController
-@RequestMapping("${url.prefix}/org")
+@RequestMapping("${$rmp}" + "org")
 public class OrgCloudServiceProvider extends ControllerSupport implements OrgCloudService {
 
 	@Autowired

+ 8 - 8
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/StudentCloudServiceProvider.java

@@ -13,33 +13,33 @@ import cn.com.qmth.examcloud.core.basic.dao.entity.Student;
 import cn.com.qmth.examcloud.core.basic.service.impl.StudentService;
 
 @RestController
-@RequestMapping("${url.prefix}/student")
-public class StudentCloudServiceProvider extends ControllerSupport implements StudentCloudService{
+@RequestMapping("${$rmp}" + "student")
+public class StudentCloudServiceProvider extends ControllerSupport implements StudentCloudService {
 
 	@Autowired
 	private UserRepo userRepo;
-	
+
 	@Autowired
 	private StudentService studentService;
-	
+
 	@Autowired
 	private StudentRepo studentRepo;
-	
+
 	@Override
 	public void saveStudent(StudentReq studentReq) {
 		Student oldStudent = studentRepo.findByIdentityNumber(studentReq.getIdentityNumber());
-		if(oldStudent == null){
+		if (oldStudent == null) {
 			Student student = new Student();
 			student.setName(studentReq.getName());
 			student.setIdentityNumber(studentReq.getIdentityNumber());
 			student.setStudentCode(studentReq.getStudentCode());
 			student.setOrgId(studentReq.getOrgId());
 			studentRepo.save(student);
-		}else{
+		} else {
 			oldStudent.setOrgId(studentReq.getOrgId());
 			oldStudent.setRootOrgId(studentReq.getRootOrgId());
 			studentRepo.save(oldStudent);
 		}
 	}
-	
+
 }

+ 1 - 1
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/UserCloudServiceProvider.java

@@ -22,7 +22,7 @@ import io.swagger.annotations.ApiOperation;
  *
  */
 @RestController
-@RequestMapping("${url.prefix}/user")
+@RequestMapping("${$rmp}" + "user")
 public class UserCloudServiceProvider extends ControllerSupport implements UserCloudService {
 
 	@Autowired

+ 1 - 1
examcloud-core-basic-starter/src/main/resources/application.properties

@@ -18,4 +18,4 @@ spring.http.multipart.max-file-size=10Mb
 hystrix.command.default.execution.timeout.enabled=false
 
 app.api.root=/api/ecs_core
-url.prefix=/api/core/basic
+$rmp=/api/core/basic/