记录查看接口调整

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

@@ -128,11 +128,11 @@ public class UserKnockRecordController extends BaseController {
     }
 
 
-    @ApiOperation(value = "查看当前人敲击记录")
+    @ApiOperation(value = "查看当前人每日敲击记录")
     @GetMapping("/findPageByCurrentUser")
     public Result findPageByCurrentUser(@RequestParam int pageNum,@RequestParam int pageSize){
         try {
-            Page<UserKnockRecordEntity> page = service.findPageByCurrentUser(pageNum,pageSize);
+            Page<List<Map<String,String>>> page = service.findPageByCurrentUser(pageNum,pageSize);
             return success(page);
         }catch (Exception e){
             e.printStackTrace();

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

@@ -93,5 +93,33 @@ public interface UserKnockRecordRepository extends BaseRepository<UserKnockRecor
             nativeQuery = true)
     List<Map<String,Integer>> orderByTotalNum();
 
-    Page<UserKnockRecordEntity> findAllByOpenId(String openId, Pageable pageable);
+    @Query(value = "SELECT " +
+            " tr.create_date AS createDate, " +
+            " SUM( tr.knock_num ) AS knockNum  " +
+            "FROM " +
+            " t_user_knock_record tr " +
+            "WHERE " +
+            " tr.open_id = ?1 " +
+            "GROUP BY " +
+            " tr.create_date  " +
+            "ORDER BY " +
+            " tr.create_date DESC",
+            nativeQuery = true,
+            countQuery = "SELECT " +
+                    " COUNT( 1 )  " +
+                    "FROM " +
+                    " ( " +
+                    " SELECT " +
+                    "  tr.create_date AS createDate, " +
+                    "  SUM( tr.knock_num ) AS knockNum  " +
+                    " FROM " +
+                    "  t_user_knock_record tr  " +
+                    " WHERE " +
+                    "  tr.open_id = ?1  " +
+                    " GROUP BY " +
+                    "  tr.create_date  " +
+                    " ORDER BY " +
+                    " tr.create_date DESC  " +
+                    " ) AS a")
+    Page<List<Map<String,String>>> findAllByOpenId(String openId, Pageable pageable);
 }

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

@@ -36,5 +36,5 @@ public interface UserKnockRecordService {
 
     List<Map<String, Integer>> orderByTotalNum();
 
-    Page<UserKnockRecordEntity> findPageByCurrentUser(int pageNum, int pageSize);
+    Page<List<Map<String,String>>> findPageByCurrentUser(int pageNum, int pageSize);
 }

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

@@ -57,9 +57,9 @@ public class UserKnockRecordServiceImpl implements UserKnockRecordService {
     }
 
     @Override
-    public Page<UserKnockRecordEntity> findPageByCurrentUser(int pageNum, int pageSize) {
+    public Page<List<Map<String,String>>> findPageByCurrentUser(int pageNum, int pageSize) {
         String openId = WebContextUtil.getOpenId();
-        Page<UserKnockRecordEntity> page = repository.findAllByOpenId(openId, PageRequestUtil.of(pageNum,pageSize));
+        Page<List<Map<String,String>>> page = repository.findAllByOpenId(openId, PageRequestUtil.of(pageNum,pageSize));
         return page;
     }
 }