管理后台社区动态bug修复

huanghongfa

2021-04-13 495169f34a4592bd6b1c89d6daaf3424f1906726

管理后台社区动态bug修复

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -133,6 +133,15 @@
    R pageDynamic(@RequestBody ComActDynVO comActDynVO);

    /**
     * 管理后台分页查询社区动态
     *
     * @param comActDynVO 查询参数
     * @return 动态集合
     */
    @PostMapping("pagedynamicByAdmin")
    R pageDynamicByAdmin(@RequestBody ComActDynVO comActDynVO);

    /**
     * 社区动态详情
     *
     * @param id 动态id

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java

@@ -217,7 +217,7 @@
    public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
        Long communityId = this.getCommunityId();
        comActDynVO.setCommunityId(communityId);
        return communityService.pageDynamic(comActDynVO);
        return communityService.pageDynamicByAdmin(comActDynVO);
    }

    @ApiOperation(value = "社区动态详情")

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -397,6 +397,17 @@
    }

    /**
     * 管理后台分页查询社区动态
     *
     * @param comActDynVO 查询参数
     * @return 动态集合
     */
    @PostMapping("pagedynamicByAdmin")
    public R pagedynamicByAdmin(@RequestBody ComActDynVO comActDynVO) {
        return comActDynService.pageDynamicByAdmin(comActDynVO);
    }

    /**
     * 社区动态详情
     *
     * @param id 动态id

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java

@@ -60,4 +60,42 @@
    IPage<ComActDynVO> pageDynamic(Page page, @Param("comActDynVO") ComActDynVO comActDynVO);
    @Update("update com_act_dyn set `status`=1 WHERE `status`=0 and TIMESTAMPDIFF(MINUTE, SYSDATE(), publish_at)<=0 ")
    int timedTaskDynStatus();

    @Select("<script> " +
            "SELECT \n" +
            "d.id,\n" +
            "d.title,\n" +
            "COUNT(u.id)readNum,\n" +
            "d.`status`,\n" +
            "d.`content`,\n" +
            "d.`cover`,\n" +
            "d.`type`,\n" +
            "d.`cover_mode`,\n" +
            "d.is_topping,\n" +
            "d.publish_at,\n" +
            "d.create_at,\n" +
            "ca.name as communityName \n" +
            "FROM\n" +
            "com_act_dyn d\n" +
            "LEFT JOIN com_act_dyn_user u ON d.id = u.dyn_id \n" +
            "LEFT JOIN com_act ca ON d.community_id = ca.community_id \n" +
            "WHERE \n" +
            "d.community_id=#{comActDynVO.communityId}\n" +
            "<if test='comActDynVO.title != null and comActDynVO.title.trim() != &quot;&quot;'>" +
            "AND d.title like concat(#{comActDynVO.title},'%')  \n" +
            " </if> " +
            "<if test='comActDynVO.isTopping != null '>" +
            "AND d.is_topping = #{comActDynVO.isTopping} \n" +
            " </if> " +
            "<if test='comActDynVO.status != null '>" +
            "AND d.`status` = #{comActDynVO.status} \n" +
            " </if> " +
            "<if test='comActDynVO.publishAtBegin != null '>" +
            "AND d.publish_at BETWEEN #{comActDynVO.publishAtBegin} \n" +
            "AND #{comActDynVO.publishAtEnd}" +
            " </if> " +
            " group by d.id  "+
            " order by d.is_topping desc, d.create_at desc "+
            "</script>")
    IPage<ComActDynVO> pageDynamicByAdmin(Page page, @Param("comActDynVO") ComActDynVO comActDynVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDynService.java

@@ -43,4 +43,11 @@
     */
    R timedTaskDynStatus();

    /**
     * 管理后台分页查询社区动态
     * @param comActDynVO 查询参数
     * @return 动态集合
     */
    R pageDynamicByAdmin(ComActDynVO comActDynVO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java

@@ -145,5 +145,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);
    }


}