Sfoglia il codice sorgente

optimize: modify the format of Date-type value of VOs and update corresponding test cases.

tubinyan 5 anni fa
parent
commit
c17e7a7ddd

+ 2 - 0
src/main/java/cn/seecoder/courselearning/vo/CourseOrderVO.java

@@ -1,6 +1,7 @@
 package cn.seecoder.courselearning.vo;
 
 import cn.seecoder.courselearning.po.CourseOrder;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.NonNull;
 
@@ -16,6 +17,7 @@ public class CourseOrderVO {
 
     private String courseName;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     private Integer userId;

+ 2 - 0
src/main/java/cn/seecoder/courselearning/vo/CourseVO.java

@@ -1,6 +1,7 @@
 package cn.seecoder.courselearning.vo;
 
 import cn.seecoder.courselearning.po.Course;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.NonNull;
 
@@ -20,6 +21,7 @@ public class CourseVO {
 
     private String school;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     private Integer cost;

+ 2 - 0
src/main/java/cn/seecoder/courselearning/vo/CourseWareVO.java

@@ -1,6 +1,7 @@
 package cn.seecoder.courselearning.vo;
 
 import cn.seecoder.courselearning.po.CourseWare;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.NonNull;
 
@@ -28,6 +29,7 @@ public class CourseWareVO {
 
     private Boolean availableFlag;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date uploadTime;
 
     public CourseWareVO(){

+ 2 - 0
src/main/java/cn/seecoder/courselearning/vo/RechargeOrderVO.java

@@ -1,6 +1,7 @@
 package cn.seecoder.courselearning.vo;
 
 import cn.seecoder.courselearning.po.RechargeOrder;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -13,6 +14,7 @@ public class RechargeOrderVO {
 
     private Integer value;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     public RechargeOrderVO() {

+ 2 - 0
src/main/java/cn/seecoder/courselearning/vo/UserVO.java

@@ -2,6 +2,7 @@ package cn.seecoder.courselearning.vo;
 
 import cn.seecoder.courselearning.enums.UserRole;
 import cn.seecoder.courselearning.po.User;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.NonNull;
 
@@ -23,6 +24,7 @@ public class UserVO {
 
     private UserRole userRole;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     public UserVO() {

+ 2 - 2
src/test/java/cn/seecoder/courselearning/controller/UserControllerTest.java

@@ -73,7 +73,7 @@ public class UserControllerTest {
                                 "        \"picture\": null,\n" +
                                 "        \"balance\": 0,\n" +
                                 "        \"userRole\": \"STUDENT\",\n" +
-                                "        \"createTime\": \"2020-12-18T02:00:00.000+00:00\"\n" +
+                                "        \"createTime\": \"2020-12-18 10:00:00\"\n" +
                                 "    }\n" +
                                 "}"));
 
@@ -97,7 +97,7 @@ public class UserControllerTest {
                                 "    \"picture\": null,\n" +
                                 "    \"balance\": 0,\n" +
                                 "    \"userRole\": \"STUDENT\",\n" +
-                                "    \"createTime\": \"2020-12-18T02:00:00.000+00:00\"\n" +
+                                "    \"createTime\": \"2020-12-18 10:00:00\"\n" +
                                 "}"));
 
     }

+ 17 - 5
src/test/java/cn/seecoder/courselearning/serviceImpl/UserServiceTest.java

@@ -1,4 +1,4 @@
-package cn.seecoder.courselearning.serviceImpl;
+package cn.seecoder.courselearning.serviceimpl;
 
 import cn.seecoder.courselearning.enums.UserRole;
 import cn.seecoder.courselearning.mapperservice.UserMapper;
@@ -17,7 +17,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import javax.annotation.Resource;
+import java.util.Calendar;
 import java.util.Date;
+import java.util.TimeZone;
 
 
 @SpringBootTest
@@ -34,6 +36,18 @@ public class UserServiceTest {
     @Rule
     public ExpectedException thrown= ExpectedException.none();
 
+    private Date getExpectedDate() {
+        Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("GMT+8"));
+        calendar.set(Calendar.YEAR, 2020);
+        calendar.set(Calendar.MONTH, Calendar.DECEMBER);
+        calendar.set(Calendar.DATE, 18);
+        calendar.set(Calendar.HOUR_OF_DAY, 10);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        return calendar.getTime();
+    }
+
 
     @BeforeAll
     public void init(){
@@ -42,8 +56,7 @@ public class UserServiceTest {
         userVO.setPhone("10212345678");
         userVO.setBalance(0);
         userVO.setUserRole(UserRole.STUDENT);
-        Date date  = new Date(2020 - 1900, 12 - 1, 18);
-        date.setHours(10);
+        Date date = getExpectedDate();
         userVO.setCreateTime(date);
     }
 
@@ -55,8 +68,7 @@ public class UserServiceTest {
         existUserVO.setPhone("10112345678");
         existUserVO.setBalance(0);
         existUserVO.setUserRole(UserRole.TEACHER);
-        Date date  = new Date(2020 - 1900, 12 - 1, 18);
-        date.setHours(10);
+        Date date = getExpectedDate();
         existUserVO.setCreateTime(date);
         UserVO returnedUserVO = userService.getUser(1);
         Assert.assertEquals(existUserVO, returnedUserVO);