From c1e48a47b39dbd6919bfd9cf2e7023e9f3d6fee8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 05 十一月 2021 10:24:21 +0800
Subject: [PATCH] 1105测试代码修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java | 105 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 69 insertions(+), 36 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 03d4b34..571f957 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
@@ -1,11 +1,19 @@
package com.panzhihua.service_community.service.impl;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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;
@@ -15,14 +23,8 @@
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;
+import lombok.extern.slf4j.Slf4j;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -40,11 +42,11 @@
@Resource
private ComActDAO comActDAO;
-
/**
* 分页查询社区动态
*
- * @param comActDynVO 查询参数
+ * @param comActDynVO
+ * 查询参数
* @return 动态集合
*/
@Override
@@ -52,10 +54,10 @@
Page page = new Page<>();
Long pageNum = comActDynVO.getPageNum();
Long pageSize = comActDynVO.getPageSize();
- if (null==pageNum||0==pageNum) {
+ if (null == pageNum || 0 == pageNum) {
pageNum = 1l;
}
- if (null==pageSize||0==pageSize) {
+ if (null == pageSize || 0 == pageSize) {
pageSize = 10l;
}
page.setSize(pageSize);
@@ -77,7 +79,8 @@
/**
* 社区动态详情
*
- * @param id 动态id
+ * @param id
+ * 动态id
* @return 详情
*/
@Override
@@ -87,9 +90,10 @@
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);
+ 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);
@@ -98,27 +102,23 @@
/**
* 新增社区动态浏览记录
*
- * @param id 动态主键
- * @param userId 登录用户id
+ * @param id
+ * 动态主键
+ * @param userId
+ * 登录用户id
* @return 新增结果
*/
@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();
}
/**
@@ -128,8 +128,8 @@
*/
@Override
public R timedTaskDynIstopping() {
- int num=comActDynUserDAO.timedTaskDynIstopping();
- log.info("定时任务--一共维护社区动态数量【{}】",num);
+ int num = comActDynUserDAO.timedTaskDynIstopping();
+ log.info("定时任务--一共维护社区动态数量【{}】", num);
return R.ok(num);
}
@@ -140,10 +140,43 @@
*/
@Override
public R timedTaskDynStatus() {
- int num=comActDynDAO.timedTaskDynStatus();
- log.info("定时任务--一共刷新社区动态发布状态数量【{}】",num);
+ 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