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

123333

Browse Source
This commit is contained in:
张良(004796)
2024-02-19 17:43:49 +08:00
parent 1a7c01e5cc
commit d0532bb736
5 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/UserChatFilterController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserChatFilterController.java
View File

@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.cai.admin.back;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -6,13 +6,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.UserChatFilter;
import com.ruoyi.cai.service.UserChatFilterService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -42,7 +39,8 @@ public class UserChatFilterController extends BaseController {
@SaCheckPermission("cai:userChatFilter:list")
@GetMapping("/list")
public TableDataInfo<UserChatFilter> list(UserChatFilter bo, PageQuery pageQuery) {
Page<UserChatFilter> page = userChatFilterService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<UserChatFilter> page = userChatFilterService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)
.orderByDesc(UserChatFilter::getCreateTime));
return TableDataInfo.build(page);
}
@@ -58,27 +56,6 @@ public class UserChatFilterController extends BaseController {
return R.ok(userChatFilterService.getById(id));
}
/**
* 新增聊天过滤
*/
@SaCheckPermission("cai:userChatFilter:add")
@Log(title = "聊天过滤", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody UserChatFilter bo) {
return toAjax(userChatFilterService.save(bo));
}
/**
* 修改聊天过滤
*/
@SaCheckPermission("cai:userChatFilter:edit")
@Log(title = "聊天过滤", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserChatFilter bo) {
return toAjax(userChatFilterService.updateById(bo));
}
/**
* 删除聊天过滤

4
ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserChatFilter.java
View File

@@ -29,15 +29,19 @@ public class UserChatFilter implements Serializable {
*
*/
private Long fromUid;
private String fromUsercode;
/**
*
*/
private Long toUid;
private String toUsercode;
/**
*
*/
private String content;
private String filterContent;
private LocalDateTime createTime;
}

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

@@ -162,7 +162,7 @@ public class ImService {
Account account = accountService.getByUserId(fromUserId);
UserChatRecord record = userChatRecordService.saveRecord(fromUser, toUser, traceId, message);
if(filter == 1){
userChatFilterService.saveFilter(fromUser, toUser, content);
userChatFilterService.saveFilter(fromUser, toUser, message.getContent(),content);
}
ImResp resp = new ImResp();
resp.setCut(imPrice > 0);

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

@@ -12,5 +12,5 @@ import com.ruoyi.cai.domain.UserChatFilter;
*/
public interface UserChatFilterService extends IService<UserChatFilter> {
void saveFilter(User fromUser, User toUser, String content);
void saveFilter(User fromUser, User toUser,String sourceContent, String filterContent);
}

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

@@ -16,11 +16,14 @@ import org.springframework.stereotype.Service;
@Service
public class UserChatFilterServiceImpl extends ServiceImpl<UserChatFilterMapper,UserChatFilter> implements UserChatFilterService {
@Override
public void saveFilter(User fromUser, User toUser, String content) {
public void saveFilter(User fromUser, User toUser, String sourceContent, String filterContent) {
UserChatFilter chatFilter = new UserChatFilter();
chatFilter.setFromUid(fromUser.getId());
chatFilter.setFromUsercode(fromUser.getUsercode());
chatFilter.setToUid(toUser.getId());
chatFilter.setContent(content);
chatFilter.setToUsercode(toUser.getUsercode());
chatFilter.setContent(sourceContent);
chatFilter.setFilterContent(filterContent);
this.save(chatFilter);
}
}