shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
dute7liang
2024-01-09 23:42:24 +08:00
parent 4d24793cdb
commit d37ba23775
24 changed files with 60 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountBankcardController.java
View File

@@ -42,7 +42,7 @@ public class AccountBankcardController extends BaseController {
@SaCheckPermission("cai:accountBankcard:list")
@GetMapping("/list")
public TableDataInfo<AccountBankcard> list(AccountBankcard bo, PageQuery pageQuery) {
Page<AccountBankcard> page = accountBankcardService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<AccountBankcard> page = accountBankcardService.page(pageQuery.build());
return TableDataInfo.build(page);
}

3
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountChangeLogController.java
View File

@@ -58,7 +58,8 @@ public class AccountChangeLogController extends BaseController {
@SaCheckPermission("cai:accountChangeLog:list")
@GetMapping("/list")
public TableDataInfo<AccountChangeLog> list(AccountChangeLog bo, PageQuery pageQuery) {
Page<AccountChangeLog> page = accountChangeLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<AccountChangeLog> page = accountChangeLogService.page(pageQuery.build(),
Wrappers.lambdaQuery(bo).orderByDesc(AccountChangeLog::getCreateTime));
return TableDataInfo.build(page);
}

3
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountDetailController.java
View File

@@ -42,7 +42,8 @@ public class AccountDetailController extends BaseController {
@SaCheckPermission("cai:accountDetail:list")
@GetMapping("/list")
public TableDataInfo<AccountDetail> list(AccountDetail bo, PageQuery pageQuery) {
Page<AccountDetail> page = caiAccountDetailService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<AccountDetail> page = caiAccountDetailService.page(pageQuery.build(),
Wrappers.lambdaQuery(bo).orderByDesc(AccountDetail::getCreateTime));
return TableDataInfo.build(page);
}

3
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountRechargeController.java
View File

@@ -42,7 +42,8 @@ public class AccountRechargeController extends BaseController {
@SaCheckPermission("cai:accountRecharge:list")
@GetMapping("/list")
public TableDataInfo<AccountRecharge> list(AccountRecharge bo, PageQuery pageQuery) {
Page<AccountRecharge> page = accountRechargeService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<AccountRecharge> page = accountRechargeService.page(pageQuery.build(),
Wrappers.lambdaQuery(bo).orderByDesc(AccountRecharge::getCreateTime));
return TableDataInfo.build(page);
}

3
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/BannerController.java
View File

@@ -42,7 +42,8 @@ public class BannerController extends BaseController {
@SaCheckPermission("cai:banner:list")
@GetMapping("/list")
public TableDataInfo<Banner> list(Banner bo, PageQuery pageQuery) {
Page<Banner> page = bannerService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<Banner> page = bannerService.page(pageQuery.build(),
Wrappers.lambdaQuery(bo).orderByDesc(Banner::getCreateTime));
return TableDataInfo.build(page);
}

3
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ConsumeLogController.java
View File

@@ -43,7 +43,8 @@ public class ConsumeLogController extends BaseController {
@SaCheckPermission("cai:consumeLog:list")
@GetMapping("/list")
public TableDataInfo<ConsumeLog> list(ConsumeLog bo, PageQuery pageQuery) {
Page<ConsumeLog> page = consumeLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<ConsumeLog> page = consumeLogService.page(pageQuery.build(),
Wrappers.lambdaQuery(bo).orderByDesc(ConsumeLog::getCreateTime));
return TableDataInfo.build(page);
}

3
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiftController.java
View File

@@ -42,7 +42,8 @@ public class GiftController extends BaseController {
@SaCheckPermission("cai:gift:list")
@GetMapping("/list")
public TableDataInfo<Gift> list(Gift bo, PageQuery pageQuery) {
Page<Gift> page = giftService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<Gift> page = giftService.page(pageQuery.build(),
Wrappers.lambdaQuery(bo).orderByAsc(Gift::getPrice));
return TableDataInfo.build(page);
}

3
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiveLogController.java
View File

@@ -42,7 +42,8 @@ public class GiveLogController extends BaseController {
@SaCheckPermission("cai:giveLog:list")
@GetMapping("/list")
public TableDataInfo<GiveLog> list(GiveLog bo, PageQuery pageQuery) {
Page<GiveLog> page = giveLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<GiveLog> page = giveLogService.page(pageQuery.build(),
Wrappers.lambdaQuery(bo).orderByDesc(GiveLog::getCreateTime));
return TableDataInfo.build(page);
}

4
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardLogController.java
View File

@@ -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<GuardLog> list(GuardLog bo, PageQuery pageQuery) {
Page<GuardLog> page = guardLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<GuardLog> page = guardLogService.page(pageQuery.build(),
Wrappers.lambdaQuery(bo).orderByDesc(GuardLog::getCreateTime));
return TableDataInfo.build(page);
}

3
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardTotalController.java
View File

@@ -42,7 +42,8 @@ public class GuardTotalController extends BaseController {
@SaCheckPermission("cai:guardTotal:list")
@GetMapping("/list")
public TableDataInfo<GuardTotal> list(GuardTotal bo, PageQuery pageQuery) {
Page<GuardTotal> page = guardTotalService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<GuardTotal> page = guardTotalService.page(pageQuery.build(),
Wrappers.lambdaQuery(bo).orderByDesc(GuardTotal::getCreateTime));
return TableDataInfo.build(page);
}

2
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UserChatFilterController.java → ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserChatFilterController.java
View File

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

4
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UserChatRecordController.java → ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserChatRecordController.java
View File

@@ -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<UserChatRecord> list(UserChatRecord bo, PageQuery pageQuery) {
Page<UserChatRecord> page = userChatRecordService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<UserChatRecord> page = userChatRecordService.page(pageQuery.build(), Wrappers.lambdaQuery(bo).orderByDesc(UserChatRecord::getCreateTime));
return TableDataInfo.build(page);
}

2
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserRiskLogController.java
View File

@@ -42,7 +42,7 @@ public class UserRiskLogController extends BaseController {
@SaCheckPermission("cai:userRiskLog:list")
@GetMapping("/list")
public TableDataInfo<UserRiskLog> list(UserRiskLog bo, PageQuery pageQuery) {
Page<UserRiskLog> page = userRiskLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<UserRiskLog> page = userRiskLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo).orderByDesc(UserRiskLog::getCreateTime));
return TableDataInfo.build(page);
}

2
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserVisitorController.java
View File

@@ -42,7 +42,7 @@ public class UserVisitorController extends BaseController {
@SaCheckPermission("cai:userVisitor:list")
@GetMapping("/list")
public TableDataInfo<UserVisitor> list(UserVisitor bo, PageQuery pageQuery) {
Page<UserVisitor> page = userVisitorService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<UserVisitor> page = userVisitorService.page(pageQuery.build(), Wrappers.lambdaQuery(bo).orderByDesc(UserVisitor::getCreateTime));
return TableDataInfo.build(page);
}

1
ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GuardLog.java
View File

@@ -13,6 +13,7 @@ import java.time.LocalDateTime;
*
* @author 77
* @date 2023-12-30
* @see UserGift
*/
@Data
@TableName("cai_guard_log")

3
ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserChatRecord.java
View File

@@ -29,10 +29,13 @@ public class UserChatRecord implements Serializable {
*
*/
private Long fromUid;
private String fromUsercode;
/**
*
*/
private Long toUid;
private String toUsercode;
/**
*
*/

2
ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/dto/ImMessageDTO.java
View File

@@ -17,6 +17,6 @@ public class ImMessageDTO {
@Schema(description = "消息内容")
@NotNull(message = "消息内容不能为空")
private String message;
private String content;
}

6
ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/ImResp.java
View File

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

24
ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ImService.java
View File

@@ -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<Long> 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

2
ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserChatRecordService.java
View File

@@ -13,5 +13,5 @@ import com.ruoyi.cai.dto.app.dto.ImMessageDTO;
*/
public interface UserChatRecordService extends IService<UserChatRecord> {
void saveRecord(User fromUser, User toUser,Long traceId, ImMessageDTO message);
UserChatRecord saveRecord(User fromUser, User toUser,Long traceId, ImMessageDTO message);
}

7
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserChatRecordServiceImpl.java
View File

@@ -22,14 +22,17 @@ import java.time.LocalDateTime;
public class UserChatRecordServiceImpl extends ServiceImpl<UserChatRecordMapper,UserChatRecord> 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;
}
}

2
ruoyi-cai/src/main/resources/mapper/cai/AccountMapper.xml
View File

@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and t2.usercode = #{bo.usercode}
</if>
</where>
order by t2.create_time desc
order by t1.create_time desc
</select>

11
ruoyi-cai/src/main/resources/mapper/cai/AnchorApplyMapper.xml
View File

@@ -4,15 +4,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.cai.mapper.AnchorApplyMapper">
<resultMap type="com.ruoyi.cai.domain.AnchorApply" id="CaiAnchorApplyResult">
<result property="id" column="id"/>
<result property="userId" column="user_id"/>
<result property="createTime" column="create_time"/>
<result property="status" column="status"/>
<result property="auditCount" column="audit_count"/>
<result property="auditTime" column="audit_time"/>
<result property="auditRemark" column="audit_remark"/>
</resultMap>
<select id="pageAdmin" resultType="com.ruoyi.cai.dto.admin.vo.AnchorApplyAdminVo">
select t1.*,t2.age,t2.avatar,t2.usercode,t2.nickname,t2.mobile,t2.gender
from cai_anchor_apply t1
@@ -28,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and t1.audit_status = #{bo.auditStatus}
</if>
</where>
order by t2.create_time desc
order by t1.create_time desc
</select>

1
ruoyi-cai/src/main/resources/mapper/cai/UserInviteMapper.xml
View File

@@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and t3.usercode = #{bo.inviteUsercode}
</if>
</where>
order by t1.create_time desc
</select>