diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountBankcardController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountBankcardController.java index 50c9d561..47f10ca7 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountBankcardController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountBankcardController.java @@ -42,7 +42,7 @@ public class AccountBankcardController extends BaseController { @SaCheckPermission("cai:accountBankcard:list") @GetMapping("/list") public TableDataInfo list(AccountBankcard bo, PageQuery pageQuery) { - Page page = accountBankcardService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + Page page = accountBankcardService.page(pageQuery.build()); return TableDataInfo.build(page); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountChangeLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountChangeLogController.java index 0264d640..f0435a8d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountChangeLogController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountChangeLogController.java @@ -58,7 +58,8 @@ public class AccountChangeLogController extends BaseController { @SaCheckPermission("cai:accountChangeLog:list") @GetMapping("/list") public TableDataInfo list(AccountChangeLog bo, PageQuery pageQuery) { - Page page = accountChangeLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + Page page = accountChangeLogService.page(pageQuery.build(), + Wrappers.lambdaQuery(bo).orderByDesc(AccountChangeLog::getCreateTime)); return TableDataInfo.build(page); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountDetailController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountDetailController.java index 84ecc2b1..dbb01ecc 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountDetailController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountDetailController.java @@ -42,7 +42,8 @@ public class AccountDetailController extends BaseController { @SaCheckPermission("cai:accountDetail:list") @GetMapping("/list") public TableDataInfo list(AccountDetail bo, PageQuery pageQuery) { - Page page = caiAccountDetailService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + Page page = caiAccountDetailService.page(pageQuery.build(), + Wrappers.lambdaQuery(bo).orderByDesc(AccountDetail::getCreateTime)); return TableDataInfo.build(page); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountRechargeController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountRechargeController.java index 4aefcd84..480c7006 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountRechargeController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountRechargeController.java @@ -42,7 +42,8 @@ public class AccountRechargeController extends BaseController { @SaCheckPermission("cai:accountRecharge:list") @GetMapping("/list") public TableDataInfo list(AccountRecharge bo, PageQuery pageQuery) { - Page page = accountRechargeService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + Page page = accountRechargeService.page(pageQuery.build(), + Wrappers.lambdaQuery(bo).orderByDesc(AccountRecharge::getCreateTime)); return TableDataInfo.build(page); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/BannerController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/BannerController.java index 25a2aff7..dd75b8ff 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/BannerController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/BannerController.java @@ -42,7 +42,8 @@ public class BannerController extends BaseController { @SaCheckPermission("cai:banner:list") @GetMapping("/list") public TableDataInfo list(Banner bo, PageQuery pageQuery) { - Page page = bannerService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + Page page = bannerService.page(pageQuery.build(), + Wrappers.lambdaQuery(bo).orderByDesc(Banner::getCreateTime)); return TableDataInfo.build(page); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ConsumeLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ConsumeLogController.java index 0873c51c..5c387181 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ConsumeLogController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ConsumeLogController.java @@ -43,7 +43,8 @@ public class ConsumeLogController extends BaseController { @SaCheckPermission("cai:consumeLog:list") @GetMapping("/list") public TableDataInfo list(ConsumeLog bo, PageQuery pageQuery) { - Page page = consumeLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + Page page = consumeLogService.page(pageQuery.build(), + Wrappers.lambdaQuery(bo).orderByDesc(ConsumeLog::getCreateTime)); return TableDataInfo.build(page); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiftController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiftController.java index b72be67c..03243a7b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiftController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiftController.java @@ -42,7 +42,8 @@ public class GiftController extends BaseController { @SaCheckPermission("cai:gift:list") @GetMapping("/list") public TableDataInfo list(Gift bo, PageQuery pageQuery) { - Page page = giftService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + Page page = giftService.page(pageQuery.build(), + Wrappers.lambdaQuery(bo).orderByAsc(Gift::getPrice)); return TableDataInfo.build(page); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiveLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiveLogController.java index c97c0d63..6234dee6 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiveLogController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiveLogController.java @@ -42,7 +42,8 @@ public class GiveLogController extends BaseController { @SaCheckPermission("cai:giveLog:list") @GetMapping("/list") public TableDataInfo list(GiveLog bo, PageQuery pageQuery) { - Page page = giveLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + Page page = giveLogService.page(pageQuery.build(), + Wrappers.lambdaQuery(bo).orderByDesc(GiveLog::getCreateTime)); return TableDataInfo.build(page); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardLogController.java index 076dc197..5615f58c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardLogController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardLogController.java @@ -37,6 +37,7 @@ import java.util.Arrays; @RequiredArgsConstructor @RestController @RequestMapping("/cai/guardLog") +@Deprecated public class GuardLogController extends BaseController { private final GuardLogService guardLogService; @@ -47,7 +48,8 @@ public class GuardLogController extends BaseController { @SaCheckPermission("cai:guardLog:list") @GetMapping("/list") public TableDataInfo list(GuardLog bo, PageQuery pageQuery) { - Page page = guardLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + Page page = guardLogService.page(pageQuery.build(), + Wrappers.lambdaQuery(bo).orderByDesc(GuardLog::getCreateTime)); return TableDataInfo.build(page); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardTotalController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardTotalController.java index 79a48334..c9a3b273 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardTotalController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardTotalController.java @@ -42,7 +42,8 @@ public class GuardTotalController extends BaseController { @SaCheckPermission("cai:guardTotal:list") @GetMapping("/list") public TableDataInfo list(GuardTotal bo, PageQuery pageQuery) { - Page page = guardTotalService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + Page page = guardTotalService.page(pageQuery.build(), + Wrappers.lambdaQuery(bo).orderByDesc(GuardTotal::getCreateTime)); return TableDataInfo.build(page); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UserChatFilterController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserChatFilterController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UserChatFilterController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserChatFilterController.java index 268a1dea..fe82d664 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UserChatFilterController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserChatFilterController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller; +package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UserChatRecordController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserChatRecordController.java similarity index 95% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UserChatRecordController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserChatRecordController.java index 6e9a3ef3..01cdf8c7 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UserChatRecordController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserChatRecordController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller; +package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -42,7 +42,7 @@ public class UserChatRecordController extends BaseController { @SaCheckPermission("cai:userChatRecord:list") @GetMapping("/list") public TableDataInfo list(UserChatRecord bo, PageQuery pageQuery) { - Page page = userChatRecordService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + Page page = userChatRecordService.page(pageQuery.build(), Wrappers.lambdaQuery(bo).orderByDesc(UserChatRecord::getCreateTime)); return TableDataInfo.build(page); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserRiskLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserRiskLogController.java index 4564a902..b2e2c768 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserRiskLogController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserRiskLogController.java @@ -42,7 +42,7 @@ public class UserRiskLogController extends BaseController { @SaCheckPermission("cai:userRiskLog:list") @GetMapping("/list") public TableDataInfo list(UserRiskLog bo, PageQuery pageQuery) { - Page page = userRiskLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + Page page = userRiskLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo).orderByDesc(UserRiskLog::getCreateTime)); return TableDataInfo.build(page); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserVisitorController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserVisitorController.java index 18c1f3e2..cae45c94 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserVisitorController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserVisitorController.java @@ -42,7 +42,7 @@ public class UserVisitorController extends BaseController { @SaCheckPermission("cai:userVisitor:list") @GetMapping("/list") public TableDataInfo list(UserVisitor bo, PageQuery pageQuery) { - Page page = userVisitorService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + Page page = userVisitorService.page(pageQuery.build(), Wrappers.lambdaQuery(bo).orderByDesc(UserVisitor::getCreateTime)); return TableDataInfo.build(page); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GuardLog.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GuardLog.java index 4a5c8b80..0173d39b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GuardLog.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GuardLog.java @@ -13,6 +13,7 @@ import java.time.LocalDateTime; * * @author 77 * @date 2023-12-30 + * @see UserGift */ @Data @TableName("cai_guard_log") diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserChatRecord.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserChatRecord.java index f5688ea9..026370d5 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserChatRecord.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserChatRecord.java @@ -29,10 +29,13 @@ public class UserChatRecord implements Serializable { * */ private Long fromUid; + + private String fromUsercode; /** * */ private Long toUid; + private String toUsercode; /** * */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/dto/ImMessageDTO.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/dto/ImMessageDTO.java index ae3a8a15..93bcc659 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/dto/ImMessageDTO.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/dto/ImMessageDTO.java @@ -17,6 +17,6 @@ public class ImMessageDTO { @Schema(description = "消息内容") @NotNull(message = "消息内容不能为空") - private String message; + private String content; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/ImResp.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/ImResp.java index 3445c3f6..13b13b15 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/ImResp.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/ImResp.java @@ -11,4 +11,10 @@ public class ImResp { private Long cutCoin = 0L; @Schema(description = "当前余额") private Long coin = 0L; + @Schema(description = "是否过滤 1-过滤 0-未过滤") + private Integer filter = 0; + @Schema(description = "过滤后的消息内容") + private String content; + @Schema(description = "聊天记录ID") + private Long recordId; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ImService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ImService.java index 9b72b60c..5e412249 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ImService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ImService.java @@ -10,10 +10,8 @@ import com.ruoyi.cai.enums.GenderEnum; import com.ruoyi.cai.enums.ImTypeEnum; import com.ruoyi.cai.enums.SystemConfigEnum; import com.ruoyi.cai.enums.UserMemberTypeEnum; -import com.ruoyi.cai.mapper.AccountMapper; import com.ruoyi.cai.service.*; import com.ruoyi.common.exception.ServiceException; -import org.apache.xmlbeans.impl.xb.xsdschema.UnionDocument; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -61,6 +59,7 @@ public class ImService { Account account = accountService.getByUserId(fromUserId); ImResp resp = new ImResp(); resp.setCoin(account.getCoin()+ account.getIncomeCoin()); + resp.setContent(message.getContent()); return resp; } Set systemCustomerService = systemConfigManager.getSystemConfigOfLongSet(SystemConfigEnum.SYSTEM_CUSTOMER_SERVICE); @@ -79,10 +78,6 @@ public class ImService { throw new ServiceException("对方关注你才能发送图片|语音|视频"); } } - } - // 正则判断违规数据替换 - if(typeEnum == ImTypeEnum.MESSAGE && !systemCustomerService.contains(fromUserId) && !systemCustomerService.contains(toUserId)){ - } if(fromUserId.equals(toUserId)){ throw new ServiceException("不能给自己发送哦!"); @@ -115,7 +110,11 @@ public class ImService { if (fromUser.getIsAnchor().equals(0) && toUser.getIsAnchor().equals(0)) { throw new ServiceException("目前只能和女神私信!"); } - if(){ + // 正则判断违规数据替换 + if(typeEnum == ImTypeEnum.MESSAGE && !systemCustomerService.contains(fromUserId) && !systemCustomerService.contains(toUserId)){ + + } + if(fromUser.getIsAnchor().equals(1)){ // 女神发消息不要钱 Account account = accountService.getByUserId(fromUserId); ImResp resp = new ImResp(); resp.setCoin(account.getCoin()+ account.getIncomeCoin()); @@ -129,8 +128,15 @@ public class ImService { traceId = accountService.imDesc(fromUser, toUser, imPrice); } // 存储聊天记录 - userChatRecordService.saveRecord(fromUser,toUser,traceId,message); - return null; + Account account = accountService.getByUserId(fromUserId); + UserChatRecord record = userChatRecordService.saveRecord(fromUser, toUser, traceId, message); + ImResp resp = new ImResp(); + resp.setCut(imPrice > 0); + resp.setCutCoin(imPrice); + resp.setCoin(account.getCoin()+ account.getIncomeCoin()); + resp.setRecordId(record.getId()); + resp.setContent(message.getContent()); + return resp; } @Autowired diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserChatRecordService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserChatRecordService.java index b13a2099..5cd429d1 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserChatRecordService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserChatRecordService.java @@ -13,5 +13,5 @@ import com.ruoyi.cai.dto.app.dto.ImMessageDTO; */ public interface UserChatRecordService extends IService { - void saveRecord(User fromUser, User toUser,Long traceId, ImMessageDTO message); + UserChatRecord saveRecord(User fromUser, User toUser,Long traceId, ImMessageDTO message); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserChatRecordServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserChatRecordServiceImpl.java index 88043b49..38284289 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserChatRecordServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserChatRecordServiceImpl.java @@ -22,14 +22,17 @@ import java.time.LocalDateTime; public class UserChatRecordServiceImpl extends ServiceImpl implements UserChatRecordService { @Override - public void saveRecord(User fromUser, User toUser,Long traceId, ImMessageDTO message) { + public UserChatRecord saveRecord(User fromUser, User toUser,Long traceId, ImMessageDTO message) { UserChatRecord userChatRecord = new UserChatRecord(); userChatRecord.setFromUid(fromUser.getId()); + userChatRecord.setFromUsercode(fromUser.getUsercode()); userChatRecord.setToUid(toUser.getId()); - userChatRecord.setContent(message.getMessage()); + userChatRecord.setToUsercode(toUser.getUsercode()); + userChatRecord.setContent(message.getContent()); userChatRecord.setType(message.getType()); userChatRecord.setCreateTime(LocalDateTime.now()); userChatRecord.setTraceId(traceId); this.save(userChatRecord); + return userChatRecord; } } diff --git a/ruoyi-cai/src/main/resources/mapper/cai/AccountMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/AccountMapper.xml index cc5a1b15..cbfd73f5 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/AccountMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/AccountMapper.xml @@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and t2.usercode = #{bo.usercode} - order by t2.create_time desc + order by t1.create_time desc diff --git a/ruoyi-cai/src/main/resources/mapper/cai/AnchorApplyMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/AnchorApplyMapper.xml index c9a8fd08..45d476c2 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/AnchorApplyMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/AnchorApplyMapper.xml @@ -4,15 +4,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - diff --git a/ruoyi-cai/src/main/resources/mapper/cai/UserInviteMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserInviteMapper.xml index 61018c39..bcc69990 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/UserInviteMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/UserInviteMapper.xml @@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and t3.usercode = #{bo.inviteUsercode} + order by t1.create_time desc