统计接口优化调整

src/main/java/com/rf/woodenFish/record/controller/UserKnockRecordController.java

@@ -7,9 +7,11 @@ import com.rf.woodenFish.record.service.UserKnockRecordService;
 import com.rf.woodenFish.utils.Result;
 import com.rf.woodenFish.utils.WebContextUtil;
 import com.sun.javafx.collections.MappingChange;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -23,11 +25,13 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping("/knock")
+@Api(tags = "用户敲击记录管理")
 public class UserKnockRecordController extends BaseController {
 
     @Autowired
     private UserKnockRecordService service;
 
+    @ApiOperation(value = "添加记录")
     @PostMapping("/add")
     public Result add(@RequestBody UserKnockRecordEntity entity){
         try {
@@ -65,7 +69,7 @@ public class UserKnockRecordController extends BaseController {
             //获取到当前人信息
             String openId = WebContextUtil.getOpenId();
             Integer num  = service.countByCreateDate(openId);
-            return success(num);
+            return success(num==null?0:num);
         }catch (Exception e){
             e.printStackTrace();
             log.error(e.getMessage());
@@ -80,7 +84,7 @@ public class UserKnockRecordController extends BaseController {
             //获取到当前人信息
             String openId = WebContextUtil.getOpenId();
             Integer num  = service.countByOpenId(openId);
-            return success(num);
+            return success(num==null?0:num);
         }catch (Exception e){
             e.printStackTrace();
             log.error(e.getMessage());
@@ -113,4 +117,18 @@ public class UserKnockRecordController extends BaseController {
             return fail(e.getMessage());
         }
     }
+
+
+    @ApiOperation(value = "查看当前人敲击记录")
+    @GetMapping("/findPageByCurrentUser")
+    public Result findPageByCurrentUser(@RequestParam int pageNum,@RequestParam int pageSize){
+        try {
+            Page<UserKnockRecordEntity> page = service.findPageByCurrentUser(pageNum,pageSize);
+            return success(page);
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error(e.getMessage());
+            return fail(e.getMessage());
+        }
+    }
 }

src/main/java/com/rf/woodenFish/record/repostiory/UserKnockRecordRepository.java

@@ -2,6 +2,8 @@ package com.rf.woodenFish.record.repostiory;
 
 import com.rf.woodenFish.base.repository.BaseRepository;
 import com.rf.woodenFish.record.model.UserKnockRecordEntity;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
@@ -28,7 +30,7 @@ public interface UserKnockRecordRepository extends BaseRepository<UserKnockRecor
      * @param createDate
      * @return
      */
-    @Query(value = "SELECT SUM(konck_num) FROM t_user_knock_record WHERE open_id =?1 AND create_date = ?2 ",
+    @Query(value = "SELECT SUM(knock_num) FROM t_user_knock_record WHERE open_id =?1 AND create_date = ?2 ",
             nativeQuery = true)
     Integer countByOpenIdAndCreateDate(String openId,String createDate);
 
@@ -37,7 +39,7 @@ public interface UserKnockRecordRepository extends BaseRepository<UserKnockRecor
      * @param openId
      * @return
      */
-    @Query(value = "SELECT SUM(konck_num) FROM t_user_knock_record WHERE open_id =?1  ",
+    @Query(value = "SELECT SUM(knock_num) FROM t_user_knock_record WHERE open_id =?1  ",
             nativeQuery = true)
     Integer countByOpenId(String openId);
 
@@ -49,7 +51,8 @@ public interface UserKnockRecordRepository extends BaseRepository<UserKnockRecor
     @Query(value = "SELECT " +
             "ui.open_id," +
             "ui.user_name," +
-            "ui.avatar,un.num " +
+            "ui.avatar," +
+            "IFNULL(un.num,0) AS num " +
             "FROM t_user_info ui " +
             "LEFT JOIN " +
             "(" +
@@ -73,7 +76,8 @@ public interface UserKnockRecordRepository extends BaseRepository<UserKnockRecor
     @Query(value = "SELECT " +
             "ui.open_id," +
             "ui.user_name," +
-            "ui.avatar,un.num " +
+            "ui.avatar," +
+            "IFNULL(un.num,0) AS num  " +
             "FROM t_user_info ui " +
             "LEFT JOIN " +
             "(" +
@@ -88,4 +92,6 @@ public interface UserKnockRecordRepository extends BaseRepository<UserKnockRecor
             "ORDER BY num DESC  ",
             nativeQuery = true)
     List<Map<String,Integer>> orderByTotalNum();
+
+    Page<UserKnockRecordEntity> findAllByOpenId(String openId, Pageable pageable);
 }

src/main/java/com/rf/woodenFish/record/service/UserKnockRecordService.java

@@ -1,6 +1,7 @@
 package com.rf.woodenFish.record.service;
 
 import com.rf.woodenFish.record.model.UserKnockRecordEntity;
+import org.springframework.data.domain.Page;
 
 import java.util.List;
 import java.util.Map;
@@ -34,4 +35,6 @@ public interface UserKnockRecordService {
     List<Map<String, Integer>> orderByCurrentDateNum();
 
     List<Map<String, Integer>> orderByTotalNum();
+
+    Page<UserKnockRecordEntity> findPageByCurrentUser(int pageNum, int pageSize);
 }

src/main/java/com/rf/woodenFish/record/service/impl/UserKnockRecordServiceImpl.java

@@ -4,7 +4,10 @@ import cn.hutool.core.date.DateUtil;
 import com.rf.woodenFish.record.model.UserKnockRecordEntity;
 import com.rf.woodenFish.record.repostiory.UserKnockRecordRepository;
 import com.rf.woodenFish.record.service.UserKnockRecordService;
+import com.rf.woodenFish.utils.PageRequestUtil;
+import com.rf.woodenFish.utils.WebContextUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -52,4 +55,11 @@ public class UserKnockRecordServiceImpl implements UserKnockRecordService {
     public List<Map<String, Integer>> orderByTotalNum() {
         return repository.orderByTotalNum();
     }
+
+    @Override
+    public Page<UserKnockRecordEntity> findPageByCurrentUser(int pageNum, int pageSize) {
+        String openId = WebContextUtil.getOpenId();
+        Page<UserKnockRecordEntity> page = repository.findAllByOpenId(openId, PageRequestUtil.of(pageNum,pageSize));
+        return page;
+    }
 }

src/main/java/com/rf/woodenFish/utils/Constant.java

@@ -28,9 +28,9 @@ public class Constant {
 
     public static final String ASPI_URL = "https://api.weixin.qq.com/sns/jscode2session";
     //小程序ID
-    public static final String ASPI_APPID = "wx5ca0d8634f0c2d73";
+    public static final String ASPI_APPID = "wx6fe0917a1689fb48";
     //小程序秘钥
-    public static final String ASPI_SECRET = "f5ef45eb213e94f95fe0d7d1af0e591b";
+    public static final String ASPI_SECRET = "b8fbd3deadc13060602bbd3ba412dfa9";
 
 
 

src/main/java/com/rf/woodenFish/utils/PageRequestUtil.java

@@ -0,0 +1,17 @@
+package com.rf.woodenFish.utils;
+
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+
+/**
+ * @Description:分页工具
+ * @Author: zsf
+ * @Date: 2022/7/5
+ */
+public class PageRequestUtil {
+
+    public static PageRequest of(int page, int size) {
+        if (page <=0){page=0;}else {page = page-1;}
+        return PageRequest.of(page, size, Sort.unsorted());
+    }
+}

src/main/resources/config/application-test.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8060
+  port: 8447
   address: 0.0.0.0
 spring:
   datasource: