From 1a6eb2ac656de3b35c64db8b9006db2ed9248872 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 04 十一月 2022 17:43:13 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
index 571f957..0609753 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
@@ -26,6 +26,8 @@
import lombok.extern.slf4j.Slf4j;
+import static java.util.Objects.nonNull;
+
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
* @description: 社区动态
@@ -66,10 +68,14 @@
List<ComActDynVO> records = iPage.getRecords();
if (!ObjectUtils.isEmpty(records)) {
records.forEach(comActDynVO1 -> {
- String content = comActDynVO1.getContent();
- if (!ObjectUtils.isEmpty(content)) {
- String text = RichTextUtil.getText(content);
- comActDynVO1.setContentText(text);
+ if(comActDynVO1.getCategory()!=null&&comActDynVO1.getCategory()==4){
+ comActDynVO1.setContent(null);
+ }else {
+ String content = comActDynVO1.getContent();
+ if (!ObjectUtils.isEmpty(content)) {
+ String text = RichTextUtil.getText(content);
+ comActDynVO1.setContentText(text);
+ }
}
});
}
@@ -89,14 +95,28 @@
if (ObjectUtils.isEmpty(comActDynDO)) {
return R.fail("社区动态不存在");
}
- ComActDO comActDO = comActDAO.selectById(comActDynDO.getCommunityId());
+ Integer category = comActDynDO.getCategory();
Integer count = comActDynUserDAO
.selectCount(new QueryWrapper<ComActDynUserDO>().lambda().eq(ComActDynUserDO::getDynId, id));
ComActDynVO comActDynVO = new ComActDynVO();
BeanUtils.copyProperties(comActDynDO, comActDynVO);
comActDynVO.setReadNum(count);
- comActDynVO.setCommunityName(comActDO.getName());
- return R.ok(comActDynVO);
+ if (nonNull(category) && !category.equals(3)) {
+ ComActDO comActDO = comActDAO.selectById(comActDynDO.getCommunityId());
+ if(comActDO!=null){
+ comActDynVO.setCommunityName(comActDO.getName());
+ }
+ }
+ if(comActDynDO.getCategory()==4){
+ if(comActDynDO.getReadNum()!=null){
+ comActDynDO.setReadNum(comActDynDO.getReadNum()+1);
+ }
+ else {
+ comActDynDO.setReadNum(1);
+ }
+ comActDynDAO.updateById(comActDynDO);
+ }
+ return R.ok();
}
/**
--
Gitblit v1.7.1