收藏修改 timestamp

nbjk-admin/src/main/java/com/miaxis/app/controller/question/QuestionCollectionController.java

@@ -19,6 +19,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -79,7 +80,7 @@ public class QuestionCollectionController extends BaseController {
             questionCollection.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
             questionCollection.setKm(col.getKm());
             questionCollection.setQuestionId(colDTO.getId());
-            Date crDate = new Date(colDTO.getTimestamp());
+            Timestamp crDate = new Timestamp(colDTO.getTimestamp());
             questionCollection.setCreateTime(crDate);
             qlist.add(questionCollection);
         }
@@ -108,7 +109,7 @@ public class QuestionCollectionController extends BaseController {
             questionCollection.setUserId(userId);
             questionCollection.setKm(col.getKm());
             questionCollection.setQuestionId(colDTO.getId());
-            Date crDate = new Date(colDTO.getTimestamp());
+            Timestamp crDate = new Timestamp(colDTO.getTimestamp());
             questionCollection.setCreateTime(crDate);
             qlist.add(questionCollection);
         }

nbjk-service/src/main/java/com/miaxis/question/domain/QuestionCollection.java

@@ -1,17 +1,16 @@
 package com.miaxis.question.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
 import lombok.Data;
+
+import java.sql.Timestamp;
+
 /**
  * collection对象 question_collection
  *
@@ -21,7 +20,7 @@ import lombok.Data;
 @Data
 @TableName("question_collection")
 @ApiModel(value = "QuestionCollection", description = "collection对象 question_collection")
-public class QuestionCollection extends BaseBusinessEntity{
+public class QuestionCollection {
     private static final long serialVersionUID = 1L;
 
     /** 主键 */
@@ -47,4 +46,14 @@ public class QuestionCollection extends BaseBusinessEntity{
     @ApiModelProperty(value = "考试科目（1、2、3、4）")
     private Integer km;
 
+    /** 创建时间 */
+    @ApiModelProperty(value = "创建时间"  ,hidden = true)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS")
+    private Timestamp createTime;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS" )
+    @ApiModelProperty(value = "更新时间" ,hidden = true)
+    private Timestamp updateTime;
+
 }

nbjk-service/src/main/java/com/miaxis/question/dto/QuestionColYunDTO.java

@@ -8,6 +8,6 @@ public class QuestionColYunDTO {
 
     @ApiModelProperty(value = "题目ID", required = true, example = "1")
     private Long id;
-    @ApiModelProperty(value = "时间戳(收藏时间)", required = true, example = "1680249607000")
+    @ApiModelProperty(value = "时间戳(收藏时间)", required = true, example = "1680249607321")
     private Long timestamp;
 }

nbjk-service/src/main/java/com/miaxis/question/dto/QuestionCollectionDTO.java

@@ -18,14 +18,27 @@ public class QuestionCollectionDTO {
     private static final long serialVersionUID = 1L;
 
 
-
     /** 题目ID */
     @ApiModelProperty(value = "题目ID",required=true)
     private Long questionId;
 
     /** 科目 */
     @ApiModelProperty(value = "考试科目（科目一、科目二、科目三、科目四）",required=true)
-    private String km;
+    private Integer km;
+
+    public Long getQuestionId() {
+        return questionId;
+    }
+
+    public void setQuestionId(Long questionId) {
+        this.questionId = questionId;
+    }
 
+    public Integer getKm() {
+        return km;
+    }
 
+    public void setKm(Integer km) {
+        this.km = km;
+    }
 }

nbjk-service/src/main/java/com/miaxis/question/dto/QuestionCollectionListDTO.java

@@ -22,8 +22,6 @@ public class QuestionCollectionListDTO  {
     @ApiModelProperty(value = "用户ID",hidden = true)
     private Long userId;
 
-    @ApiModelProperty(value = "题目ID",hidden = true)
-    private Long questionId;
 
     /** 科目 */
     @ApiModelProperty(value = "考试科目（1、2、3、4）")

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

@@ -3,6 +3,7 @@ package com.miaxis.question.vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.sql.Timestamp;
 import java.util.Date;
 
 @ApiModel(value = "QuestionColIdDateVo", description = "收藏题返回ID与时间")
@@ -13,7 +14,7 @@ public class QuestionColIdDateVo {
     @ApiModelProperty(value = "分类题（包含科一到科四）")
     private Long id;
 
-    private transient Date createTime;
+    private transient Timestamp createTime;
 
     @ApiModelProperty(value = "时间戳（收藏时间）",name = "timestamp")
     public long getTimestamp() {
@@ -24,7 +25,7 @@ public class QuestionColIdDateVo {
     }
 
 
-    public void setCreateTime(Date createTime) {
+    public void setCreateTime(Timestamp createTime) {
         this.createTime = createTime;
     }
 

nbjk-service/src/main/resources/mapper/question/QuestionCollectionMapper.xml

@@ -20,7 +20,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectQuestionCollectionVo"/>
         <where>
             <if test="userId != null and userId !='' "> and user_id = #{userId}</if>
-            <if test="questionId != null and questionId !=''  "> and question_id = #{questionId}</if>
             <if test="km != null and km !='' "> and km = #{km}</if>
         </where>
         order by create_time asc
@@ -32,7 +31,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select q1.* from question_info q1 join question_collection q2 on q1.id = q2.question_id
         <where>
             <if test="userId != null and userId !='' "> and q2.user_id = #{userId}</if>
-            <if test="questionId != null and questionId != '' "> and q2.question_id = #{questionId}</if>
             <if test="km != null and km!='' "> and q2.km = #{km}</if>
         </where>
         order by q2.create_time asc
@@ -45,7 +43,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select q1.id,q2.create_time from question_info q1 join question_collection q2 on q1.id = q2.question_id
         <where>
             <if test="userId != null and userId !='' "> and q2.user_id = #{userId}</if>
-            <if test="questionId != null and questionId != '' "> and q2.question_id = #{questionId}</if>
             <if test="km != null and km!='' "> and q2.km = #{km}</if>
         </where>
         order by q2.create_time asc
@@ -59,7 +56,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select count(1) from question_info q1 join question_collection q2 on q1.id = q2.question_id
         <where>
             <if test="userId != null and userId !='' "> and q2.user_id = #{userId}</if>
-            <if test="questionId != null and questionId != '' "> and q2.question_id = #{questionId}</if>
             <if test="km != null and km!='' "> and q2.km = #{km}</if>
         </where>