From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送

---
 src/main/java/org/springblade/modules/circle/service/impl/CircleServiceImpl.java |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 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 4885d4f..6777d80 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
@@ -19,7 +19,10 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xxl.job.core.biz.impl.ExecutorBizImpl;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springblade.common.param.CommonParamSet;
 import org.springblade.common.utils.SpringUtils;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -48,6 +51,7 @@
 @Service
 public class CircleServiceImpl extends ServiceImpl<CircleMapper, CircleEntity> implements ICircleService {
 
+	private static Logger logger = LoggerFactory.getLogger(ExecutorBizImpl.class);
 	@Autowired
 	private ICircleLikeService iCircleLikeService;
 
@@ -59,7 +63,7 @@
 
 	@Override
 	public IPage<CircleVO> selectCirclePage(IPage<CircleVO> page, CircleVO circle) {
-//		CommonParamSet commonParamSet = new CommonParamSet().invoke(CircleVO.class, circle);
+		CommonParamSet commonParamSet = new CommonParamSet().invoke(CircleVO.class, circle);
 		List<CircleVO> circleVOS = baseMapper.selectCirclePage(page, circle);
 		for (CircleVO circleVO : circleVOS) {
 			// 获取circleVO中circleId的点赞数
@@ -106,22 +110,25 @@
 			circle.setCommunityCode(communityCode);
 		}
 		// 校验事件是否分享过
-		if (circle.getCircleType() != null && circle.getEventId() != null) {
-			long count = count(Wrappers.<CircleEntity>lambdaQuery().
-				eq(CircleEntity::getCircleType, circle.getCircleType()).
-				eq(CircleEntity::getEventId, circle.getEventId()));
-			if (count > 0) {
-				return "当前发布的内容已经分享过,请勿重复发布!";
-			}
-		}
-		boolean flag = false;
+//		if (circle.getCircleType() != null && circle.getEventId() != null) {
+//			long count = count(Wrappers.<CircleEntity>lambdaQuery().
+//				eq(CircleEntity::getCircleType, circle.getCircleType()).
+//				eq(CircleEntity::getEventId, circle.getEventId()));
+//			if (count > 0) {
+//				return "当前发布的内容已经分享过,请勿重复发布!";
+//			}
+//		}
+		String iswords = "false";
+//		if (circle.getCircleType() == null && circle.getEventId() == null) {
 		// 先进行敏感词过滤
 		Map<String, Object> map = worksService.interceptWords(circle.getCircleText());
 		// 获取敏感词校验结果
-		String iswords = map.get("iswords").toString();
+		iswords = map.get("iswords").toString();
+//		}
 		if (iswords.equals("false")) {
 			// 审核通过
-			flag = save(circle);
+			boolean flag = save(circle);
+			logger.info("保存圈子表成功");
 			// 返回
 			return "操作成功";
 		} else {

--
Gitblit v1.9.3