~

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppUserCollectController.java

@@ -2,6 +2,7 @@ package com.ruoyi.app.controller;
 
 import java.util.List;
 import java.io.IOException;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.app.domain.AppUserDynamic;
@@ -121,8 +122,13 @@ public class AppUserCollectController extends BaseController
     @GetMapping("/pageList")
     @ApiOperation(value = "分页app用户收藏列表", notes = "分页app用户收藏列表", httpMethod = "GET")
     public TableDataInfo pageList(AppUserDynamic appUserDynamic) {
-        startPage();
+        /*startPage();
         List<AppUserDynamicVo> list = appUserDynamicService.selectDynamicList(appUserDynamic);
-        return getDataTable(list);
+        return getDataTable(list);*/
+        Map<String,Object> map = appUserDynamicService.selectDynamicList(appUserDynamic);
+        Integer count = (Integer) map.get("count");
+        TableDataInfo dataTable = getDataTable((List<AppUserDynamicVo>)map.get("list"));
+        dataTable.setTotal(count);
+        return dataTable;
     }
 }

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppUserDynamicController.java

@@ -2,6 +2,7 @@ package com.ruoyi.app.controller;
 
 import java.util.List;
 import java.io.IOException;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.app.domain.vo.AppUserDynamicVo;
@@ -59,9 +60,12 @@ public class AppUserDynamicController extends BaseController
     @GetMapping("/pageList")
     @ApiOperation(value = "分页app用户动态列表", notes = "分页app用户动态列表", httpMethod = "GET")
     public TableDataInfo pageList(AppUserDynamic appUserDynamic) {
-        startPage();
-        List<AppUserDynamicVo> list = appUserDynamicService.selectDynamicList(appUserDynamic);
-        return getDataTable(list);
+        //startPage();
+        Map<String,Object> map = appUserDynamicService.selectDynamicList(appUserDynamic);
+        Integer count = (Integer) map.get("count");
+        TableDataInfo dataTable = getDataTable((List<AppUserDynamicVo>)map.get("list"));
+        dataTable.setTotal(count);
+        return dataTable;
     }
 
     /**

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java

@@ -183,6 +183,9 @@ public class PayController extends BaseController
     public AjaxResult useExchange(@RequestBody UseExchangeArg useExchangeArg) throws ParseException {
         String code = useExchangeArg.getCode();
         Long userId = useExchangeArg.getUserId();
+        if (StringUtils.isBlank(code) || userId == null) {
+            return AjaxResult.error(2001,"请检查参数，兑换码及用户id不能为空");
+        }
         AppExchangeCode appExchangeCode = appExchangeCodeMapper.selectAppExchangeCodeByCode(code);
         if (appExchangeCode == null || appExchangeCode.getUserId() != null) {
             return AjaxResult.error("该兑换码不存在或已被使用，请检查该兑换码是否正确！");

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppUserDynamicService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.app.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.app.domain.AppUserDynamic;
 import com.ruoyi.app.domain.vo.AppUserDynamicVo;
 import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -28,7 +30,7 @@ public interface IAppUserDynamicService
      * @return App用户动态集合
      */
     public List<AppUserDynamic> selectAppUserDynamicList(AppUserDynamic appUserDynamic);
-    public List<AppUserDynamicVo> selectDynamicList(AppUserDynamic appUserDynamic);
+    public Map selectDynamicList(AppUserDynamic appUserDynamic);
 
     /**
      * 新增App用户动态

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java

@@ -1,8 +1,6 @@
 package com.ruoyi.app.service.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.ruoyi.app.domain.*;
@@ -18,6 +16,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.app.service.IAppUserDynamicService;
 
+import static com.ruoyi.common.core.utils.PageUtils.startPage;
+
 /**
  * App用户动态Service业务层处理
  * 
@@ -167,7 +167,10 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService
     }
 
     @Override
-    public List<AppUserDynamicVo> selectDynamicList(AppUserDynamic appUserDynamic) {
+    public Map selectDynamicList(AppUserDynamic appUserDynamic) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("list",new ArrayList<>());
+        map.put("count",0);
         // 收藏评论
         if (appUserDynamic.getIsCollect() == 1 && appUserDynamic.getAppId() != null) {
             AppUserCollect appUserCollect = new AppUserCollect();
@@ -175,7 +178,7 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService
             List<AppUserCollect> appUserCollects = appUserCollectMapper.selectAppUserCollectList(appUserCollect);
             appUserDynamic.setIds(appUserCollects.stream().map(x->x.getDynamicId()).collect(Collectors.toList()));
             if (appUserCollects.size() < 1) {
-                return new ArrayList<>();
+                return map;
             }
         }
 
@@ -192,6 +195,8 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService
                 appUserDynamic.setDynamicIds(dynamicIds);
             }
         }
+        List<AppUserDynamicVo> count = appUserDynamicMapper.selectDynamicList(appUserDynamic);
+        startPage();
         List<AppUserDynamicVo> list = appUserDynamicMapper.selectDynamicList(appUserDynamic);
         for (AppUserDynamicVo appUserDynamicVo : list) {
             Long id = appUserDynamicVo.getId();
@@ -256,9 +261,13 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService
         List<AppUserDynamicVo> collect = new ArrayList<>();
         if (appUserDynamic.getIsOwner() != null) {
             collect = list.stream().filter(x -> x.getPrivacyStatus() != 1).collect(Collectors.toList());
-            return collect;
+            map.put("list",collect);
+            map.put("count",count.size());
+            return map;
         }
-        return list;
+        map.put("list",list);
+        map.put("count",count.size());
+        return map;
     }
 
     public static void main(String[] args) {

gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml

@@ -216,4 +216,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectDynamicCount" resultType="java.lang.Integer">
+        select count(*) from app_user_dynamic
+    </select>
 </mapper>