修改bug
This commit is contained in:
parent
90be00a277
commit
adb23bb268
@ -16,6 +16,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
|||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.dromara.common.core.domain.R;
|
import org.dromara.common.core.domain.R;
|
||||||
|
import org.dromara.common.core.domain.model.LoginUser;
|
||||||
|
import org.dromara.common.core.exception.ServiceException;
|
||||||
|
import org.dromara.common.satoken.utils.LoginHelper;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
@ -25,6 +28,7 @@ import java.util.Map;
|
|||||||
|
|
||||||
import static com.wzj.soopin.content.domain.base.BaseInfoProperties.*;
|
import static com.wzj.soopin.content.domain.base.BaseInfoProperties.*;
|
||||||
|
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Api(tags = "VlogController 短视频相关业务功能的接口")
|
@Api(tags = "VlogController 短视频相关业务功能的接口")
|
||||||
@RequestMapping("/app/vlog")
|
@RequestMapping("/app/vlog")
|
||||||
@ -53,6 +57,11 @@ public class AppVlogController {
|
|||||||
@Tag(name = "我的私密视频列表")
|
@Tag(name = "我的私密视频列表")
|
||||||
@PostMapping("/myPrivateList")
|
@PostMapping("/myPrivateList")
|
||||||
public R<PagedGridResult> myPrivateList(@RequestBody MyListBO bo, @RequestBody Page page) {
|
public R<PagedGridResult> myPrivateList(@RequestBody MyListBO bo, @RequestBody Page page) {
|
||||||
|
LoginUser loginUser = LoginHelper.getLoginUser();
|
||||||
|
if (loginUser == null) {
|
||||||
|
throw new ServiceException("用户未登录");
|
||||||
|
}
|
||||||
|
bo.setUserId(String.valueOf(loginUser.getUserId()));
|
||||||
PagedGridResult pages = vlogService.queryMyVlogList(bo, page);
|
PagedGridResult pages = vlogService.queryMyVlogList(bo, page);
|
||||||
return R.ok(pages);
|
return R.ok(pages);
|
||||||
}
|
}
|
||||||
@ -60,6 +69,11 @@ public class AppVlogController {
|
|||||||
@Tag(name = "我点赞的视频列表")
|
@Tag(name = "我点赞的视频列表")
|
||||||
@PostMapping("/myLikedList")
|
@PostMapping("/myLikedList")
|
||||||
public R<PagedGridResult> myLikedList(@RequestBody MyListBO bo, @RequestBody Page page) {
|
public R<PagedGridResult> myLikedList(@RequestBody MyListBO bo, @RequestBody Page page) {
|
||||||
|
LoginUser loginUser = LoginHelper.getLoginUser();
|
||||||
|
if (loginUser == null) {
|
||||||
|
throw new ServiceException("用户未登录");
|
||||||
|
}
|
||||||
|
bo.setUserId(String.valueOf(loginUser.getUserId()));
|
||||||
PagedGridResult pages = vlogService.getMyLikedVlogList(bo, page);
|
PagedGridResult pages = vlogService.getMyLikedVlogList(bo, page);
|
||||||
return R.ok(pages);
|
return R.ok(pages);
|
||||||
}
|
}
|
||||||
@ -67,6 +81,11 @@ public class AppVlogController {
|
|||||||
@Tag(name = "我关注的视频列表")
|
@Tag(name = "我关注的视频列表")
|
||||||
@PostMapping("/followList")
|
@PostMapping("/followList")
|
||||||
public R<PagedGridResult> followList(@RequestBody SimpleListBO bo, @RequestBody Page page) {
|
public R<PagedGridResult> followList(@RequestBody SimpleListBO bo, @RequestBody Page page) {
|
||||||
|
LoginUser loginUser = LoginHelper.getLoginUser();
|
||||||
|
if (loginUser == null) {
|
||||||
|
throw new ServiceException("用户未登录");
|
||||||
|
}
|
||||||
|
bo.setMyId(String.valueOf(loginUser.getUserId()));
|
||||||
PagedGridResult pages = vlogService.getMyFollowVlogList(bo, page);
|
PagedGridResult pages = vlogService.getMyFollowVlogList(bo, page);
|
||||||
return R.ok(pages);
|
return R.ok(pages);
|
||||||
}
|
}
|
||||||
@ -74,6 +93,11 @@ public class AppVlogController {
|
|||||||
@Tag(name = "好友视频列表")
|
@Tag(name = "好友视频列表")
|
||||||
@PostMapping("/friendList")
|
@PostMapping("/friendList")
|
||||||
public R<PagedGridResult> friendList(@RequestBody SimpleListBO bo, @RequestBody Page page) {
|
public R<PagedGridResult> friendList(@RequestBody SimpleListBO bo, @RequestBody Page page) {
|
||||||
|
LoginUser loginUser = LoginHelper.getLoginUser();
|
||||||
|
if (loginUser == null) {
|
||||||
|
throw new ServiceException("用户未登录");
|
||||||
|
}
|
||||||
|
bo.setMyId(String.valueOf(loginUser.getUserId()));
|
||||||
PagedGridResult pages = vlogService.getMyFriendVlogList(bo, page);
|
PagedGridResult pages = vlogService.getMyFriendVlogList(bo, page);
|
||||||
return R.ok(pages);
|
return R.ok(pages);
|
||||||
}
|
}
|
||||||
@ -109,9 +133,19 @@ public class AppVlogController {
|
|||||||
|
|
||||||
|
|
||||||
@PostMapping("like")
|
@PostMapping("like")
|
||||||
public R<Void> like(@RequestParam String userId,
|
public R<Void> like(@RequestBody Map<String, String> params) {
|
||||||
@RequestParam String vlogerId,
|
LoginUser loginUser = LoginHelper.getLoginUser();
|
||||||
@RequestParam String vlogId) {
|
if (loginUser == null) {
|
||||||
|
throw new ServiceException("用户未登录");
|
||||||
|
}
|
||||||
|
|
||||||
|
String userId = String.valueOf(loginUser.getUserId());
|
||||||
|
String vlogerId = params.get("vlogerId");
|
||||||
|
String vlogId = params.get("vlogId");
|
||||||
|
|
||||||
|
if (StringUtils.isBlank(vlogerId) || StringUtils.isBlank(vlogId)) {
|
||||||
|
throw new ServiceException("参数不完整");
|
||||||
|
}
|
||||||
|
|
||||||
// 我点赞的视频,关联关系保存到数据库
|
// 我点赞的视频,关联关系保存到数据库
|
||||||
vlogService.userLikeVlog(userId, vlogId);
|
vlogService.userLikeVlog(userId, vlogId);
|
||||||
@ -141,9 +175,19 @@ public class AppVlogController {
|
|||||||
|
|
||||||
|
|
||||||
@PostMapping("unlike")
|
@PostMapping("unlike")
|
||||||
public R<Void> unlike(@RequestParam String userId,
|
public R<Void> unlike(@RequestBody Map<String, String> params) {
|
||||||
@RequestParam String vlogerId,
|
LoginUser loginUser = LoginHelper.getLoginUser();
|
||||||
@RequestParam String vlogId) {
|
if (loginUser == null) {
|
||||||
|
throw new ServiceException("用户未登录");
|
||||||
|
}
|
||||||
|
|
||||||
|
String userId = String.valueOf(loginUser.getUserId());
|
||||||
|
String vlogerId = params.get("vlogerId");
|
||||||
|
String vlogId = params.get("vlogId");
|
||||||
|
|
||||||
|
if (StringUtils.isBlank(vlogerId) || StringUtils.isBlank(vlogId)) {
|
||||||
|
throw new ServiceException("参数不完整");
|
||||||
|
}
|
||||||
|
|
||||||
// 我取消点赞的视频,关联关系删除
|
// 我取消点赞的视频,关联关系删除
|
||||||
vlogService.userUnLikeVlog(userId, vlogId);
|
vlogService.userUnLikeVlog(userId, vlogId);
|
||||||
|
@ -4,7 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
|||||||
import com.alibaba.excel.annotation.ExcelProperty;
|
import com.alibaba.excel.annotation.ExcelProperty;
|
||||||
import io.github.linpeilie.annotations.AutoMapper;
|
import io.github.linpeilie.annotations.AutoMapper;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.dromara.system.domain.SysMessage;
|
import org.dromara.system.domain
|
||||||
|
.SysMessage;
|
||||||
import org.dromara.system.domain.SysNotice;
|
import org.dromara.system.domain.SysNotice;
|
||||||
|
|
||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user