加密工具类

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("'服务繁忙'");
+        }
+        
+
+    }
+
+}

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<Boolean> giveGuard(@RequestBody GiveGuardRes query){
+    public R<Boolean> giveGuard(@RequestBody GiveGuardReq query){
         boolean res = guardTotalService.giveGuard(query);
         return R.ok(res);
     }

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<Boolean> withdraw(WithdrawRes res){
+    public R<Boolean> 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<Boolean> anchorUpdate(AnchorUpdateRes anchorUpdate){
+    public R<Boolean> anchorUpdate(AnchorUpdateReq anchorUpdate){
         return R.ok(currentUserManager.anchorUpdate(anchorUpdate));
     }
 
     @PostMapping("/user/update")
     @Operation(summary = "修改当前用户信息")
-    public R<Boolean> userUpdate(UserUpdateRes res){
+    public R<Boolean> userUpdate(UserUpdateReq res){
         return R.ok(currentUserManager.userUpdate(res));
     }
 
@@ -98,14 +98,14 @@ public class CaiCurrentUserAppController {
 
     @PostMapping("/user/album/add")
     @Operation(summary = "新增相册")
-    public R<Boolean> userAlbumAdd(AlbumAddRes res){
+    public R<Boolean> userAlbumAdd(AlbumAddReq res){
         res.setUserId(LoginHelper.getUserId());
         return R.ok(userAlbumService.addAlbum(res));
     }
 
     @PostMapping("/user/album/reset")
     @Operation(summary = "重排序相册")
-    public R<Boolean> userAlbumAdd(List<AlbumResetRes> res){
+    public R<Boolean> userAlbumAdd(List<AlbumResetReq> res){
         return R.ok(userAlbumService.resetAlbum(res,LoginHelper.getUserId()));
     }
 
@@ -131,7 +131,7 @@ public class CaiCurrentUserAppController {
 
     @PostMapping("/user/report")
     @Operation(summary = "举报")
-    public R<Void> report(UserReportRes reportRes){
+    public R<Void> report(UserReportReq reportRes){
         Long userId = LoginHelper.getUserId();
         reportRes.setUserId(userId);
         reportService.report(reportRes);

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<Void> star(DynamicStarRes query){
+    public R<Void> 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<Void> unStar(DynamicStarRes query){
+    public R<Void> 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<Void> save(DynamicAddRes res){
+    public R<Void> save(DynamicAddReq res){
         res.setUserId(LoginHelper.getUserId());
         dynamicService.saveDynamic(res);
         return R.ok();

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<Boolean> star(StarOrVisitorRes starOrVisitorRes){
+    public R<Boolean> star(StarOrVisitorReq starOrVisitorReq){
-        boolean bool = userFollowService.star(starOrVisitorRes);
+        boolean bool = userFollowService.star(starOrVisitorReq);
         return R.ok(bool);
     }
 
     @PostMapping("/unstar")
     @Operation(summary = "取消关注用户")
-    public R<Boolean> unStar(StarOrVisitorRes starOrVisitorRes){
+    public R<Boolean> unStar(StarOrVisitorReq starOrVisitorReq){
-        boolean bool = userFollowService.unStar(starOrVisitorRes);
+        boolean bool = userFollowService.unStar(starOrVisitorReq);
         return R.ok(bool);
     }
 

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<Boolean> visitor(StarOrVisitorRes starOrVisitorRes){
+    public R<Boolean> visitor(StarOrVisitorReq starOrVisitorReq){
         try {
-            boolean bool = userVisitorService.visitor(starOrVisitorRes);
+            boolean bool = userVisitorService.visitor(starOrVisitorReq);
         }catch (Exception e){
             log.error("记录访客失败",e);
         }

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")

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 = "排序")

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;
     /**

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;
+}

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
      */

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)

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;

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;
 }

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页面

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 = "城市")

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

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.AnchorUpdateReq;
-import com.ruoyi.cai.dto.app.query.UserUpdateRes;
+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<CaiAnchor> 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<CaiUser> update =

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<CaiAccountCash> {
 
-    void withdraw(WithdrawRes res);
+    void withdraw(WithdrawReq res);
 }

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<CaiDynamic> {
 
     Page<DynamicListVo> pageApp(PageQuery pageQuery, DynamicQuery query);
 
-    void saveDynamic(DynamicAddRes res);
+    void saveDynamic(DynamicAddReq res);
 }

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<CaiGuardTotal> {
 
     List<GuardTotalVo> selectGuardTotalLimit(Long fromUserId,Integer limit);
 
-    boolean giveGuard(GiveGuardRes query);
+    boolean giveGuard(GiveGuardReq query);
 }

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<CaiReport> {
 
-    void report(UserReportRes reportRes);
+    void report(UserReportReq reportRes);
 }

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.AlbumAddReq;
-import com.ruoyi.cai.dto.app.query.AlbumResetRes;
+import com.ruoyi.cai.dto.app.query.AlbumResetReq;
 
 import java.util.List;
 
@@ -20,9 +20,9 @@ public interface CaiUserAlbumService extends IService<CaiUserAlbum> {
 
     List<CaiUserAlbum> listByUserId(Long userId);
 
-    boolean addAlbum(AlbumAddRes res);
+    boolean addAlbum(AlbumAddReq res);
 
     boolean removeAlbum(Long id);
 
-    boolean resetAlbum(List<AlbumResetRes> res, Long userId);
+    boolean resetAlbum(List<AlbumResetReq> res, Long userId);
 }

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<CaiUserFollowDynamic> {
 
-    void star(DynamicStarRes query);
+    void star(DynamicStarReq query);
 
-    void unStar(DynamicStarRes query);
+    void unStar(DynamicStarReq query);
 }

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<CaiUserFollow> {
 
     boolean checkStar(Long userId, Long followUserId);
 
-    boolean star(StarOrVisitorRes starOrVisitorRes);
+    boolean star(StarOrVisitorReq starOrVisitorReq);
 
-    boolean unStar(StarOrVisitorRes starOrVisitorRes);
+    boolean unStar(StarOrVisitorReq starOrVisitorReq);
 
     Page<UserStarOrVisitorList> pageApp(PageQuery pageQuery, StarQuery query);
 }

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<CaiUserVisitor> {
 
-    boolean visitor(StarOrVisitorRes starOrVisitorRes);
+    boolean visitor(StarOrVisitorReq starOrVisitorReq);
 
     Page<UserStarOrVisitorList> pageApp(PageQuery pageQuery, VisitorQuery query);
 }

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<CaiAccountCashMapper,
     @Autowired
     private CaiAccountService accountService;
     @Override
-    public void withdraw(WithdrawRes res) {
+    public void withdraw(WithdrawReq res) {
         CaiAccountBankcard one = accountBankcardService.getOne(Wrappers.lambdaQuery(CaiAccountBankcard.class)
                 .eq(CaiAccountBankcard::getUserId, res.getUserId()).last("limit 1"));
         if(one == null){

ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiDynamicServiceImpl.java

@@ -6,26 +6,22 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.CaiDynamic;
 import com.ruoyi.cai.domain.CaiDynamicImages;
-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.DynamicImageVo;
 import com.ruoyi.cai.dto.app.vo.DynamicListVo;
 import com.ruoyi.cai.dto.app.vo.DynamicVo;
 import com.ruoyi.cai.mapper.CaiDynamicMapper;
 import com.ruoyi.cai.service.CaiDynamicImagesService;
 import com.ruoyi.cai.service.CaiDynamicService;
-import com.ruoyi.cai.service.CaiUserFollowDynamicService;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.utils.BeanConvertUtil;
 import lombok.RequiredArgsConstructor;
-import net.bytebuddy.utility.JavaConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -82,7 +78,7 @@ public class CaiDynamicServiceImpl extends ServiceImpl<CaiDynamicMapper,CaiDynam
     }
 
     @Override
-    public void saveDynamic(DynamicAddRes res) {
+    public void saveDynamic(DynamicAddReq res) {
         CaiDynamic caiDynamic = BeanConvertUtil.convertTo(res, CaiDynamic::new);
         this.save(caiDynamic);
         List<DynamicImageVo> imageList = res.getImageList();

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<CaiGuardTotalMapper,Ca
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean giveGuard(GiveGuardRes query) {
+    public boolean giveGuard(GiveGuardReq query) {
         Long fromUserId = LoginHelper.getUserId();
         CaiUser user = userService.getById(query.getToUserId());
         if(user == null){

ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiReportServiceImpl.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.CaiReport;
 import com.ruoyi.cai.domain.CaiReportCate;
-import com.ruoyi.cai.dto.app.query.UserReportRes;
+import com.ruoyi.cai.dto.app.query.UserReportReq;
 import com.ruoyi.cai.mapper.CaiReportMapper;
 import com.ruoyi.cai.service.CaiReportCateService;
 import com.ruoyi.cai.service.CaiReportService;
@@ -23,7 +23,7 @@ public class CaiReportServiceImpl extends ServiceImpl<CaiReportMapper,CaiReport>
     @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());

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.AlbumAddReq;
-import com.ruoyi.cai.dto.app.query.AlbumResetRes;
+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<CaiUserAlbumMapper, Cai
     }
 
     @Override
-    public boolean addAlbum(AlbumAddRes res) {
+    public boolean addAlbum(AlbumAddReq res) {
         CaiUser user = userService.getById(res.getUserId());
         CaiUserAlbum album = new CaiUserAlbum();
         album.setUserId(res.getUserId());
@@ -71,11 +71,11 @@ public class CaiUserAlbumServiceImpl extends ServiceImpl<CaiUserAlbumMapper, Cai
     }
 
     @Override
-    public boolean resetAlbum(List<AlbumResetRes> res, Long userId) {
+    public boolean resetAlbum(List<AlbumResetReq> res, Long userId) {
         CaiUser user = userService.getById(userId);
         List<CaiUserAlbum> 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());

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<CaiUserFollowDy
     private CaiDynamicService dynamicService;
 
     @Override
-    public void star(DynamicStarRes query) {
+    public void star(DynamicStarReq query) {
         CaiDynamic dynamic = dynamicService.getById(query.getDynamicId());
         if(dynamic == null){
             return;
@@ -42,7 +42,7 @@ public class CaiUserFollowDynamicServiceImpl extends ServiceImpl<CaiUserFollowDy
     }
 
     @Override
-    public void unStar(DynamicStarRes query) {
+    public void unStar(DynamicStarReq query) {
         this.remove(Wrappers.lambdaQuery(CaiUserFollowDynamic.class)
                 .eq(CaiUserFollowDynamic::getDynamicId,query.getDynamicId())
                 .eq(CaiUserFollowDynamic::getUserId,query.getUserId()));

ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserFollowServiceImpl.java

@@ -3,11 +3,10 @@ package com.ruoyi.cai.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.cai.domain.CaiUser;
 import com.ruoyi.cai.domain.CaiUserCount;
 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.cai.mapper.CaiUserFollowMapper;
 import com.ruoyi.cai.service.CaiUserCountService;
@@ -51,26 +50,26 @@ public class CaiUserFollowServiceImpl extends ServiceImpl<CaiUserFollowMapper,Ca
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean star(StarOrVisitorRes starOrVisitorRes) {
+    public boolean star(StarOrVisitorReq starOrVisitorReq) {
         Long fromUserId = LoginHelper.getUserId();
         this.remove(Wrappers.lambdaQuery(CaiUserFollow.class)
                 .eq(CaiUserFollow::getUserId,fromUserId)
-                .eq(CaiUserFollow::getFollowUser, starOrVisitorRes.getToUserId()));
+                .eq(CaiUserFollow::getFollowUser, starOrVisitorReq.getToUserId()));
         CaiUserFollow userFollow = new CaiUserFollow();
         userFollow.setUserId(fromUserId);
-        userFollow.setFollowUser(starOrVisitorRes.getToUserId());
+        userFollow.setFollowUser(starOrVisitorReq.getToUserId());
         this.save(userFollow);
-        userCountService.star(fromUserId,starOrVisitorRes.getToUserId());
+        userCountService.star(fromUserId, starOrVisitorReq.getToUserId());
         return true;
     }
 
     @Override
-    public boolean unStar(StarOrVisitorRes starOrVisitorRes) {
+    public boolean unStar(StarOrVisitorReq starOrVisitorReq) {
         Long fromUserId = LoginHelper.getUserId();
         this.remove(Wrappers.lambdaQuery(CaiUserFollow.class)
                 .eq(CaiUserFollow::getUserId,fromUserId)
-                .eq(CaiUserFollow::getFollowUser, starOrVisitorRes.getToUserId()));
+                .eq(CaiUserFollow::getFollowUser, starOrVisitorReq.getToUserId()));
-        userCountService.star(fromUserId,starOrVisitorRes.getToUserId());
+        userCountService.star(fromUserId, starOrVisitorReq.getToUserId());
         return true;
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserVisitorServiceImpl.java

@@ -3,9 +3,8 @@ package com.ruoyi.cai.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.cai.domain.CaiUserFollow;
 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.cai.mapper.CaiUserVisitorMapper;
@@ -18,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * 用户来访记录Service业务层处理
@@ -32,20 +30,20 @@ public class CaiUserVisitorServiceImpl extends ServiceImpl<CaiUserVisitorMapper,
     @Autowired
     private CaiUserCountService userCountService;
     @Override
-    public boolean visitor(StarOrVisitorRes starOrVisitorRes) {
+    public boolean visitor(StarOrVisitorReq starOrVisitorReq) {
         Long fromUserId = LoginHelper.getUserId();
         CaiUserVisitor userVisitor = this.getOne(Wrappers.lambdaQuery(CaiUserVisitor.class)
                 .eq(CaiUserVisitor::getVisitorId, fromUserId)
-                .eq(CaiUserVisitor::getUserId, starOrVisitorRes.getToUserId())
+                .eq(CaiUserVisitor::getUserId, starOrVisitorReq.getToUserId())
                 .last("limit 1"));
         if(userVisitor == null){
             userVisitor = new CaiUserVisitor();
             userVisitor.setVisitorId(fromUserId);
-            userVisitor.setUserId(starOrVisitorRes.getToUserId());
+            userVisitor.setUserId(starOrVisitorReq.getToUserId());
         }
         userVisitor.setCreateTime(LocalDateTime.now());
         this.saveOrUpdate(userVisitor);
-        userCountService.visitor(fromUserId, starOrVisitorRes.getToUserId());
+        userCountService.visitor(fromUserId, starOrVisitorReq.getToUserId());
         return true;
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/ws/manager/WebSocketManager.java

@@ -0,0 +1,10 @@
+package com.ruoyi.cai.ws.manager;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class WebSocketManager {
+    public String checkOnlineRoom(Long formUserId,Long toUserId){
+        return "name";
+    }
+}