lrf 8 months ago
parent
commit
ea94434b93

+ 4 - 2
src/main/java/com/free/controller/HistoryController.java

@@ -1,5 +1,6 @@
 package com.free.controller;
 
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -36,7 +37,6 @@ import io.swagger.annotations.ApiOperation;
 public class HistoryController {
   @Autowired
   private HistoryService service;
-  
 
   @PassToken
   /** 创建数据 */
@@ -49,6 +49,7 @@ public class HistoryController {
     History dbData = this.service.getOne(checkHasQw);
     if (null == dbData) {
       // 没有数据,创建新的数据
+      data.setTime(LocalDateTime.now());
       this.service.save(data);
       QueryWrapper qw = new QueryWrapper<>();
       qw.eq("id", data.getId());
@@ -57,6 +58,7 @@ public class HistoryController {
     } else {
       // 有数据, 浏览次数加1
       dbData.setViews(dbData.getViews() + 1);
+      dbData.setTime(LocalDateTime.now());
       this.service.updateById(dbData);
       Object newData = this.service.getById(dbData.getId());
       return ResponseFormat.success(newData);
@@ -89,7 +91,7 @@ public class HistoryController {
     Long skip = null, limit = null;
     Map map = new HashMap();
     QueryWrapper qw = new QueryWrapper<>();
-    qw.orderByDesc("views");
+    qw.orderByDesc("time");
     /** 参数处理处理 */
     for (String key : allParams.keySet()) {
       Object value = allParams.get(key);

+ 17 - 17
src/main/java/com/free/entity/History.java

@@ -21,21 +21,21 @@ import java.time.LocalDateTime;
 @TableName(value = "history")
 @ApiModel("历史记录")
 public class History extends BaseEntity {
-    @Column(comment = "用户id")
-    @TableField(value = "user_id")
-    @ApiModelProperty("用户id")
-    private String user_id;
-    @Column(comment = "题库id")
-    @TableField(value = "question_id")
-    @ApiModelProperty("题库id")
-    private String question_id;
-    @Column(comment = "浏览次数")
-    @TableField(value = "views")
-    @ApiModelProperty("浏览次数")
-    private int views;
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty("最后查询时间")
-    private LocalDateTime time;
+  @Column(comment = "用户id")
+  @TableField(value = "user_id")
+  @ApiModelProperty("用户id")
+  private String user_id;
+  @Column(comment = "题库id")
+  @TableField(value = "question_id")
+  @ApiModelProperty("题库id")
+  private String question_id;
+  @Column(comment = "浏览次数")
+  @TableField(value = "views")
+  @ApiModelProperty("浏览次数")
+  private int views;
+  @TableField(value = "time")
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @ApiModelProperty("最后查询时间")
+  private LocalDateTime time;
 }