提交一波

nbjk-service/src/main/java/com/miaxis/question/vo/QuestionColIdDateVo.java

@@ -1,13 +1,11 @@
 package com.miaxis.question.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.util.Date;
 
-@Data
 @ApiModel(value = "QuestionColIdDateVo", description = "收藏题返回ID与时间")
 public class QuestionColIdDateVo {
 
@@ -16,12 +14,26 @@ public class QuestionColIdDateVo {
     @ApiModelProperty(value = "分类题（包含科一到科四）")
     private Long id;
 
-    /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private transient Date createTime;
 
-    @ApiModelProperty(value = "时间戳（收藏时间）")
+    @ApiModelProperty(value = "时间戳（收藏时间）",name = "timestamp")
     public long getTimestamp() {
-        return createTime.getTime(); // 将日期类型转换为长整型时间戳
+        if (createTime != null) {
+            return createTime.getTime();// 将日期类型转换为长整型时间戳
+        }
+        return 0;
+    }
+
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
     }
 }

nbjk-service/src/main/java/com/miaxis/question/vo/QuestionWrongIdDateVo.java

@@ -1,13 +1,10 @@
 package com.miaxis.question.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.util.Date;
 
-@Data
 @ApiModel(value = "QuestionWrongIdDateVo", description = "错题返回ID与时间")
 public class QuestionWrongIdDateVo {
 
@@ -16,14 +13,27 @@ public class QuestionWrongIdDateVo {
     @ApiModelProperty(value = "分类题（包含科一到科四）")
     private Long id;
 
-    /** 创建时间 */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private transient Date createTime;
 
-    @ApiModelProperty(value = "时间戳（收藏时间）")
+    @ApiModelProperty(value = "时间戳（做错时间）",name = "timestamp")
     public long getTimestamp() {
-        return createTime.getTime(); // 将日期类型转换为长整型时间戳
+        if (createTime != null) {
+            return createTime.getTime();// 将日期类型转换为长整型时间戳
+        }
+        return 0;
+    }
+
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
     }
 
 }