From a5255613206a8f9307b825f5ab32c41eb42ef169 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 10 六月 2021 13:23:30 +0800
Subject: [PATCH] 代码合并以及问题修复

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java |   92 +++++++++++++++++++++++++++++++++++++++------
 1 files changed, 79 insertions(+), 13 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 a8ddb16..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;
@@ -14,12 +15,14 @@
 import com.panzhihua.service_community.model.dos.ComActDynDO;
 import com.panzhihua.service_community.model.dos.ComActDynUserDO;
 import com.panzhihua.service_community.service.ComActDynService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -27,6 +30,7 @@
  * @author: huang.hongfa weixin hhf9596 qq 959656820
  * @create: 2020-12-07 14:29
  **/
+@Slf4j
 @Service
 public class ComActDynServiceImpl extends ServiceImpl<ComActDynDAO, ComActDynDO> implements ComActDynService {
     @Resource
@@ -57,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);
     }
 
@@ -90,20 +104,72 @@
      */
     @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{
+        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();
     }
+
+    /**
+     * 定时任务刷新社区动态置顶状态
+     *
+     * @return 刷新结果
+     */
+    @Override
+    public R timedTaskDynIstopping() {
+        int num=comActDynUserDAO.timedTaskDynIstopping();
+        log.info("定时任务--一共维护社区动态数量【{}】",num);
+        return R.ok(num);
+    }
+
+    /**
+     * 定时任务刷新社区动态发布状态
+     *
+     * @return 刷新结果
+     */
+    @Override
+    public R timedTaskDynStatus() {
+        int num=comActDynDAO.timedTaskDynStatus();
+        log.info("定时任务--一共刷新社区动态发布状态数量【{}】",num);
+        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