增加修改领域模型,增加API接口和服务类

exam-work-api/src/main/java/cn/com/qmth/examcloud/service/core/api/ExamStudentApi.java

@@ -1,12 +0,0 @@
-package cn.com.qmth.examcloud.service.core.api;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Created by songyue on 17/1/13.
- */
-@RestController
-@RequestMapping("${app.api.root}/examstudent")
-public class ExamStudentApi {
-}

exam-work-api/src/main/java/cn/com/qmth/examcloud/service/core/api/ExamApi.java → exam-work-api/src/main/java/cn/com/qmth/examcloud/service/examwork/api/ExamApi.java

@@ -1,21 +1,16 @@
-package cn.com.qmth.examcloud.service.core.api;
+package cn.com.qmth.examcloud.service.examwork.api;
 
-import cn.com.qmth.examcloud.service.core.dao.ExamRepo;
-import cn.com.qmth.examcloud.service.core.entity.Exam;
-import cn.com.qmth.examcloud.service.core.service.ExamService;
+import cn.com.qmth.examcloud.service.examwork.dao.ExamRepo;
+import cn.com.qmth.examcloud.service.examwork.entity.Exam;
+import cn.com.qmth.examcloud.service.examwork.service.ExamService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.ExampleMatcher;
 import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import static org.springframework.data.domain.ExampleMatcher.GenericPropertyMatchers.startsWith;
-
 /**
+ * 考试服务API
  * Created by songyue on 17/1/13.
  */
 @RestController
