Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-05 f80afdbc853857579ef24f6e679bde4be8b57e39

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

@@ -155,6 +155,8 @@
    private ComActActivityInviteService comActActivityInviteService;
    @Resource
    private RabbitTemplate rabbitTemplate;
    @Resource
    private AutomessageSysUserService automessageSysUserService;

    /**
     * 新增社区活动
@@ -805,6 +807,20 @@
    }

    /**
     * 随手拍详情-脱敏
     *
     * @param id
     *            随手拍主键
     * @param userId
     *            登录用户
     * @return 详情内容
     */
    @PostMapping("detaileasyphotodesensitize")
    public R detailEasyPhotoDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
        return comActEasyPhotoService.detailEasyPhotoDesensitize(id, userId);
    }

    /**
     * 随手拍详情
     *
     * @param id
@@ -858,6 +874,11 @@
        return comActMicroWishService.pageMicroWishApplets(comActMicroWishVO);
    }

    @PostMapping("pagemicrowish/appletsDesensitize")
    public R pageMicroWishAppletsDesensitize(@RequestBody ComActMicroWishVO comActMicroWishVO) {
        return comActMicroWishService.pageMicroWishAppletsDesensitize(comActMicroWishVO);
    }

    /**
     * 心愿详情
     *
@@ -870,6 +891,19 @@
    @PostMapping("detailmicrowish")
    public R detailMicroWish(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
        return comActMicroWishService.detailMicroWish(id, userId);
    }
    /**
     * 心愿详情 - 脱敏
     *
     * @param id
     *            查询主键
     * @param userId
     *            登录用户id
     * @return 心愿内容
     */
    @PostMapping("detailmicrowishdesensitize")
    public R detailMicroWishDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
        return comActMicroWishService.detailMicroWishDesensitize(id, userId);
    }

    /**
@@ -1687,6 +1721,19 @@
        return comActEasyPhotoService.pageEasyPhotoApplets(comActEasyPhotoVO);
    }


    /**
     * 小程序分页查询随手拍 脱敏
     *
     * @param comActEasyPhotoVO
     *            查询参数
     * @return 返回结果
     */
    @PostMapping("pageeasyphotoappletsdesensitize")
    public R pageEasyPhotoAppletsDesensitize(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        return comActEasyPhotoService.pageEasyPhotoAppletsDesensitize(comActEasyPhotoVO);
    }

    /**
     * 随手拍评论分页查询
     * 
@@ -1697,6 +1744,18 @@
    @PostMapping("pagecomacteasyphotocomment")
    public R pageComActEasyPhotoComment(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO) {
        return comActEasyPhotoService.pageComActEasyPhotoComment(pageComActEasyPhotoCommentDTO);
    }

    /**
     * 随手拍评论分页查询 - 脱敏
     *
     * @param pageComActEasyPhotoCommentDTO
     *            查询参数
     * @return 查询结果
     */
    @PostMapping("pagecomacteasyphotocommentdesensitize")
    public R pageComActEasyPhotoCommentDesensitize(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO) {
        return comActEasyPhotoService.pageComActEasyPhotoCommentDesensitize(pageComActEasyPhotoCommentDTO);
    }

    /**
@@ -2386,6 +2445,10 @@
        return comActEasyPhotoService.getUserReward(userId, communityId);
    }

    @PostMapping("easyphoto/getUserRewardsNew")
    public R getUserRewardsNew(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId) {
        return comActEasyPhotoService.getUserRewardNew(userId, communityId);
    }
    /**
     * 读取用户随手拍奖励
     * 
@@ -2686,4 +2749,67 @@
    public R activityInviteDelete(@RequestParam("id") Long id) {
        return comActActivityInviteService.activityInviteDelete(id);
    }

    /**
     * 根据id查询重复的社区id集合
     * @param id
     * @return
     */
    @GetMapping("selectCommunityIds")
    public R selectCommunityIds(@RequestParam("id") Long id){
        return comActService.selectIds(id);
    }


    /**
     * 通过id查询用户
     * @param id
     * @return
     */
    @GetMapping("selectAutomessageSysUserById")
    public R selectAutomessageSysUserById(@RequestParam("id") Long id){
        return automessageSysUserService.selectAutomessageSysUserById(id);
    }

    /**
     * 根据id查询重复的社区id集合
     * @return
     */
    @GetMapping("selectBasicData")
    public R selectBasicData(){
        return comActService.selectBasicData();
    }

    /**
     * 统计在职干部特长
     * @return
     */
    @GetMapping("statisticsPbMemberType")
    public R statisticsPbMemberType(){
        return comActService.statisticsPbMemberType();
    }

    /**
     * 统计单位
     * @return
     */
    @GetMapping("selectUnitByNatureName")
    public R selectUnitByNatureName(){
        return comActService.selectUnitByNatureName();
    }

    /**
     * 大屏-社区活动分页
     * @return
     */
    @GetMapping("pageActivityBigScreen")
    public R pageActivityBigScreen(@RequestBody CommonPage commonPage){
        return comActActivityService.pageActivityBigScreen(commonPage);
    }

    @GetMapping("easyphoto/selectStatisticsPhoto")
    public R selectStatisticsPhoto() {
        return comActEasyPhotoService.selectStatisticsPhoto();
    }

}