重构代码,修改maven构建方法

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

@@ -9,6 +9,8 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
+
 /**
  * 考试服务API
  * Created by songyue on 17/1/13.
@@ -23,38 +25,45 @@ public class ExamApi {
     @Autowired
     ExamService examService;
 
-    @ApiOperation(value="查询所有考试批次",notes = "分页")
+    @ApiOperation(value="查询所有考试批次",notes = "分页带查询")
     @GetMapping("/exam/all/{curPage}/{pageSize}")
     public ResponseEntity getAllExam(@ModelAttribute Exam examCriteria, @PathVariable Integer curPage,@PathVariable Integer pageSize){
         return examService.getAllExam(examCriteria,new PageRequest(curPage - 1,pageSize));
     }
 
-    @ApiOperation(value="查询所有考试批次",notes = "不分页")
+    @ApiOperation(value="查询所有考试批次",notes = "不分页带查询")
     @GetMapping("/exam/all")
     public ResponseEntity getAllExam(@ModelAttribute Exam examCriteria){
         return examService.getAllExam(examCriteria);
     }
 
+    @ApiOperation(value="查询所有考试批次",notes = "不分页不带查询")
+    @GetMapping("/exam")
+    public ResponseEntity getAllExam(){
+        return examService.getAllExam();
+    }
+
     @ApiOperation(value="按ID查询考试批次",notes = "ID查询")
-    @GetMapping("/exam/{examId}")
+    @GetMapping("/exam/{id}")
     public ResponseEntity<Exam> getExamById(@PathVariable Long id){
         return examService.getExamById(id);
     }
 
     @ApiOperation(value="新增考试批次",notes = "新增")
     @PostMapping("/exam")
-    public ResponseEntity addExam(@ModelAttribute Exam exam){
+    public ResponseEntity addExam(@RequestBody Exam exam){
+        exam.setCreateTime(new Date());
         return examService.saveExam(exam);
     }
 
     @ApiOperation(value="更新考试批次",notes = "更新")
     @PutMapping("/exam")
-    public ResponseEntity updateExam(@ModelAttribute Exam exam){
+    public ResponseEntity updateExam(@RequestBody Exam exam){
         return examService.saveExam(exam);
     }
 
     @ApiOperation(value="按ID删除考试批次",notes = "删除")
-    @DeleteMapping("/exam/{examId}")
+    @DeleteMapping("/exam/{id}")
     public ResponseEntity deleteExam(@PathVariable Long id){
         return examService.deleteExam(id);
     }

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

@@ -43,13 +43,13 @@ public class ExamScoreApi {
 
     @ApiOperation(value="新增考试分数",notes = "新增")
     @PostMapping("/exam_score")
-    public ResponseEntity addExamScore(@ModelAttribute ExamScore examScore){
+    public ResponseEntity addExamScore(@RequestBody ExamScore examScore){
         return examScoreService.saveExamScore(examScore);
     }
 
     @ApiOperation(value="更新考试分数",notes = "更新")
     @PutMapping("/exam_score")
-    public ResponseEntity updateExamScore(@ModelAttribute ExamScore examScore){
+    public ResponseEntity updateExamScore(@RequestBody ExamScore examScore){
         return examScoreService.saveExamScore(examScore);
     }
 

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

@@ -6,6 +6,7 @@ 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.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -35,6 +36,12 @@ public class ExamStudentApi {
         return examStudentService.getAllExamStudent(examCriteria);
     }
 
+    @ApiOperation(value="查询所有考试学生",notes = "不分页不带查询条件")
+    @GetMapping("/exam_student")
+    public ResponseEntity getAllExamStudent(){
+        return new ResponseEntity(examStudentRepo.findAll(), HttpStatus.OK);
+    }
+
     @ApiOperation(value="按ID查询考试学生",notes = "ID查询")
     @GetMapping("/exam_student/{id}")
     public ResponseEntity<ExamStudent> getExamStudentById(@PathVariable Long id){
@@ -43,13 +50,13 @@ public class ExamStudentApi {
 
     @ApiOperation(value="新增考试学生",notes = "新增")
     @PostMapping("/exam_student")
-    public ResponseEntity addExamStudent(@ModelAttribute ExamStudent examStudent){
+    public ResponseEntity addExamStudent(@RequestBody ExamStudent examStudent){
         return examStudentService.saveExamStudent(examStudent);
     }
 
     @ApiOperation(value="更新考试学生",notes = "更新")
     @PutMapping("/exam_student")
-    public ResponseEntity updateExamStudent(@ModelAttribute ExamStudent examStudent){
+    public ResponseEntity updateExamStudent(@RequestBody ExamStudent examStudent){
         return examStudentService.saveExamStudent(examStudent);
     }
 

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

@@ -40,12 +40,19 @@ public class ExamService {
      * @return
      */
     public ResponseEntity getAllExam(Exam examCriteria){
-        ExampleMatcher exampleMatcher = ExampleMatcher.matching()
-                .withMatcher("name",startsWith());
-        Example<Exam> examExample = Example.of(examCriteria, exampleMatcher);
+//        ExampleMatcher exampleMatcher = ExampleMatcher.matching();
+        Example<Exam> examExample = Example.of(examCriteria);
         return new ResponseEntity(examRepo.findAll(examExample), HttpStatus.OK);
     }
 