@@ -42,8 +37,8 @@ public class ExamApi {
 
     @ApiOperation(value="按ID查询考试批次",notes = "ID查询")
     @GetMapping("/exam/{examId}")
-    public ResponseEntity<Exam> getExamById(@PathVariable Long examId){
-        return examService.getExamById(examId);
+    public ResponseEntity<Exam> getExamById(@PathVariable Long id){
+        return examService.getExamById(id);
     }
 
     @ApiOperation(value="新增考试批次",notes = "新增")
@@ -60,7 +55,7 @@ public class ExamApi {
 
     @ApiOperation(value="按ID删除考试批次",notes = "删除")
     @DeleteMapping("/exam/{examId}")
-    public ResponseEntity deleteExam(@PathVariable Long examId){
-        return examService.deleteExam(examId);
+    public ResponseEntity deleteExam(@PathVariable Long id){
+        return examService.deleteExam(id);
     }
 }

exam-work-api/src/main/java/cn/com/qmth/examcloud/service/core/api/ExamScoreApi.java → exam-work-api/src/main/java/cn/com/qmth/examcloud/service/examwork/api/ExamScoreApi.java

@@ -1,8 +1,8 @@
-package cn.com.qmth.examcloud.service.core.api;
+package cn.com.qmth.examcloud.service.examwork.api;
 
-import cn.com.qmth.examcloud.service.core.dao.ExamScoreRepo;
-import cn.com.qmth.examcloud.service.core.entity.ExamScore;
-import cn.com.qmth.examcloud.service.core.service.ExamScoreService;
+import cn.com.qmth.examcloud.service.examwork.dao.ExamScoreRepo;
+import cn.com.qmth.examcloud.service.examwork.entity.ExamScore;
+import cn.com.qmth.examcloud.service.examwork.service.ExamScoreService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
@@ -10,6 +10,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 /**
+ * 考试分数服务API
  * Created by songyue on 17/1/13.
  */
 @RestController
@@ -22,39 +23,38 @@ public class ExamScoreApi {
     @Autowired
     ExamScoreService examScoreService;
 
-    @Autowired
     @ApiOperation(value="查询所有考试分数",notes = "分页")
-    @GetMapping("/examscore/all/{curPage}/{pageSize}")
-    public ResponseEntity getAllExam(@ModelAttribute ExamScore examCriteria, @PathVariable Integer curPage, @PathVariable Integer pageSize){
+    @GetMapping("/exam_score/all/{curPage}/{pageSize}")
+    public ResponseEntity getAllExamScore(@ModelAttribute ExamScore examCriteria, @PathVariable Integer curPage, @PathVariable Integer pageSize){
         return examScoreService.getAllExamScore(examCriteria,new PageRequest(curPage - 1,pageSize));
     }
 
     @ApiOperation(value="查询所有考试分数",notes = "不分页")
-    @GetMapping("/examscore/all")
+    @GetMapping("/exam_score/all")
     public ResponseEntity getAllExamScore(@ModelAttribute ExamScore examCriteria){
         return examScoreService.getAllExamScore(examCriteria);
     }
 
     @ApiOperation(value="按ID查询考试分数",notes = "ID查询")
-    @GetMapping("/examscore/{id}")
+    @GetMapping("/exam_score/{id}")
     public ResponseEntity<ExamScore> getExamScoreById(@PathVariable Long id){
         return examScoreService.getExamScoreById(id);
     }
 
     @ApiOperation(value="新增考试分数",notes = "新增")
-    @PostMapping("/examscore")
+    @PostMapping("/exam_score")
     public ResponseEntity addExamScore(@ModelAttribute ExamScore examScore){
         return examScoreService.saveExamScore(examScore);
     }
 
     @ApiOperation(value="更新考试分数",notes = "更新")
-    @PutMapping("/examscore")
+    @PutMapping("/exam_score")
     public ResponseEntity updateExamScore(@ModelAttribute ExamScore examScore){
         return examScoreService.saveExamScore(examScore);
     }
 
     @ApiOperation(value="按ID删除考试分数",notes = "删除")
-    @DeleteMapping("/examscore/{id}")
+    @DeleteMapping("/exam_score/{id}")
     public ResponseEntity deleteExamScore(@PathVariable Long id){
         return examScoreService.deleteExamScore(id);
     }

exam-work-api/src/main/java/cn/com/qmth/examcloud/service/examwork/api/ExamStudentApi.java

@@ -0,0 +1,61 @@
+package cn.com.qmth.examcloud.service.examwork.api;
+
+import cn.com.qmth.examcloud.service.examwork.dao.ExamStudentRepo;
+import cn.com.qmth.examcloud.service.examwork.entity.ExamStudent;
+import cn.com.qmth.examcloud.service.examwork.service.ExamStudentService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 考生服务API
+ * Created by songyue on 17/1/13.
+ */
+@RestController
+@RequestMapping("${app.api.root}")
+public class ExamStudentApi {
+
+    @Autowired
+    ExamStudentRepo examStudentRepo;
+
+    @Autowired
+    ExamStudentService examStudentService;
+
+    @ApiOperation(value="查询所有考试学生",notes = "分页")
+    @GetMapping("/exam_student/all/{curPage}/{pageSize}")
+    public ResponseEntity getAllExamStudent(@ModelAttribute ExamStudent examCriteria, @PathVariable Integer curPage, @PathVariable Integer pageSize){
+        return examStudentService.getAllExamStudent(examCriteria,new PageRequest(curPage - 1,pageSize));
+    }
+
+    @ApiOperation(value="查询所有考试学生",notes = "不分页")
+    @GetMapping("/exam_student/all")
+    public ResponseEntity getAllExamStudent(@ModelAttribute ExamStudent examCriteria){
+        return examStudentService.getAllExamStudent(examCriteria);
+    }
+
+    @ApiOperation(value="按ID查询考试学生",notes = "ID查询")
+    @GetMapping("/exam_student/{id}")
+    public ResponseEntity<ExamStudent> getExamStudentById(@PathVariable Long id){
+        return examStudentService.getExamStudentById(id);
+    }
+
+    @ApiOperation(value="新增考试学生",notes = "新增")
+    @PostMapping("/exam_student")
+    public ResponseEntity addExamStudent(@ModelAttribute ExamStudent examStudent){
+        return examStudentService.saveExamStudent(examStudent);
+    }
+
+    @ApiOperation(value="更新考试学生",notes = "更新")
+    @PutMapping("/exam_student")
+    public ResponseEntity updateExamStudent(@ModelAttribute ExamStudent examStudent){
+        return examStudentService.saveExamStudent(examStudent);
+    }
+
+    @ApiOperation(value="按ID删除考试学生",notes = "删除")
+    @DeleteMapping("/exam_student/{id}")
+    public ResponseEntity deleteExamStudent(@PathVariable Long id){
+        return examStudentService.deleteExamStudent(id);
+    }
+}

exam-work-api/src/main/java/cn/com/qmth/examcloud/service/core/service/ExamScoreService.java → exam-work-api/src/main/java/cn/com/qmth/examcloud/service/examwork/service/ExamScoreService.java

@@ -1,7 +1,7 @@
-package cn.com.qmth.examcloud.service.core.service;
+package cn.com.qmth.examcloud.service.examwork.service;
 
-import cn.com.qmth.examcloud.service.core.dao.ExamScoreRepo;
-import cn.com.qmth.examcloud.service.core.entity.ExamScore;
+import cn.com.qmth.examcloud.service.examwork.dao.ExamScoreRepo;
+import cn.com.qmth.examcloud.service.examwork.entity.ExamScore;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.ExampleMatcher;

exam-work-api/src/main/java/cn/com/qmth/examcloud/service/core/service/ExamService.java → exam-work-api/src/main/java/cn/com/qmth/examcloud/service/examwork/service/ExamService.java

@@ -1,7 +1,7 @@
-package cn.com.qmth.examcloud.service.core.service;
+package cn.com.qmth.examcloud.service.examwork.service;
 
-import cn.com.qmth.examcloud.service.core.dao.ExamRepo;
-import cn.com.qmth.examcloud.service.core.entity.Exam;
+import cn.com.qmth.examcloud.service.examwork.dao.ExamRepo;
+import cn.com.qmth.examcloud.service.examwork.entity.Exam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.ExampleMatcher;

exam-work-api/src/main/java/cn/com/qmth/examcloud/service/core/service/ExamStudentService.java → exam-work-api/src/main/java/cn/com/qmth/examcloud/service/examwork/service/ExamStudentService.java

@@ -1,7 +1,7 @@
-package cn.com.qmth.examcloud.service.core.service;
+package cn.com.qmth.examcloud.service.examwork.service;
 
-import cn.com.qmth.examcloud.service.core.dao.ExamStudentRepo;
-import cn.com.qmth.examcloud.service.core.entity.ExamStudent;
+import cn.com.qmth.examcloud.service.examwork.dao.ExamStudentRepo;
+import cn.com.qmth.examcloud.service.examwork.entity.ExamStudent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.ExampleMatcher;

exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/core/dao/ExamRepo.java → exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/examwork/dao/ExamRepo.java

@@ -1,7 +1,7 @@
-package cn.com.qmth.examcloud.service.core.dao;
+package cn.com.qmth.examcloud.service.examwork.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import cn.com.qmth.examcloud.service.core.entity.Exam;
+import cn.com.qmth.examcloud.service.examwork.entity.Exam;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
 public interface ExamRepo extends JpaRepository<Exam, Long>,QueryByExampleExecutor<Exam>{

exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/core/dao/ExamScoreRepo.java → exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/examwork/dao/ExamScoreRepo.java

@@ -1,8 +1,8 @@
-package cn.com.qmth.examcloud.service.core.dao;
+package cn.com.qmth.examcloud.service.examwork.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import cn.com.qmth.examcloud.service.core.entity.ExamScore;
+import cn.com.qmth.examcloud.service.examwork.entity.ExamScore;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
 public interface ExamScoreRepo extends JpaRepository<ExamScore, Long>,QueryByExampleExecutor<ExamScore> {

exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/core/dao/ExamStudentRepo.java → exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/examwork/dao/ExamStudentRepo.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.service.core.dao;
+package cn.com.qmth.examcloud.service.examwork.dao;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import cn.com.qmth.examcloud.service.core.entity.ExamStudent;
+import cn.com.qmth.examcloud.service.examwork.entity.ExamStudent;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
 public interface ExamStudentRepo extends JpaRepository<ExamStudent, Long>,QueryByExampleExecutor<ExamStudent> {

exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/core/entity/Exam.java → exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/Exam.java

@@ -1,6 +1,6 @@
-package cn.com.qmth.examcloud.service.core.entity;
+package cn.com.qmth.examcloud.service.examwork.entity;
 
-import cn.com.qmth.examcloud.service.core.enums.ExamType;
+import cn.com.qmth.examcloud.service.examwork.enums.ExamType;
 
 import java.io.Serializable;
 import java.util.Date;

exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/core/entity/ExamScore.java → exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/ExamScore.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.entity;
+package cn.com.qmth.examcloud.service.examwork.entity;
 
 import java.io.Serializable;
 

exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/core/entity/ExamStudent.java → exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/ExamStudent.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.entity;
+package cn.com.qmth.examcloud.service.examwork.entity;
 
 import java.io.Serializable;
 

exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/core/enums/ExamType.java → exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/examwork/enums/ExamType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.enums;
+package cn.com.qmth.examcloud.service.examwork.enums;
 
 /**
  * 

exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/core/enums/isValid.java → exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/examwork/enums/isValid.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.enums;
+package cn.com.qmth.examcloud.service.examwork.enums;
 
 /**
  * Created by songyue on 17/1/13.

exam-work-main/src/main/java/cn/com/qmth/examcloud/service/core/Application.java → exam-work-main/src/main/java/cn/com/qmth/examcloud/service/examwork/Application.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core;
+package cn.com.qmth.examcloud.service.examwork;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

exam-work-main/src/main/java/cn/com/qmth/examcloud/service/core/Swagger2.java → exam-work-main/src/main/java/cn/com/qmth/examcloud/service/examwork/Swagger2.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core;
+package cn.com.qmth.examcloud.service.examwork;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -21,7 +21,7 @@ public class Swagger2 {
         return new Docket(DocumentationType.SWAGGER_2)
                 .apiInfo(apiInfo())
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("cn.com.qmth.examcloud.service.core"))
+                .apis(RequestHandlerSelectors.basePackage("cn.com.qmth.examcloud.service.examwork"))
                 .paths(PathSelectors.any())
                 .build();
     }

exam-work-main/src/main/resources/application.properties

@@ -21,7 +21,7 @@ spring.jpa.hibernate.ddl-auto=update
 
 spring.http.multipart.max-file-size=10Mb
 
-spring.application.name=ExamCloud-service-core
+spring.application.name=ExamCloud-service-exam-work
 server.port=8001
 eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/
 app.api.root=/api/ecs_exam_work