瀏覽代碼

分享场景列表

lyhzzz 1 年之前
父節點
當前提交
c1318ccb91

+ 2 - 1
src/main/java/com/fdkankan/manage/controller/JyUserShareController.java

@@ -1,6 +1,7 @@
 package com.fdkankan.manage.controller;
 
 
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.UserShareParam;
@@ -53,7 +54,7 @@ public class JyUserShareController {
     @PostMapping("/sceneList")
     public ResultData sceneList(@RequestBody UserShareParam param){
 
-        return ResultData.ok(jyUserShareService.sceneList(param));
+        return ResultData.ok(PageInfo.PageInfo(jyUserShareService.sceneList(param)));
     }
 }
 

+ 7 - 1
src/main/java/com/fdkankan/manage/controller/inner/InnerAPIController.java

@@ -1,6 +1,7 @@
 package com.fdkankan.manage.controller.inner;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.controller.BaseController;
@@ -12,6 +13,7 @@ import com.fdkankan.manage.service.*;
 import com.fdkankan.manage.util.RsaUtils;
 import com.fdkankan.manage.vo.request.SceneParam;
 import com.fdkankan.manage.vo.request.UserParam;
+import com.fdkankan.manage.vo.response.UserShareSceneVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -158,6 +160,10 @@ public class InnerAPIController extends BaseController {
 
         UserShareParam shareParam = new UserShareParam();
         shareParam.setJyUserId(Math.toIntExact(jyUser.getUserId()));
-        return ResultData.ok(jyUserShareService.sceneList(shareParam));
+        Page<UserShareSceneVo> page= jyUserShareService.sceneList(shareParam);
+        for (UserShareSceneVo record : page.getRecords()) {
+
+        }
+        return ResultData.ok();
     }
 }

+ 3 - 1
src/main/java/com/fdkankan/manage/service/IJyUserShareService.java

@@ -1,9 +1,11 @@
 package com.fdkankan.manage.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.entity.JyUser;
 import com.fdkankan.manage.entity.JyUserShare;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.entity.UserShareParam;
+import com.fdkankan.manage.vo.response.UserShareSceneVo;
 
 import java.util.List;
 
@@ -23,7 +25,7 @@ public interface IJyUserShareService extends IService<JyUserShare> {
 
     JyUserShare getByMainUserIdAndUserId(Integer sysUserId, Integer jyUserId);
 
-    Object sceneList(UserShareParam param);
+    Page<UserShareSceneVo> sceneList(UserShareParam param);
 
     List<JyUserShare> getByJyUserId(Integer id);
 }

+ 2 - 2
src/main/java/com/fdkankan/manage/service/impl/JyUserShareServiceImpl.java

@@ -111,7 +111,7 @@ public class JyUserShareServiceImpl extends ServiceImpl<IJyUserShareMapper, JyUs
     LaserService laserService;
 
     @Override
-    public Object sceneList(UserShareParam param) {
+    public Page<UserShareSceneVo> sceneList(UserShareParam param) {
         if(param.getJyUserId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
@@ -147,6 +147,6 @@ public class JyUserShareServiceImpl extends ServiceImpl<IJyUserShareMapper, JyUs
                 record.setTitle(sceneVo.getSceneName());
             }
         }
-        return PageInfo.PageInfo(page);
+        return page;
     }
 }