From de91c84954157bb9f8b6d938cbe0b1b51fb6e65d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 07 五月 2021 15:23:57 +0800
Subject: [PATCH] bugfixed：新增便民服务商家 报错

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java |   82 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 81 insertions(+), 1 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 c972c33..2f4ccdb 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,17 +7,22 @@
 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;
+import com.panzhihua.service_community.model.dos.ComActDO;
 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
@@ -25,12 +30,17 @@
  * @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
     private ComActDynDAO comActDynDAO;
     @Resource
     private ComActDynUserDAO comActDynUserDAO;
+    @Resource
+    private ComActDAO comActDAO;
+
+
     /**
      * 分页查询社区动态
      *
@@ -51,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);
     }
 
@@ -66,10 +86,12 @@
         if (ObjectUtils.isEmpty(comActDynDO)) {
             return R.fail("社区动态不存在");
         }
+        ComActDO comActDO = comActDAO.selectById(comActDynDO.getCommunityId());
         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);
     }
 
@@ -94,8 +116,66 @@
             }
             return R.fail();
         }else{
-            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