+    /**
+     * 获取所有考试批次
+     * @return
+     */
+    public ResponseEntity getAllExam(){
+        return new ResponseEntity(examRepo.findAll(), HttpStatus.OK);
+    }
+
     /**
      * 按ID获取考试批次
      * @param examId

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

@@ -1,6 +1,8 @@
 package cn.com.qmth.examcloud.service.examwork.entity;
 
 import cn.com.qmth.examcloud.service.examwork.enums.ExamType;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -21,32 +23,30 @@ public class Exam implements Serializable {
 	@GeneratedValue
 	private long id;
 
-	@NotNull
 	@Temporal(value = TemporalType.DATE)
+	@DateTimeFormat(pattern="yyyy-MM-dd")
 	private Date beginTime;
 
-	@NotNull
 	@Temporal(value = TemporalType.DATE)
+	@DateTimeFormat(pattern="yyyy-MM-dd")
 	private Date endTime;
 
 	@NotNull
 	private String name;
 
-	@NotNull
 	private ExamType examType;
 
-	@NotNull
-	private Long duration;
+	private Integer duration;
 
-	@NotNull
-	private Long freezeTime;
+	private Integer freezeTime;
 
-	@NotNull
 	private String status;
 
 	private String remark;
 
+	@CreatedDate
 	@Temporal(value = TemporalType.DATE)
+	@DateTimeFormat(pattern="yyyy-MM-dd")
 	private Date createTime;
 
 	public long getId() {
@@ -93,19 +93,19 @@ public class Exam implements Serializable {
 		this.examType = examType;
 	}
 
-	public Long getDuration() {
+	public Integer getDuration() {
 		return duration;
 	}
 
-	public void setDuration(Long duration) {
+	public void setDuration(Integer duration) {
 		this.duration = duration;
 	}
 
-	public Long getFreezeTime() {
+	public Integer getFreezeTime() {
 		return freezeTime;
 	}
 
-	public void setFreezeTime(Long freezeTime) {
+	public void setFreezeTime(Integer freezeTime) {
 		this.freezeTime = freezeTime;
 	}
 

exam-work-main/src/test/java/cn/com/qmth/examcloud/service/examwork/AppTest.java

@@ -0,0 +1,78 @@
+package cn.com.qmth.examcloud.service.examwork;
+
+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.enums.ExamType;
+import cn.com.qmth.examcloud.service.examwork.service.ExamService;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.domain.Example;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.Month;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Unit test for simple App.
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class AppTest {
+
+    @Autowired
+    ExamRepo examRepo;
+
+    @Autowired
+    ExamService examService;
+
+    @Test
+    public void testExam() throws ParseException {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Exam exam1 = new Exam();
+        exam1.setBeginTime(simpleDateFormat.parse("2016-12-01"));
+        exam1.setEndTime(simpleDateFormat.parse("2016-12-31"));
+        exam1.setCreateTime(new Date());
+        exam1.setDuration(90);
+        exam1.setFreezeTime(30);
+        exam1.setExamType(ExamType.ONLINE);
+        exam1.setName("2016年12月华科考试");
+        exam1.setStatus("未考试");
+
+        Exam exam2 = new Exam();
+        exam2.setBeginTime(simpleDateFormat.parse("2016-11-01"));
+        exam2.setEndTime(simpleDateFormat.parse("2016-11-30"));
+        exam2.setCreateTime(new Date());
+        exam2.setDuration(90);
+        exam2.setFreezeTime(30);
+        exam2.setExamType(ExamType.ONLINE);
+        exam2.setName("2016年11月华科考试");
+        exam2.setStatus("未考试");
+
+        examRepo.deleteAll();
+        examRepo.save(exam1);
+        examRepo.save(exam2);
+
+        Assert.assertEquals(2,examRepo.count());
+    }
+
+    @Test
+    public void testExamAll(){
+//        List<Exam> examList = (List)examService.getAllExam(new Exam()).getBody();
+//        Assert.assertEquals(3,examList.size());
+        Exam exam = new Exam();
+        exam.setName("2016年11月华科考试");
+        Example<Exam> examExample = Example.of(exam);
+        Assert.assertEquals(3,examRepo.findAll(examExample).size());
+
+    }
+
+}

pom.xml

@@ -29,8 +29,6 @@
         <!-- non-dependencies -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
-        <thymeleaf.version>3.0.0.RELEASE</thymeleaf.version>
-        <thymeleaf-layout-dialect.version>2.0.0</thymeleaf-layout-dialect.version>
         <mysql.version>5.1.21</mysql.version>
         <poi.version>3.8</poi.version>
         <!--反射工具类 -->
@@ -80,22 +78,42 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
-                <configuration><!-- 指定该Main Class为全局的唯一入口 -->
-                    <mainClass>cn.com.qmth.examcloud.service.examwork.Application</mainClass>
-                    <layout>ZIP</layout>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal><!--可以把依赖的包都打包到生成的Jar包中-->
-                        </goals>
-                    </execution>
-                </executions>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+
         </plugins>
+
+        <pluginManagement>
+            <plugins>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${maven-surefire-plugin.version}</version>
+                    <configuration>
+                        <testFailureIgnore>true</testFailureIgnore>
+                    </configuration>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${maven-compiler-plugin.version}</version>
+                    <configuration>
+                        <source>1.8</source>
+                        <target>1.8</target>
+                        <compilerArgument>-proc:none</compilerArgument>
+                    </configuration>
+                </plugin>
+
+            </plugins>
+        </pluginManagement>
     </build>
 
 </project>