From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期一, 09 六月 2025 11:54:00 +0800 Subject: [PATCH] 6.9新增登录失败冻结逻辑 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 42 insertions(+), 9 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 4918406..bff7700 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 @@ -5,6 +5,9 @@ import javax.annotation.Resource; +import com.panzhihua.common.model.vos.community.DataCount; +import com.panzhihua.service_community.dao.ComActDynTypeMapper; +import com.panzhihua.service_community.model.dos.ComActDynTypeDO; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -25,6 +28,7 @@ import com.panzhihua.service_community.service.ComActDynService; import lombok.extern.slf4j.Slf4j; +import org.springframework.util.StringUtils; import static java.util.Objects.nonNull; @@ -43,6 +47,9 @@ private ComActDynUserDAO comActDynUserDAO; @Resource private ComActDAO comActDAO; + + @Resource + private ComActDynTypeMapper comActDynTypeMapper; /** * 分页查询社区动态 @@ -64,6 +71,7 @@ } page.setSize(pageSize); page.setCurrent(pageNum); + IPage<ComActDynVO> iPage = comActDynDAO.pageDynamic(page, comActDynVO); List<ComActDynVO> records = iPage.getRecords(); if (!ObjectUtils.isEmpty(records)) { @@ -92,6 +100,9 @@ @Override public R detailDynamic(Long id) { ComActDynDO comActDynDO = this.getById(id); + + ComActDynTypeDO comActDynTypeDO=comActDynTypeMapper.selectById(comActDynDO.getType()); + if (ObjectUtils.isEmpty(comActDynDO)) { return R.fail("社区动态不存在"); } @@ -115,6 +126,11 @@ comActDynDO.setReadNum(1); } comActDynDAO.updateById(comActDynDO); + } + + if(comActDynTypeDO!=null && !StringUtils.isEmpty(comActDynTypeDO.getName())) + { + comActDynVO.setTypeName(comActDynTypeDO.getName()); } return R.ok(comActDynVO); } @@ -174,7 +190,7 @@ */ @Override public R pageDynamicByAdmin(ComActDynVO comActDynVO) { - Page page = new Page<>(); + Long pageNum = comActDynVO.getPageNum(); Long pageSize = comActDynVO.getPageSize(); if (null == pageNum || 0 == pageNum) { @@ -183,20 +199,37 @@ if (null == pageSize || 0 == pageSize) { pageSize = 10l; } - page.setSize(pageSize); - page.setCurrent(pageNum); + Page page = new Page<ComActDynVO>(pageNum,pageSize); 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); - } + records.forEach(comActDynVO1 -> + { +// String content = comActDynVO1.getContent(); +// if (!ObjectUtils.isEmpty(content)) { +// String text = RichTextUtil.getText(content); +// comActDynVO1.setContentText(text); +// } + +// String content = comActDynDAO.getContent(comActDynVO1.getId()+""); + int num=comActDynDAO.getReadNum(comActDynVO1.getId()+""); + comActDynVO1.setReadNum(num); +// comActDynVO1.setContent(content); + +// if (!ObjectUtils.isEmpty(content)) { +// String text = RichTextUtil.getText(content); +// comActDynVO1.setContentText(text); +// } + }); } return R.ok(iPage); } + @Override + public String getTypeId(String communityId, String name) { + return comActDynDAO.getTypeId(communityId,name); + } + + } -- Gitblit v1.7.1