From 71c3b5b9c877ad83b34e4303e86f97b938a59f62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= Date: Wed, 27 Dec 2023 22:51:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=AF=86=E5=B7=A5=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/cai/chat/ChatManager.java | 47 +++++++++++++++++++ .../app/CaiAnchorAppController.java | 4 +- .../app/CaiCurrentUserAppController.java | 12 ++--- .../app/CaiUserDynamicAppController.java | 10 ++-- .../app/CaiUserStartAppController.java | 10 ++-- .../app/CaiUserVisitorAppController.java | 6 +-- .../{AlbumAddRes.java => AlbumAddReq.java} | 2 +- ...{AlbumResetRes.java => AlbumResetReq.java} | 2 +- ...horUpdateRes.java => AnchorUpdateReq.java} | 2 +- .../com/ruoyi/cai/dto/app/query/CallReq.java | 10 ++++ ...{DynamicAddRes.java => DynamicAddReq.java} | 2 +- ...ynamicStarRes.java => DynamicStarReq.java} | 2 +- .../{GiveGuardRes.java => GiveGuardReq.java} | 2 +- ...rVisitorRes.java => StarOrVisitorReq.java} | 2 +- ...{UserReportRes.java => UserReportReq.java} | 2 +- ...{UserUpdateRes.java => UserUpdateReq.java} | 2 +- .../{WithdrawRes.java => WithdrawReq.java} | 2 +- .../ruoyi/cai/manager/CurrentUserManager.java | 8 ++-- .../cai/service/CaiAccountCashService.java | 4 +- .../ruoyi/cai/service/CaiDynamicService.java | 5 +- .../cai/service/CaiGuardTotalService.java | 4 +- .../ruoyi/cai/service/CaiReportService.java | 4 +- .../cai/service/CaiUserAlbumService.java | 8 ++-- .../service/CaiUserFollowDynamicService.java | 6 +-- .../cai/service/CaiUserFollowService.java | 6 +-- .../cai/service/CaiUserVisitorService.java | 4 +- .../impl/CaiAccountCashServiceImpl.java | 4 +- .../service/impl/CaiDynamicServiceImpl.java | 8 +--- .../impl/CaiGuardTotalServiceImpl.java | 5 +- .../service/impl/CaiReportServiceImpl.java | 4 +- .../service/impl/CaiUserAlbumServiceImpl.java | 10 ++-- .../impl/CaiUserFollowDynamicServiceImpl.java | 6 +-- .../impl/CaiUserFollowServiceImpl.java | 17 ++++--- .../impl/CaiUserVisitorServiceImpl.java | 12 ++--- .../cai/ws/manager/WebSocketManager.java | 10 ++++ 35 files changed, 151 insertions(+), 93 deletions(-) create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java rename ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/{AlbumAddRes.java => AlbumAddReq.java} (93%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/{AlbumResetRes.java => AlbumResetReq.java} (89%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/{AnchorUpdateRes.java => AnchorUpdateReq.java} (95%) create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/CallReq.java rename ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/{DynamicAddRes.java => DynamicAddReq.java} (97%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/{DynamicStarRes.java => DynamicStarReq.java} (91%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/{GiveGuardRes.java => GiveGuardReq.java} (91%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/{StarOrVisitorRes.java => StarOrVisitorReq.java} (87%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/{UserReportRes.java => UserReportReq.java} (96%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/{UserUpdateRes.java => UserUpdateReq.java} (93%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/{WithdrawRes.java => WithdrawReq.java} (95%) create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/ws/manager/WebSocketManager.java diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java new file mode 100644 index 00000000..3d446147 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java @@ -0,0 +1,47 @@ +package com.ruoyi.cai.chat; + +import com.ruoyi.cai.domain.CaiAnchor; +import com.ruoyi.cai.domain.CaiUser; +import com.ruoyi.cai.dto.app.query.AnchorListQuery; +import com.ruoyi.cai.dto.app.query.CallReq; +import com.ruoyi.cai.service.CaiAnchorService; +import com.ruoyi.cai.service.CaiUserService; +import com.ruoyi.cai.ws.manager.WebSocketManager; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.helper.LoginHelper; +import com.ruoyi.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class ChatManager { + @Autowired + private CaiUserService userService; + @Autowired + private CaiAnchorService anchorService; + @Autowired + private WebSocketManager webSocketManager; + + public void call(CallReq callReq){ + Long userId = LoginHelper.getUserId(); + CaiUser formUser = userService.getById(userId); + CaiUser toUser = userService.getById(callReq.getToUid()); + if(toUser.getIsAnchor() != 1){ + throw new ServiceException("对方未通过女神认证，不能接听视频"); + } + if(formUser.getGender() == 1 && toUser.getGender() == 1){ + throw new ServiceException("主播和主播之间，不可以拨打视频哦~"); + } + CaiAnchor anchor = anchorService.getByUserId(toUser.getId()); + if(anchor == null){ + throw new ServiceException("主播技能不存在"); + } + String roomId = webSocketManager.checkOnlineRoom(formUser.getId(), toUser.getId()); + if (StringUtils.isNotEmpty(roomId)) { + throw new ServiceException("'服务繁忙'"); + } + + + } + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiAnchorAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiAnchorAppController.java index bf011609..6ca8aaff 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiAnchorAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiAnchorAppController.java @@ -4,7 +4,7 @@ package com.ruoyi.cai.controller.app; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.dto.app.query.AnchorListQuery; import com.ruoyi.cai.dto.app.query.GiveGiftRes; -import com.ruoyi.cai.dto.app.query.GiveGuardRes; +import com.ruoyi.cai.dto.app.query.GiveGuardReq; import com.ruoyi.cai.dto.app.vo.AnchorListVo; import com.ruoyi.cai.service.CaiAnchorService; import com.ruoyi.cai.service.CaiGuardTotalService; @@ -39,7 +39,7 @@ public class CaiAnchorAppController { @PostMapping("/give/guard") @Operation(summary = "赠送主播守护") - public R giveGuard(@RequestBody GiveGuardRes query){ + public R giveGuard(@RequestBody GiveGuardReq query){ boolean res = guardTotalService.giveGuard(query); return R.ok(res); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiCurrentUserAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiCurrentUserAppController.java index 298ecc95..ee393afd 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiCurrentUserAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiCurrentUserAppController.java @@ -54,7 +54,7 @@ public class CaiCurrentUserAppController { @PostMapping("/user/withdraw/ali") @Operation(summary = "支付宝提现接口") - public R withdraw(WithdrawRes res){ + public R withdraw(WithdrawReq res){ res.setUserId(LoginHelper.getUserId()); accountCashService.withdraw(res); return R.ok(true); @@ -80,13 +80,13 @@ public class CaiCurrentUserAppController { @PostMapping("/anchor/update") @Operation(summary = "修改当前用户的主播信息") - public R anchorUpdate(AnchorUpdateRes anchorUpdate){ + public R anchorUpdate(AnchorUpdateReq anchorUpdate){ return R.ok(currentUserManager.anchorUpdate(anchorUpdate)); } @PostMapping("/user/update") @Operation(summary = "修改当前用户信息") - public R userUpdate(UserUpdateRes res){ + public R userUpdate(UserUpdateReq res){ return R.ok(currentUserManager.userUpdate(res)); } @@ -98,14 +98,14 @@ public class CaiCurrentUserAppController { @PostMapping("/user/album/add") @Operation(summary = "新增相册") - public R userAlbumAdd(AlbumAddRes res){ + public R userAlbumAdd(AlbumAddReq res){ res.setUserId(LoginHelper.getUserId()); return R.ok(userAlbumService.addAlbum(res)); } @PostMapping("/user/album/reset") @Operation(summary = "重排序相册") - public R userAlbumAdd(List res){ + public R userAlbumAdd(List res){ return R.ok(userAlbumService.resetAlbum(res,LoginHelper.getUserId())); } @@ -131,7 +131,7 @@ public class CaiCurrentUserAppController { @PostMapping("/user/report") @Operation(summary = "举报") - public R report(UserReportRes reportRes){ + public R report(UserReportReq reportRes){ Long userId = LoginHelper.getUserId(); reportRes.setUserId(userId); reportService.report(reportRes); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserDynamicAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserDynamicAppController.java index a6157758..fcbc270a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserDynamicAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserDynamicAppController.java @@ -1,9 +1,9 @@ package com.ruoyi.cai.controller.app; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.dto.app.query.DynamicAddRes; +import com.ruoyi.cai.dto.app.query.DynamicAddReq; import com.ruoyi.cai.dto.app.query.DynamicQuery; -import com.ruoyi.cai.dto.app.query.DynamicStarRes; +import com.ruoyi.cai.dto.app.query.DynamicStarReq; import com.ruoyi.cai.dto.app.vo.DynamicListVo; import com.ruoyi.cai.service.CaiDynamicService; import com.ruoyi.cai.service.CaiUserFollowDynamicService; @@ -38,7 +38,7 @@ public class CaiUserDynamicAppController { @PostMapping("/star") @Operation(summary = "关注动态") - public R star(DynamicStarRes query){ + public R star(DynamicStarReq query){ query.setUserId(LoginHelper.getUserId()); userFollowDynamicService.star(query); return R.ok(); @@ -46,7 +46,7 @@ public class CaiUserDynamicAppController { @PostMapping("/unstar") @Operation(summary = "取消关注动态") - public R unStar(DynamicStarRes query){ + public R unStar(DynamicStarReq query){ query.setUserId(LoginHelper.getUserId()); userFollowDynamicService.unStar(query); return R.ok(); @@ -54,7 +54,7 @@ public class CaiUserDynamicAppController { @PostMapping("/save") @Operation(summary = "发布动态") - public R save(DynamicAddRes res){ + public R save(DynamicAddReq res){ res.setUserId(LoginHelper.getUserId()); dynamicService.saveDynamic(res); return R.ok(); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserStartAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserStartAppController.java index 0c6457fe..740ac220 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserStartAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserStartAppController.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.controller.app; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.dto.app.query.StarOrVisitorRes; +import com.ruoyi.cai.dto.app.query.StarOrVisitorReq; import com.ruoyi.cai.dto.app.query.StarQuery; import com.ruoyi.cai.dto.app.vo.UserStarOrVisitorList; import com.ruoyi.cai.service.CaiUserFollowService; @@ -26,15 +26,15 @@ public class CaiUserStartAppController { @PostMapping("/star") @Operation(summary = "关注用户") - public R star(StarOrVisitorRes starOrVisitorRes){ - boolean bool = userFollowService.star(starOrVisitorRes); + public R star(StarOrVisitorReq starOrVisitorReq){ + boolean bool = userFollowService.star(starOrVisitorReq); return R.ok(bool); } @PostMapping("/unstar") @Operation(summary = "取消关注用户") - public R unStar(StarOrVisitorRes starOrVisitorRes){ - boolean bool = userFollowService.unStar(starOrVisitorRes); + public R unStar(StarOrVisitorReq starOrVisitorReq){ + boolean bool = userFollowService.unStar(starOrVisitorReq); return R.ok(bool); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserVisitorAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserVisitorAppController.java index cbf72e60..e9b3f1eb 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserVisitorAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserVisitorAppController.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.controller.app; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.dto.app.query.StarOrVisitorRes; +import com.ruoyi.cai.dto.app.query.StarOrVisitorReq; import com.ruoyi.cai.dto.app.query.VisitorQuery; import com.ruoyi.cai.dto.app.vo.UserStarOrVisitorList; import com.ruoyi.cai.service.CaiUserVisitorService; @@ -29,9 +29,9 @@ public class CaiUserVisitorAppController { // 除网络问题不返回异常。避免影响业务 @PostMapping("/visitor") @Operation(summary = "新增浏览记录") - public R visitor(StarOrVisitorRes starOrVisitorRes){ + public R visitor(StarOrVisitorReq starOrVisitorReq){ try { - boolean bool = userVisitorService.visitor(starOrVisitorRes); + boolean bool = userVisitorService.visitor(starOrVisitorReq); }catch (Exception e){ log.error("记录访客失败",e); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/AlbumAddRes.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/AlbumAddReq.java similarity index 93% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/AlbumAddRes.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/AlbumAddReq.java index f55fb7ac..4ad15dea 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/AlbumAddRes.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/AlbumAddReq.java @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -public class AlbumAddRes { +public class AlbumAddReq { @Schema(description = "用户ID",accessMode = Schema.AccessMode.READ_ONLY) private Long userId; @Schema(description = "url") diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/AlbumResetRes.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/AlbumResetReq.java similarity index 89% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/AlbumResetRes.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/AlbumResetReq.java index 712a8d45..6cd57a97 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/AlbumResetRes.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/AlbumResetReq.java @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -public class AlbumResetRes { +public class AlbumResetReq { @Schema(description = "ID") private Long id; @Schema(description = "排序") diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/AnchorUpdateRes.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/AnchorUpdateReq.java similarity index 95% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/AnchorUpdateRes.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/AnchorUpdateReq.java index f25c088c..df1e995a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/AnchorUpdateRes.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/AnchorUpdateReq.java @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -public class AnchorUpdateRes { +public class AnchorUpdateReq { @Schema(description = "用户ID") private Long userId; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/CallReq.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/CallReq.java new file mode 100644 index 00000000..c7def7b5 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/CallReq.java @@ -0,0 +1,10 @@ +package com.ruoyi.cai.dto.app.query; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class CallReq implements Serializable { + private Long toUid; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/DynamicAddRes.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/DynamicAddReq.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/DynamicAddRes.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/DynamicAddReq.java index 612571d4..e7aefc74 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/DynamicAddRes.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/DynamicAddReq.java @@ -9,7 +9,7 @@ import java.util.List; @Data @Schema(description = "发布动态") -public class DynamicAddRes { +public class DynamicAddReq { /** * 用户ID */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/DynamicStarRes.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/DynamicStarReq.java similarity index 91% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/DynamicStarRes.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/DynamicStarReq.java index ade88163..37c1c441 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/DynamicStarRes.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/DynamicStarReq.java @@ -5,7 +5,7 @@ import lombok.Data; @Data @Schema(description = "动态关注") -public class DynamicStarRes { +public class DynamicStarReq { @Schema(description = "动态ID") private Long dynamicId; @Schema(description = "用户ID",accessMode = Schema.AccessMode.READ_ONLY) diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/GiveGuardRes.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/GiveGuardReq.java similarity index 91% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/GiveGuardRes.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/GiveGuardReq.java index 628c6a97..a2d4c295 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/GiveGuardRes.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/GiveGuardReq.java @@ -5,7 +5,7 @@ import lombok.Data; @Data @Schema(description = "赠送守护入参") -public class GiveGuardRes { +public class GiveGuardReq { @Schema(description = "接收方用户ID") private Long toUserId; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/StarOrVisitorRes.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/StarOrVisitorReq.java similarity index 87% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/StarOrVisitorRes.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/StarOrVisitorReq.java index 8b89578d..4db249be 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/StarOrVisitorRes.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/StarOrVisitorReq.java @@ -5,7 +5,7 @@ import lombok.Data; @Data @Schema(description = "入参模型") -public class StarOrVisitorRes { +public class StarOrVisitorReq { @Schema(description = "目标用户ID") private Long toUserId; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserReportRes.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserReportReq.java similarity index 96% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserReportRes.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserReportReq.java index d9a30315..fa204559 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserReportRes.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserReportReq.java @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -public class UserReportRes { +public class UserReportReq { /** * 举报类型 1 个人详情页 2 视频结束 3 动态 4.IM页面 diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserUpdateRes.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserUpdateReq.java similarity index 93% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserUpdateRes.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserUpdateReq.java index 32f9fd22..0dff4e0b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserUpdateRes.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserUpdateReq.java @@ -6,7 +6,7 @@ import lombok.Data; import java.time.LocalDateTime; @Data -public class UserUpdateRes { +public class UserUpdateReq { @Schema(description = "用户ID",accessMode = Schema.AccessMode.READ_ONLY) private Long userId; @Schema(description = "城市") diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/WithdrawRes.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/WithdrawReq.java similarity index 95% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/WithdrawRes.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/WithdrawReq.java index 20018fd8..646f969d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/WithdrawRes.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/WithdrawReq.java @@ -5,7 +5,7 @@ import lombok.Data; @Data @Schema(description = "提现入参") -public class WithdrawRes { +public class WithdrawReq { /** * 提现配置ID diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java index 96fb7fdb..3f8e2009 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.cai.domain.*; import com.ruoyi.cai.dto.app.query.AccountAliBankCardRes; -import com.ruoyi.cai.dto.app.query.AnchorUpdateRes; -import com.ruoyi.cai.dto.app.query.UserUpdateRes; +import com.ruoyi.cai.dto.app.query.AnchorUpdateReq; +import com.ruoyi.cai.dto.app.query.UserUpdateReq; import com.ruoyi.cai.dto.app.vo.*; import com.ruoyi.cai.service.*; import com.ruoyi.common.helper.LoginHelper; @@ -58,7 +58,7 @@ public class CurrentUserManager { return BeanConvertUtil.convertTo(anchor,AnchorVo::new); } - public boolean anchorUpdate(AnchorUpdateRes anchorUpdate) { + public boolean anchorUpdate(AnchorUpdateReq anchorUpdate) { anchorUpdate.setUserId(LoginHelper.getUserId()); boolean updateFlag = false; LambdaUpdateWrapper update = @@ -81,7 +81,7 @@ public class CurrentUserManager { return true; } - public boolean userUpdate(UserUpdateRes res) { + public boolean userUpdate(UserUpdateReq res) { res.setUserId(LoginHelper.getUserId()); boolean updateFlag = false; LambdaUpdateWrapper update = diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountCashService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountCashService.java index 2a3af898..d1a7e78f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountCashService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountCashService.java @@ -2,7 +2,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cai.domain.CaiAccountCash; -import com.ruoyi.cai.dto.app.query.WithdrawRes; +import com.ruoyi.cai.dto.app.query.WithdrawReq; /** * 用户提现记录Service接口 @@ -12,5 +12,5 @@ import com.ruoyi.cai.dto.app.query.WithdrawRes; */ public interface CaiAccountCashService extends IService { - void withdraw(WithdrawRes res); + void withdraw(WithdrawReq res); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiDynamicService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiDynamicService.java index 6a2eada0..a8f7a791 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiDynamicService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiDynamicService.java @@ -3,9 +3,8 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cai.domain.CaiDynamic; -import com.ruoyi.cai.dto.app.query.DynamicAddRes; +import com.ruoyi.cai.dto.app.query.DynamicAddReq; import com.ruoyi.cai.dto.app.query.DynamicQuery; -import com.ruoyi.cai.dto.app.query.DynamicStarRes; import com.ruoyi.cai.dto.app.vo.DynamicListVo; import com.ruoyi.cai.dto.app.vo.DynamicVo; import com.ruoyi.common.core.domain.PageQuery; @@ -24,5 +23,5 @@ public interface CaiDynamicService extends IService { Page pageApp(PageQuery pageQuery, DynamicQuery query); - void saveDynamic(DynamicAddRes res); + void saveDynamic(DynamicAddReq res); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGuardTotalService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGuardTotalService.java index 0c496692..7ab87ad7 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGuardTotalService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGuardTotalService.java @@ -2,7 +2,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cai.domain.CaiGuardTotal; -import com.ruoyi.cai.dto.app.query.GiveGuardRes; +import com.ruoyi.cai.dto.app.query.GiveGuardReq; import com.ruoyi.cai.dto.app.vo.GuardTotalVo; import java.util.List; @@ -17,5 +17,5 @@ public interface CaiGuardTotalService extends IService { List selectGuardTotalLimit(Long fromUserId,Integer limit); - boolean giveGuard(GiveGuardRes query); + boolean giveGuard(GiveGuardReq query); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiReportService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiReportService.java index d4057122..0a2e2871 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiReportService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiReportService.java @@ -2,7 +2,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cai.domain.CaiReport; -import com.ruoyi.cai.dto.app.query.UserReportRes; +import com.ruoyi.cai.dto.app.query.UserReportReq; /** * 举报Service接口 @@ -12,5 +12,5 @@ import com.ruoyi.cai.dto.app.query.UserReportRes; */ public interface CaiReportService extends IService { - void report(UserReportRes reportRes); + void report(UserReportReq reportRes); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserAlbumService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserAlbumService.java index dcdeb0ab..5491508f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserAlbumService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserAlbumService.java @@ -2,8 +2,8 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cai.domain.CaiUserAlbum; -import com.ruoyi.cai.dto.app.query.AlbumAddRes; -import com.ruoyi.cai.dto.app.query.AlbumResetRes; +import com.ruoyi.cai.dto.app.query.AlbumAddReq; +import com.ruoyi.cai.dto.app.query.AlbumResetReq; import java.util.List; @@ -20,9 +20,9 @@ public interface CaiUserAlbumService extends IService { List listByUserId(Long userId); - boolean addAlbum(AlbumAddRes res); + boolean addAlbum(AlbumAddReq res); boolean removeAlbum(Long id); - boolean resetAlbum(List res, Long userId); + boolean resetAlbum(List res, Long userId); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowDynamicService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowDynamicService.java index 6cb1b2de..8fb22f4a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowDynamicService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowDynamicService.java @@ -2,7 +2,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cai.domain.CaiUserFollowDynamic; -import com.ruoyi.cai.dto.app.query.DynamicStarRes; +import com.ruoyi.cai.dto.app.query.DynamicStarReq; /** * 关注动态表Service接口 @@ -12,7 +12,7 @@ import com.ruoyi.cai.dto.app.query.DynamicStarRes; */ public interface CaiUserFollowDynamicService extends IService { - void star(DynamicStarRes query); + void star(DynamicStarReq query); - void unStar(DynamicStarRes query); + void unStar(DynamicStarReq query); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowService.java index 7206a747..70795e10 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cai.domain.CaiUserFollow; import com.ruoyi.cai.dto.app.query.StarQuery; -import com.ruoyi.cai.dto.app.query.StarOrVisitorRes; +import com.ruoyi.cai.dto.app.query.StarOrVisitorReq; import com.ruoyi.cai.dto.app.vo.UserStarOrVisitorList; import com.ruoyi.common.core.domain.PageQuery; @@ -20,9 +20,9 @@ public interface CaiUserFollowService extends IService { boolean checkStar(Long userId, Long followUserId); - boolean star(StarOrVisitorRes starOrVisitorRes); + boolean star(StarOrVisitorReq starOrVisitorReq); - boolean unStar(StarOrVisitorRes starOrVisitorRes); + boolean unStar(StarOrVisitorReq starOrVisitorReq); Page pageApp(PageQuery pageQuery, StarQuery query); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserVisitorService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserVisitorService.java index d7810b89..8e853c94 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserVisitorService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserVisitorService.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cai.domain.CaiUserVisitor; -import com.ruoyi.cai.dto.app.query.StarOrVisitorRes; +import com.ruoyi.cai.dto.app.query.StarOrVisitorReq; import com.ruoyi.cai.dto.app.query.VisitorQuery; import com.ruoyi.cai.dto.app.vo.UserStarOrVisitorList; import com.ruoyi.common.core.domain.PageQuery; @@ -16,7 +16,7 @@ import com.ruoyi.common.core.domain.PageQuery; */ public interface CaiUserVisitorService extends IService { - boolean visitor(StarOrVisitorRes starOrVisitorRes); + boolean visitor(StarOrVisitorReq starOrVisitorReq); Page pageApp(PageQuery pageQuery, VisitorQuery query); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountCashServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountCashServiceImpl.java index 5674db48..e02bb506 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountCashServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountCashServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.cai.domain.CaiAccountBankcard; import com.ruoyi.cai.domain.CaiAccountCash; -import com.ruoyi.cai.dto.app.query.WithdrawRes; +import com.ruoyi.cai.dto.app.query.WithdrawReq; import com.ruoyi.cai.mapper.CaiAccountCashMapper; import com.ruoyi.cai.service.CaiAccountBankcardService; import com.ruoyi.cai.service.CaiAccountCashService; @@ -22,7 +22,7 @@ public class CaiAccountCashServiceImpl extends ServiceImpl imageList = res.getImageList(); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardTotalServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardTotalServiceImpl.java index c368c350..c9cf716c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardTotalServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardTotalServiceImpl.java @@ -2,10 +2,9 @@ package com.ruoyi.cai.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cai.domain.CaiAccount; import com.ruoyi.cai.domain.CaiGuardTotal; import com.ruoyi.cai.domain.CaiUser; -import com.ruoyi.cai.dto.app.query.GiveGuardRes; +import com.ruoyi.cai.dto.app.query.GiveGuardReq; import com.ruoyi.cai.dto.app.vo.GuardTotalVo; import com.ruoyi.cai.mapper.CaiGuardTotalMapper; import com.ruoyi.cai.service.CaiAccountService; @@ -41,7 +40,7 @@ public class CaiGuardTotalServiceImpl extends ServiceImpl @Autowired private CaiReportCateService reportCateService; @Override - public void report(UserReportRes reportRes) { + public void report(UserReportReq reportRes) { CaiReportCate reportCate = reportCateService.getById(reportRes.getCateId()); CaiReport report = new CaiReport(); report.setType(reportRes.getType()); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserAlbumServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserAlbumServiceImpl.java index 3c34064d..2ea21253 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserAlbumServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserAlbumServiceImpl.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.cai.domain.CaiUser; import com.ruoyi.cai.domain.CaiUserAlbum; -import com.ruoyi.cai.dto.app.query.AlbumAddRes; -import com.ruoyi.cai.dto.app.query.AlbumResetRes; +import com.ruoyi.cai.dto.app.query.AlbumAddReq; +import com.ruoyi.cai.dto.app.query.AlbumResetReq; import com.ruoyi.cai.mapper.CaiUserAlbumMapper; import com.ruoyi.cai.service.CaiUserAlbumService; import com.ruoyi.cai.service.CaiUserService; @@ -49,7 +49,7 @@ public class CaiUserAlbumServiceImpl extends ServiceImpl res, Long userId) { + public boolean resetAlbum(List res, Long userId) { CaiUser user = userService.getById(userId); List update = new ArrayList<>(); Long id = null; - for (AlbumResetRes re : res) { + for (AlbumResetReq re : res) { CaiUserAlbum album = new CaiUserAlbum(); album.setId(re.getId()); album.setOrderBy(re.getOrderBy()); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserFollowDynamicServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserFollowDynamicServiceImpl.java index 1cacaded..9cde177e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserFollowDynamicServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserFollowDynamicServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.cai.domain.CaiDynamic; import com.ruoyi.cai.domain.CaiUserFollowDynamic; -import com.ruoyi.cai.dto.app.query.DynamicStarRes; +import com.ruoyi.cai.dto.app.query.DynamicStarReq; import com.ruoyi.cai.mapper.CaiUserFollowDynamicMapper; import com.ruoyi.cai.service.CaiDynamicService; import com.ruoyi.cai.service.CaiUserFollowDynamicService; @@ -26,7 +26,7 @@ public class CaiUserFollowDynamicServiceImpl extends ServiceImpl