From d07b02f12c47f0e513d98a49d1106d22416868c0 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 11 六月 2021 13:37:29 +0800
Subject: [PATCH] bugfixed
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java | 66 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 14 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 0436238..1689e37 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
@@ -7,6 +7,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActDynVO;
+import com.panzhihua.common.utlis.RichTextUtil;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComActDynDAO;
import com.panzhihua.service_community.dao.ComActDynUserDAO;
@@ -21,6 +22,7 @@
import javax.annotation.Resource;
import java.util.Date;
+import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -59,6 +61,16 @@
page.setSize(pageSize);
page.setCurrent(pageNum);
IPage<ComActDynVO> iPage = comActDynDAO.pageDynamic(page, comActDynVO);
+ 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);
+ }
+ });
+ }
return R.ok(iPage);
}
@@ -92,21 +104,15 @@
*/
@Override
public R addDynamicUser(Long id, Long userId) {
- ComActDynUserDO comActDynUserDO = comActDynUserDAO.selectOne(new QueryWrapper<ComActDynUserDO>().lambda().eq(ComActDynUserDO::getDynId, id).eq(ComActDynUserDO::getUserId, userId));
- if (ObjectUtils.isEmpty(comActDynUserDO)) {
- comActDynUserDO=new ComActDynUserDO();
- comActDynUserDO.setCreateAt(new Date());
- comActDynUserDO.setDynId(id);
- comActDynUserDO.setUserId(userId);
- int insert = comActDynUserDAO.insert(comActDynUserDO);
- if (insert>0) {
- return R.ok();
- }
- return R.fail();
- }else{
- return R.fail();
+ ComActDynUserDO comActDynUserDO = new ComActDynUserDO();
+ comActDynUserDO.setCreateAt(new Date());
+ comActDynUserDO.setDynId(id);
+ comActDynUserDO.setUserId(userId);
+ int insert = comActDynUserDAO.insert(comActDynUserDO);
+ if (insert>0) {
+ return R.ok();
}
-
+ return R.fail();
}
/**
@@ -133,5 +139,37 @@
return R.ok(num);
}
+ /**
+ * 管理后台分页查询社区动态
+ * @param comActDynVO 查询参数
+ * @return 动态集合
+ */
+ @Override
+ public R pageDynamicByAdmin(ComActDynVO comActDynVO) {
+ Page page = new Page<>();
+ Long pageNum = comActDynVO.getPageNum();
+ Long pageSize = comActDynVO.getPageSize();
+ if (null==pageNum||0==pageNum) {
+ pageNum = 1l;
+ }
+ if (null==pageSize||0==pageSize) {
+ pageSize = 10l;
+ }
+ page.setSize(pageSize);
+ page.setCurrent(pageNum);
+ IPage<ComActDynVO> iPage = comActDynDAO.pageDynamicByAdmin(page, comActDynVO);
+ 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);
+ }
+ });
+ }
+ return R.ok(iPage);
+ }
+
}
--
Gitblit v1.7.1