From 94ae02e6f73b7011f0fcf6acff8636341d35351d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 17:24:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserCollectController.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserCollectController.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserCollectController.java
index d170c55..acba834 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserCollectController.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserCollectController.java
@@ -1,9 +1,11 @@
package com.ruoyi.user.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.system.api.model.LoginUserInfo;
import com.ruoyi.user.entity.UserCollect;
import com.ruoyi.user.service.UserCollectService;
import com.ruoyi.user.vo.UserCollectVO;
@@ -17,7 +19,6 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
-import java.util.List;
/**
* <p>
@@ -46,11 +47,11 @@
@ApiImplicitParam(value = "服务id", name = "serveId", dataType = "Integer", required = true)
})
public R<Boolean> serveDetail(@RequestParam Integer serveId) {
- LoginUser loginUser = tokenService.getLoginUserByUser();
+ LoginUserInfo loginUser = tokenService.getLoginUserByUser();
if (null == loginUser) {
return R.loginExpire("登录失效！");
}
- UserCollect userCollect = new UserCollect(loginUser.getUserid().intValue(), serveId);
+ UserCollect userCollect = new UserCollect(loginUser.getUserid(), serveId);
return R.ok(userCollectService.save(userCollect));
}
@@ -63,7 +64,7 @@
@ApiImplicitParam(value = "收藏记录id", name = "collectId", dataType = "Integer", required = true)
})
public R<Boolean> cancelCollect(@RequestParam Integer collectId) {
- LoginUser loginUser = tokenService.getLoginUserByUser();
+ LoginUserInfo loginUser = tokenService.getLoginUserByUser();
if (null == loginUser) {
return R.loginExpire("登录失效！");
}
@@ -76,14 +77,28 @@
*/
@GetMapping(value = "/collectList")
@ApiOperation(value = "服务收藏列表", tags = {"用户端-收藏"})
- public R<List<UserCollectVO>> collectList() {
- LoginUser loginUser = tokenService.getLoginUserByUser();
+ public R<IPage<UserCollectVO>> collectList(@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+ LoginUserInfo loginUser = tokenService.getLoginUserByUser();
if (null == loginUser) {
return R.loginExpire("登录失效！");
}
- List<UserCollectVO> collectList = userCollectService.collectList(loginUser.getUserid());
+ IPage<UserCollectVO> collectList = userCollectService.collectList(loginUser.getUserid(), Page.of(pageNum, pageSize));
return R.ok(collectList);
}
+ /**
+ * 服务收藏列表
+ */
+ @GetMapping(value = "/detailHaveCollect")
+ @ApiOperation(value = "服务详情取消/添加收藏", tags = {"用户端-收藏"})
+ public R<IPage<UserCollectVO>> collectList(@RequestParam Integer serveId) {
+ LoginUserInfo loginUser = tokenService.getLoginUserByUser();
+ if (null == loginUser) {
+ return R.loginExpire("登录失效！");
+ }
+// IPage<UserCollectVO> collectList = userCollectService.collectList(loginUser.getUserid());
+ return R.ok();
+ }
}
--
Gitblit v1.7.1