From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/circle/service/impl/CircleServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/circle/service/impl/CircleServiceImpl.java b/src/main/java/org/springblade/modules/circle/service/impl/CircleServiceImpl.java
index c31a086..fb4f0ac 100644
--- a/src/main/java/org/springblade/modules/circle/service/impl/CircleServiceImpl.java
+++ b/src/main/java/org/springblade/modules/circle/service/impl/CircleServiceImpl.java
@@ -18,6 +18,9 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.springblade.common.utils.SpringUtils;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.circle.dto.CircleDTO;
import org.springblade.modules.circle.entity.CircleCommentEntity;
import org.springblade.modules.circle.entity.CircleEntity;
@@ -28,11 +31,13 @@
import org.springblade.modules.circle.mapper.CircleMapper;
import org.springblade.modules.circle.service.ICircleService;
import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.words.WorksService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;
+import java.util.Map;
/**
* 圈子表 服务实现类
@@ -47,7 +52,11 @@
private ICircleLikeService iCircleLikeService;
@Autowired
+ private WorksService worksService;
+
+ @Autowired
private ICircleCommentService iCircleCommentService;
+
@Override
public IPage<CircleVO> selectCirclePage(IPage<CircleVO> page, CircleVO circle) {
List<CircleVO> circleVOS = baseMapper.selectCirclePage(page, circle);
@@ -73,8 +82,7 @@
* @return 圈子表
*/
@Override
- public CircleVO selectCircleById(Integer id)
- {
+ public CircleVO selectCircleById(Integer id) {
return this.baseMapper.selectCircleById(id);
}
@@ -85,11 +93,31 @@
* @return 圈子表集合
*/
@Override
- public List<CircleVO> selectCircleList(CircleDTO circleDTO)
- {
+ public List<CircleVO> selectCircleList(CircleDTO circleDTO) {
return this.baseMapper.selectCircleList(circleDTO);
}
-
-
+ @Override
+ public String saveCircle(CircleEntity circle) {
+ circle.setUserId(AuthUtil.getUserId());
+ String communityCode = SpringUtils.getRequestParam("communityCode");
+ if (StringUtils.isNotBlank(communityCode)) {
+ circle.setCommunityCode(communityCode);
+ }
+ boolean flag = false;
+ // 先进行敏感词过滤
+ Map<String, Object> map = worksService.interceptWords(circle.getCircleText());
+ // 获取敏感词校验结果
+ String iswords = map.get("iswords").toString();
+ if (iswords.equals("false")) {
+ // 审核通过
+ flag = save(circle);
+ // 返回
+ return "操作成功";
+ } else {
+ // 审核不通过
+ // 返回
+ return "当前发布的内容中带有敏感词信息，当前发布无法生效!";
+ }
+ }
}
--
Gitblit v1.9.3