#feat 对接接口脱敏处理

yanghui

2022-11-10 55b7917ca80eb2da24911e65ba66e64579daf1c2

#feat 对接接口脱敏处理

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java

@@ -39,6 +39,18 @@
    }

    /**
     * 分页查询所有数据
     * @return 所有数据
     */
    @ApiOperation("小程序列表接口-脱敏")
    @PostMapping("/desensitize/queryAll")
    public R selectAllDesensitize(@RequestBody CommonPage commonPage) {
        commonPage.setUserId(this.getUserId());
        return this.propertyService.comPropertyRepairSelectAllDesensitize(commonPage);
    }


    /**
     * 小程序添加报修
     * @param comPropertyRepairVO
     * @return
@@ -46,6 +58,20 @@
    @ApiOperation("小程序添加报修")
    @PostMapping
    public R insert(@RequestBody ComPropertyRepairVO comPropertyRepairVO) {
        comPropertyRepairVO.setCreateTime(DateUtil.date());
        comPropertyRepairVO.setCreateBy(this.getUserId());
        comPropertyRepairVO.setRepairStatus(ComPropertyRepairVO.status.dcl);
        return this.propertyService.comPropertyRepairInsert(comPropertyRepairVO);
    }

    /**
     * 小程序添加报修 脱敏
     * @param comPropertyRepairVO
     * @return
     */
    @ApiOperation("小程序添加报修-脱敏")
    @PostMapping("desensitizeInsert")
    public R desensitizeInsert(@RequestBody ComPropertyRepairVO comPropertyRepairVO) {
        comPropertyRepairVO.setCreateTime(DateUtil.date());
        comPropertyRepairVO.setCreateBy(this.getUserId());
        comPropertyRepairVO.setRepairStatus(ComPropertyRepairVO.status.dcl);
@@ -103,6 +129,21 @@
        return this.propertyService.comPropertyRepairSelectOne(id);
    }


    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation("详情接口")
    @GetMapping("desensitize/{id}")
    public R selectOneDesensitize(@PathVariable("id") Long id) {
        return this.propertyService.comPropertyRepairSelectOneDesensitize(id);
    }



    /**
     * 删除数据
     *

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java

@@ -118,6 +118,26 @@
        return communityService.pageDiscussApplets(pageComActDiscussDTO);
    }

    @ApiOperation(value = "一起议-分页查询-脱敏", response = ComActDiscussVO.class)
    @PostMapping("pageDiscussDesensitize")
    public R pageDiscussDesensitize(@RequestBody PageComActDiscussDTO pageComActDiscussDTO) {
        if (Objects.isNull(pageComActDiscussDTO.getType())) {
            return R.fail("查询类型不能为空");
        }
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            pageComActDiscussDTO.setCommunityId(loginUserInfo.getCommunityId());
            pageComActDiscussDTO.setLoginUserId(loginUserInfo.getUserId());

            Integer isMy = pageComActDiscussDTO.getIsMy();
            if (null != isMy && isMy.intValue() == 1) {
                pageComActDiscussDTO.setUserId(loginUserInfo.getUserId());
            }
        }
        return communityService.pageDiscussAppletsDesensitize(pageComActDiscussDTO);
    }


    @ApiOperation(value = "一起议-回复")
    @PostMapping("discusscomment")
    public R addDiscussComment(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO) {
@@ -169,6 +189,18 @@
        return communityService.detailDiscussApplets(id, userId);
    }

    @ApiOperation(value = "一起议-详情-脱敏", response = ComActDiscussVO.class)
    @GetMapping("discussDesensitize")
    @ApiImplicitParam(name = "id", value = "一起议主键", required = true)
    public R detailDiscussDesensitize(@RequestParam("id") Long id) {
        Long userId = 0L;
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            userId = loginUserInfo.getUserId();
        }
        return communityService.detailDiscussAppletsDesensitize(id, userId);
    }

    @ApiOperation(value = "一起议-评论-分页查询", response = ComActDiscussCommentVO.class)
    @PostMapping("pagediscusscomment")
    public R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO) {
@@ -185,6 +217,22 @@
        return communityService.pageDiscussCommentApplets(pageComActDiscussCommentDTO);
    }

    @ApiOperation(value = "一起议-评论-分页查询-脱敏", response = ComActDiscussCommentVO.class)
    @PostMapping("pageDiscussCommentDesensitize")
    public R pageDiscussCommentDesensitize(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO) {
        Long id = pageComActDiscussCommentDTO.getId();
        if (null == id || 0 == id) {
            return R.fail("一起议主键不能为空");
        }
        Long userId = 0L;
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            userId = loginUserInfo.getUserId();
        }
        pageComActDiscussCommentDTO.setLoginUserId(userId);
        return communityService.pageDiscussCommentAppletsDesensitize(pageComActDiscussCommentDTO);
    }

    @ApiOperation(value = "一起议-评论-回复")
    @PostMapping("discusscommentback")
    public R addDiscussCommentBack(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO) {

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java

@@ -68,6 +68,18 @@
        return communityService.pageEasyPhotoApplets(comActEasyPhotoVO);
    }

    @ApiOperation(value = "分页展示社区随手拍-脱敏", response = ComActEasyPhotoVO.class)
    @PostMapping("pageEasyPhotoDesensitize")
    public R pageEasyPhotoDesensitize(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            comActEasyPhotoVO.setCommunityId(loginUserInfo.getCommunityId());
            comActEasyPhotoVO.setLogInUserId(loginUserInfo.getUserId());
            comActEasyPhotoVO.setIsDpcMember(loginUserInfo.getIsDpcMember());
        }
        return communityService.pageEasyPhotoAppletsDesensitize(comActEasyPhotoVO);
    }

    @ApiOperation("上传随手拍")
    @PostMapping("easyphoto")
    public R addEasyPhoto(@RequestBody @Validated(AddGroup.class) ComActEasyPhotoVO comActEasyPhotoVO) {
@@ -160,6 +172,17 @@
        }
        return communityService.detailEasyPhoto(id, userId);
    }
    @ApiOperation(value = "随手拍详情-脱敏", response = ComActEasyPhotoVO.class)
    @GetMapping("detailEasyPhotoDesensitize")
    @ApiImplicitParam(name = "id", value = "随手拍主键")
    public R detailEasyPhotoDesensitize(@RequestParam("id") Long id) {
        Long userId = 0L;
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            userId = loginUserInfo.getUserId();
        }
        return communityService.detailEasyPhotoDesensitize(id, userId);
    }

    @ApiOperation(value = "随手拍--评论--分页查询", response = ComActEasyPhotoCommentVO.class)
    @PostMapping("pagecomacteasyphotocomment")
@@ -171,6 +194,18 @@
        }
        pageComActEasyPhotoCommentDTO.setUserId(userId);
        return communityService.pageComActEasyPhotoComment(pageComActEasyPhotoCommentDTO);
    }

    @ApiOperation(value = "随手拍--评论--分页查询-脱敏", response = ComActEasyPhotoCommentVO.class)
    @PostMapping("pageComActEasyPhotoCommentDesensitize")
    public R pageComActEasyPhotoCommentDesensitize(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO) {
        Long userId = 0L;
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            userId = loginUserInfo.getUserId();
        }
        pageComActEasyPhotoCommentDTO.setUserId(userId);
        return communityService.pageComActEasyPhotoCommentDesensitize(pageComActEasyPhotoCommentDTO);
    }

    @ApiOperation(value = "随手拍--评论--新增评论")
@@ -227,6 +262,19 @@
        return communityService.pageMicroWishApplets(comActMicroWishVO);
    }

    @ApiOperation(value = "分页展示社区微心愿-脱敏", response = ComActMicroWishVO.class)
    @PostMapping("pageMicroWishDesensitize")
    public R pageMicroWishDesensitize(@RequestBody ComActMicroWishVO comActMicroWishVO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            comActMicroWishVO.setCommunityId(loginUserInfo.getCommunityId());
            comActMicroWishVO.setResponsibleId(loginUserInfo.getUserId());// 责任人暂时放登录用户id
        }
        comActMicroWishVO.setIsApplets(1);
        comActMicroWishVO.setIsPageMyWish(null);
        return communityService.pageMicroWishAppletsDesensitize(comActMicroWishVO);
    }

    @ApiOperation("发布微心愿")
    @PostMapping("microwish")
    public R addMicroWish(@RequestBody @Validated(AddGroup.class) ComActMicroWishVO comActMicroWishVO) {
@@ -267,6 +315,18 @@
        return communityService.detailMicroWish(id, userId);
    }

    @ApiOperation(value = "心愿详情-脱敏", response = ComActMicroWishVO.class)
    @GetMapping("microwishDesensitize")
    @ApiImplicitParam(name = "id", value = "微心愿主键")
    public R detailMicroWishDesensitize(@RequestParam("id") Long id) {
        Long userId = 0L;
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            userId = loginUserInfo.getUserId();
        }
        return communityService.detailMicroWishDesensitize(id, userId);
    }

    @ApiOperation("点赞/取消点赞微心愿")
    @PutMapping("microwish")
    public R putMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {

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

@@ -608,6 +608,19 @@
    R detailEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId);

    /**
     * 随手拍详情
     *
     * @param id
     *            随手拍主键
     * @param userId
     *            登录用户id
     * @return 详情内容
     */
    @PostMapping("detaileasyphotodesensitize")
    R detailEasyPhotoDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId);


    /**
     * 随手拍删除
     *
     * @param id
@@ -638,6 +651,15 @@
     */
    @PostMapping("pagemicrowish/applets")
    R pageMicroWishApplets(@RequestBody ComActMicroWishVO comActMicroWishVO);
    /**
     * 小程序分页查询微心愿
     *
     * @param comActMicroWishVO
     *            查询参数
     * @return 分页集合
     */
    @PostMapping("pagemicrowish/appletsDesensitize")
    R pageMicroWishAppletsDesensitize(@RequestBody ComActMicroWishVO comActMicroWishVO);

    /**
     * 心愿详情
@@ -650,6 +672,17 @@
     */
    @PostMapping("detailmicrowish")
    R detailMicroWish(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
    /**
     * 心愿详情
     *
     * @param id
     *            查询主键
     * @param userId
     *            登录用户id
     * @return 心愿内容
     */
    @PostMapping("detailmicrowishdesensitize")
    R detailMicroWishDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId);

    /**
     * 审核、分配、反馈心愿
@@ -1332,6 +1365,17 @@
    R pageEasyPhotoApplets(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);

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


    /**
     * 随手拍评论分页查询
     *
     * @param pageComActEasyPhotoCommentDTO
@@ -1340,6 +1384,16 @@
     */
    @PostMapping("pagecomacteasyphotocomment")
    R pageComActEasyPhotoComment(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO);

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

    /**
     * 评论点赞/取消点赞
@@ -1506,6 +1560,15 @@
     */
    @PostMapping("pagediscussapplets")
    R pageDiscussApplets(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);
    /**
     * 议事投票-分页查询 小程序 -脱敏
     *
     * @param pageComActDiscussDTO
     *            查询参数
     * @return ComActDiscussVO 分页
     */
    @PostMapping("pagediscussappletsdesensitize")
    R pageDiscussAppletsDesensitize(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);

    /**
     * 议事投票-点赞、取消点赞
@@ -1528,6 +1591,16 @@
    R pageDiscussCommentApplets(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);

    /**
     * 议事投票-评论-分页查询 小程序 脱敏
     *
     * @param pageComActDiscussCommentDTO
     *            分页参数
     * @return ComActDiscussCommentVO
     */
    @PostMapping("pagediscusscommentappletsdesensitize")
    R pageDiscussCommentAppletsDesensitize(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);

    /**
     * 议事投票-详情 小程序
     *
     * @param id
@@ -1538,6 +1611,17 @@
     */
    @PostMapping("detaildiscussapplets")
    R detailDiscussApplets(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
    /**
     * 议事投票-详情 小程序
     *
     * @param id
     *            主键
     * @param userId
     *            登录用户主键
     * @return ComActDiscussVO
     */
    @PostMapping("detaildiscussappletsdesensitize")
    R detailDiscussAppletsDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId);

    /**
     * 议事投票-投票

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java

@@ -21,6 +21,13 @@
    R comPropertyRepairSelectAll(@RequestBody CommonPage commonPage);

    /**
     * 分页查询所有数据 脱敏
     * @return 所有数据
     */
    @PostMapping("/comPropertyRepair/queryAllDesensitize")
    R comPropertyRepairSelectAllDesensitize(@RequestBody CommonPage commonPage);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
@@ -30,6 +37,15 @@
    R comPropertyRepairSelectOne(@PathVariable("id") Long id);

    /**
     * 通过主键查询单条数据 脱敏
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comPropertyRepair/desensitize/{id}")
    R comPropertyRepairSelectOneDesensitize(@PathVariable("id") Long id);

    /**
     * 新增数据
     *
     * @param comPropertyRepair 实体对象

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

@@ -807,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
@@ -860,6 +874,11 @@
        return comActMicroWishService.pageMicroWishApplets(comActMicroWishVO);
    }

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

    /**
     * 心愿详情
     *
@@ -872,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);
    }

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


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

    /**
     * 随手拍评论分页查询
     * 
@@ -1702,6 +1747,18 @@
    }

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

    /**
     * 评论点赞/取消点赞
     * 
     * @param comActEasyPhotoCommentUserDTO

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

@@ -60,6 +60,18 @@
    }

    /**
     * 议事投票-详情 脱敏
     *
     * @param discussDetailDTO
     *            请求参数
     * @return ComActDiscussVO
     */
    @PostMapping("detaildiscussdesensitize")
    public R detailDiscussDesensitize(@RequestBody ComActDiscussDetailDTO discussDetailDTO) {
        return comActDiscussService.detailDiscussDesensitize(discussDetailDTO);
    }

    /**
     * 分页查询评论下回复列表
     * @param discussDetailDTO  请求参数
     * @return  回复列表
@@ -209,7 +221,7 @@

    /**
     * 议事投票-分页查询 小程序
     * 
     *
     * @param pageComActDiscussDTO
     *            查询参数
     * @return ComActDiscussVO 分页
@@ -217,6 +229,18 @@
    @PostMapping("pagediscussapplets")
    public R pageDiscussApplets(@RequestBody PageComActDiscussDTO pageComActDiscussDTO) {
        return comActDiscussService.pageDiscussApplets(pageComActDiscussDTO);
    }

    /**
     * 议事投票-分页查询 小程序 脱敏
     *
     * @param pageComActDiscussDTO
     *            查询参数
     * @return ComActDiscussVO 分页
     */
    @PostMapping("pagediscussappletsdesensitize")
    public R pageDiscussAppletsDesensitize(@RequestBody PageComActDiscussDTO pageComActDiscussDTO) {
        return comActDiscussService.pageDiscussAppletsDesensitize(pageComActDiscussDTO);
    }

    /**
@@ -242,6 +266,17 @@
    public R pageDiscussCommentApplets(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO) {
        return comActDiscussService.pageDiscussCommentApplets(pageComActDiscussCommentDTO);
    }
    /**
     * 议事投票-评论-分页查询 小程序
     *
     * @param pageComActDiscussCommentDTO
     *            分页参数
     * @return ComActDiscussCommentVO
     */
    @PostMapping("pagediscusscommentappletsdesensitize")
    public R pageDiscussCommentAppletsDesensitize(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO) {
        return comActDiscussService.pageDiscussCommentAppletsDesensitize(pageComActDiscussCommentDTO);
    }

    /**
     * 议事投票-详情 小程序
@@ -258,6 +293,20 @@
    }

    /**
     * 议事投票-详情 小程序 脱敏
     *
     * @param id
     *            主键
     * @param userId
     *            用户主键
     * @return ComActDiscussVO
     */
    @PostMapping("detaildiscussappletsdesensitize")
    public R detailDiscussAppletsDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
        return comActDiscussService.detailDiscussAppletsDesensitize(id, userId);
    }

    /**
     * 议事投票-投票
     * 
     * @param discussVoteOptionDTO

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

@@ -37,6 +37,14 @@
     * @return ComActDiscussVO
     */
    R detailDiscuss(ComActDiscussDetailDTO discussDetailDTO);
    /**
     * 议事投票-详情 脱敏
     *
     * @param discussDetailDTO
     *            请求参数
     * @return ComActDiscussVO
     */
    R detailDiscussDesensitize(ComActDiscussDetailDTO discussDetailDTO);

    /**
     * 议事投票-删除
@@ -132,6 +140,14 @@
     * @return ComActDiscussVO 分页
     */
    R pageDiscussApplets(PageComActDiscussDTO pageComActDiscussDTO);
    /**
     * 议事投票-分页查询 小程序 脱敏
     *
     * @param pageComActDiscussDTO
     *            查询参数
     * @return ComActDiscussVO 分页
     */
    R pageDiscussAppletsDesensitize(PageComActDiscussDTO pageComActDiscussDTO);

    /**
     * 议事投票-点赞、取消点赞
@@ -150,6 +166,14 @@
     * @return ComActDiscussCommentVO
     */
    R pageDiscussCommentApplets(PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
    /**
     * 议事投票-评论-分页查询 小程序 脱敏
     *
     * @param pageComActDiscussCommentDTO
     *            分页参数
     * @return ComActDiscussCommentVO
     */
    R pageDiscussCommentAppletsDesensitize(PageComActDiscussCommentDTO pageComActDiscussCommentDTO);

    /**
     * 议事投票-详情 小程序
@@ -161,6 +185,16 @@
     * @return ComActDiscussVO
     */
    R detailDiscussApplets(Long id, Long userId);
    /**
     * 议事投票-详情 小程序
     *
     * @param id
     *            主键
     * @param userId
     *            用户主键
     * @return ComActDiscussVO
     */
    R detailDiscussAppletsDesensitize(Long id, Long userId);

    /**
     * 议事投票-投票

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

@@ -39,6 +39,16 @@
     * @return 详情内容
     */
    R detailEasyPhoto(Long id, Long userId);
    /**
     * 随手拍详情 - 脱敏
     *
     * @param id
     *            随手拍主键
     * @param userId
     *            登录用户id
     * @return 详情内容
     */
    R detailEasyPhotoDesensitize(Long id, Long userId);

    /**
     * 上传随手拍
@@ -88,6 +98,15 @@
    R pageEasyPhotoApplets(ComActEasyPhotoVO comActEasyPhotoVO);

    /**
     * 小程序分页查询随手拍
     *
     * @param comActEasyPhotoVO
     *            查询参数
     * @return 返回结果
     */
    R pageEasyPhotoAppletsDesensitize(ComActEasyPhotoVO comActEasyPhotoVO);

    /**
     * 随手拍评论分页查询
     * 
     * @param pageComActEasyPhotoCommentDTO
@@ -95,6 +114,15 @@
     * @return 查询结果
     */
    R pageComActEasyPhotoComment(PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO);
    /**
     * 随手拍评论分页查询 - 脱敏
     *
     * @param pageComActEasyPhotoCommentDTO
     *            查询参数
     * @return 查询结果
     */
    R pageComActEasyPhotoCommentDesensitize(PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO);


    /**
     * 评论点赞/取消点赞

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

@@ -27,6 +27,8 @@

    R pageMicroWishApplets(ComActMicroWishVO comActMicroWishVO);

    R pageMicroWishAppletsDesensitize(ComActMicroWishVO comActMicroWishVO);

    /**
     * 心愿详情
     * 
@@ -39,6 +41,17 @@
    R detailMicroWish(Long id, Long userId);

    /**
     * 心愿详情 - 脱敏
     *
     * @param id
     *            查询主键
     * @param userId
     *            登录用户id
     * @return 心愿内容
     */
    R detailMicroWishDesensitize(Long id, Long userId);

    /**
     * 审核、分配、反馈心愿
     * 
     * @param comActMicroWishVO

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

@@ -19,6 +19,7 @@
import javax.annotation.Resource;
import javax.validation.constraints.NotEmpty;

import cn.hutool.core.util.DesensitizedUtil;
import com.panzhihua.common.model.dtos.community.ComActDiscussVoteOptionDTO;
import com.panzhihua.common.model.dtos.community.DiscussVoteOptionDTO;
import com.panzhihua.common.model.dtos.community.PageVoteSituationDTO;
@@ -309,6 +310,55 @@
        Long userId = comActDiscussDO.getUserId();
        LoginUserInfoVO loginUserInfoVO = comActDiscussDAO.selectUserByUserId(userId);
        comActDiscussVO.setUserName(loginUserInfoVO.getName());
        comActDiscussVO.setUserNickName(loginUserInfoVO.getNickName());
        comActDiscussVO.setImageUrl(loginUserInfoVO.getImageUrl());

        //分页查询评论列表
        PageComActDiscussCommentDTO pageComActDiscussCommentDTO = new PageComActDiscussCommentDTO();
        BeanUtils.copyProperties(discussDetailDTO, pageComActDiscussCommentDTO);
        IPage<ComActDiscussCommentVO> discussComments = comActDiscussDAO.pageDiscussCommentAdmin(new Page<>(pageComActDiscussCommentDTO.getPageNum(), pageComActDiscussCommentDTO.getPageSize()), pageComActDiscussCommentDTO);
        discussComments.getRecords().forEach(comment -> {
            if (comment.getReplyNum() > 0) {
                List<ComActDiscussCommentVO> childList = comActDiscussDAO.getDiscussCommentReplyList(comment.getId());
                if (!childList.isEmpty()) {
                    comment.setComActDiscussCommentVOList(childList);
                }
            }
        });
        comActDiscussVO.setDiscussCommentList(discussComments.getRecords());
        String viewNumKey = String.join("_", DISCUSS_VIEW_NUM_PREFIX, id.toString());
        if (stringRedisTemplate.hasKey(viewNumKey)) {
            ValueOperations<String, String> opsForValue = stringRedisTemplate.opsForValue();
            comActDiscussVO.setViewsNum(Integer.parseInt(opsForValue.get(viewNumKey)));
        }
        return R.ok(comActDiscussVO);
    }

    /**
     * 议事投票-详情 脱敏
     *
     * @param discussDetailDTO 请求参数
     * @return ComActDiscussVO
     */
    @Override
    public R detailDiscussDesensitize(ComActDiscussDetailDTO discussDetailDTO) {
        Long id = discussDetailDTO.getId();
        ComActDiscussDO comActDiscussDO = comActDiscussDAO.selectById(id);
        if (ObjectUtils.isEmpty(comActDiscussDO)) {
            return R.fail("议事投票不存在");
        }
        ComActDiscussVO comActDiscussVO = new ComActDiscussVO();
        BeanUtils.copyProperties(comActDiscussDO, comActDiscussVO);
        comActDiscussVO.setSignNum(comActDiscussDO.getFabulousNum());
        Integer type = comActDiscussVO.getType();
        if (type.equals(ComActDiscussVO.type.tp)) {
            //查询选项列表
            List<ComActDiscussOptionVO> comActDiscussOptionList = comActDiscussOptionDAO.getDiscussOptionList(id);
            comActDiscussVO.setComActDiscussOptionVOS(comActDiscussOptionList);
        }
        Long userId = comActDiscussDO.getUserId();
        LoginUserInfoVO loginUserInfoVO = comActDiscussDAO.selectUserByUserId(userId);
        comActDiscussVO.setUserName(DesensitizedUtil.chineseName(loginUserInfoVO.getName()));
        comActDiscussVO.setUserNickName(loginUserInfoVO.getNickName());
        comActDiscussVO.setImageUrl(loginUserInfoVO.getImageUrl());

@@ -708,6 +758,111 @@
    }

    /**
     * 议事投票-分页查询 小程序
     *
     * @param pageComActDiscussDTO 查询参数
     * @return ComActDiscussVO 分页
     */
    @Override
    public R pageDiscussAppletsDesensitize(PageComActDiscussDTO pageComActDiscussDTO) {
        Page page = new Page<>();
        Long pageNum = pageComActDiscussDTO.getPageNum();
        Long pageSize = pageComActDiscussDTO.getPageSize();
        Long loginUserId = pageComActDiscussDTO.getLoginUserId();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        pageComActDiscussDTO.setIsPbMember(0);
        pageComActDiscussDTO.setIsVolunteer(0);
        if (nonNull(loginUserId)) {
            pageComActDiscussDTO.setIsPbMember(pbMemberDAO.checkIsPbMember(loginUserId) > 0 ? 1 : 0);
            pageComActDiscussDTO.setIsVolunteer(pbMemberDAO.checkIsVolunteer(loginUserId) > 0 ? 1 : 0);
        }
        IPage<ComActDiscussVO> iPage = comActDiscussDAO.pageDiscussApplets(page, pageComActDiscussDTO);
        List<ComActDiscussVO> records = iPage.getRecords();
        if (!ObjectUtils.isEmpty(records)) {
            records.forEach(comActDiscussVO -> {
                Integer type = comActDiscussVO.getType();
                Long id = comActDiscussVO.getId();
                String viewNumKey = String.join("_", DISCUSS_VIEW_NUM_PREFIX, id.toString());
                if (stringRedisTemplate.hasKey(viewNumKey)) {
                    ValueOperations<String, String> opsForValue = stringRedisTemplate.opsForValue();
                    comActDiscussVO.setViewsNum(Integer.parseInt(opsForValue.get(viewNumKey)));
                }
                if (type.equals(2)) {
                    List<ComActDiscussOptionDO> comActDiscussOptionDOS = comActDiscussOptionDAO.selectList(
                            new QueryWrapper<ComActDiscussOptionDO>().lambda().eq(ComActDiscussOptionDO::getDiscussId, id));
                    List<ComActDiscussOptionVO> comActDiscussOptionVOS = new ArrayList<>();
                    List<Integer> votes = new ArrayList<>();
                    comActDiscussOptionDOS.forEach(comActDiscussOptionDO -> {
                        Long discussOptionDOId = comActDiscussOptionDO.getId();
                        Integer selectCount =
                                comActDiscussOptionUserDAO.selectCount(new QueryWrapper<ComActDiscussOptionUserDO>()
                                        .lambda().eq(ComActDiscussOptionUserDO::getDiscussOptionId, discussOptionDOId));
                        ComActDiscussOptionVO comActDiscussOptionVO = new ComActDiscussOptionVO();
                        BeanUtils.copyProperties(comActDiscussOptionDO, comActDiscussOptionVO);
                        comActDiscussOptionVO.setNum(selectCount);

                        if (loginUserId != null) {
                            // 判断选项是否已投票
                            int haveVote =
                                    comActDiscussOptionUserDAO.selectHaveVotes(comActDiscussOptionDO.getId(), loginUserId);
                            votes.add(haveVote);
                            comActDiscussOptionVO.setHaveVote(haveVote > 0 ? 1 : 0);
                        }
                        comActDiscussOptionVOS.add(comActDiscussOptionVO);
                    });
                    fillThePercentAndSort(comActDiscussOptionVOS);
                    checkDiscussStatusIsCorrect(comActDiscussVO);
                    comActDiscussVO.setComActDiscussOptionVOS(comActDiscussOptionVOS);
                    //填充剩余可投票数
                    if (loginUserId != null && !loginUserId.equals(0L)) {
                        if (comActDiscussVO.getIsRepeat().intValue() == 1) {
                            //可重复投票
                            int votedVotesInToday = comActDiscussOptionUserDAO.selectVotedVotesInToday(id, loginUserId);
                            int remainingVotes = comActDiscussVO.getCount().intValue() - votedVotesInToday;
                            comActDiscussVO.setRemainingVotes(remainingVotes >= 0 ? remainingVotes : 0);
                        } else {
                            //不可重复投票
                            int alreadyVotedVotes = votes.stream().mapToInt(Integer::intValue).sum();
                            int remainingVotes = comActDiscussVO.getCount().intValue() - alreadyVotedVotes;
                            comActDiscussVO.setRemainingVotes(remainingVotes >= 0 ? remainingVotes : 0);
                        }
                    }
                    comActDiscussVO.setUserName(DesensitizedUtil.chineseName(comActDiscussVO.getUserName()));
                    //填充投票记录列表
                    List<ComActDiscussOptionUserVO> comActDiscussOptionUserVOList = comActDiscussOptionUserDAO
                            .selectVotedRecords(comActDiscussVO.getId());
                    comActDiscussVO.setComActDiscussOptionUserVOList(comActDiscussOptionUserVOList);
                    //填充已参与投票人数
                    int votedPersonNum = comActDiscussOptionUserDAO.selectVotedPersonNum(comActDiscussVO.getId());
                    comActDiscussVO.setVotedPersonNum(votedPersonNum);
                }

                if (loginUserId != null) {
                    Integer integer = comActDiscussUserDAO.selectCount(new QueryWrapper<ComActDiscussUserDO>().lambda()
                            .eq(ComActDiscussUserDO::getDiscussId, comActDiscussVO.getId())
                            .eq(ComActDiscussUserDO::getUserId, loginUserId));
                    if (integer > 0) {
                        comActDiscussVO.setHaveSign(1);
                    } else {
                        comActDiscussVO.setHaveSign(0);
                    }
                    // 判断是否已经投票
                    int haveVote = comActDiscussOptionUserDAO.selectHaveVote(id, loginUserId);
                    comActDiscussVO.setHaveVote(haveVote > 0 ? 1 : 0);
                }
            });
        }
        return R.ok(iPage);
    }

    /**
     * 判断discuss状态是否正确
     * @param comActDiscussVO
     */
@@ -843,6 +998,104 @@
        return R.ok(iPage);
    }

 /**
     * 议事投票-评论-分页查询 小程序
     *
     * @param pageComActDiscussCommentDTO 分页参数
     * @return ComActDiscussCommentVO
     */
    @Override
    public R pageDiscussCommentAppletsDesensitize(PageComActDiscussCommentDTO pageComActDiscussCommentDTO) {
        Page page = new Page<>();
        Long pageNum = pageComActDiscussCommentDTO.getPageNum();
        Long pageSize = pageComActDiscussCommentDTO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActDiscussCommentVO> iPage =
                comActDiscussDAO.pageDiscussCommentApplets(page, pageComActDiscussCommentDTO);
        List<ComActDiscussCommentVO> records = iPage.getRecords();
        if (!ObjectUtils.isEmpty(records)) {
            records.forEach(comActDiscussCommentVO -> {
                List<ComActDiscussCommentVO> comActDiscussCommentVOList = new ArrayList<>();
                Long id = comActDiscussCommentVO.getId();
                comActDiscussCommentVO.setPhone(DesensitizedUtil.mobilePhone(comActDiscussCommentVO.getPhone()));
                comActDiscussCommentVO.setUserName(DesensitizedUtil.chineseName(comActDiscussCommentVO.getUserName()));
                comActDiscussCommentVO.setUserNameBack(DesensitizedUtil.chineseName(comActDiscussCommentVO.getUserNameBack()));
                comActDiscussCommentVOList = comActDiscussCommentDAO.selectChilds(id);
                if (!ObjectUtils.isEmpty(comActDiscussCommentVOList)) {
                    List<ComActDiscussCommentVO> comActDiscussCommentVOS = comActDiscussCommentVOList;
                    comActDiscussCommentVOList.forEach(comActDiscussCommentVO1 -> {
                        Long parentId = comActDiscussCommentVO1.getParentId();
                        List<ComActDiscussCommentVO> collect = comActDiscussCommentVOS.stream()
                                .filter(comActDiscussCommentVO2 -> comActDiscussCommentVO2.getId().equals(parentId))
                                .collect(Collectors.toList());
                        if (!ObjectUtils.isEmpty(collect)) {
                            String userName = collect.get(0).getUserName();
                            String userNickName = collect.get(0).getUserNickName();
                            comActDiscussCommentVO1.setUserNameBack(userName);
                            comActDiscussCommentVO1.setUserNickNameBack(userNickName);
                        }
                        List<ComActDiscussCommentVO> collect1 = records.stream()
                                .filter(comActDiscussCommentVO2 -> comActDiscussCommentVO2.getId().equals(parentId))
                                .collect(Collectors.toList());
                        if (!ObjectUtils.isEmpty(collect1)) {
                            ComActDiscussCommentVO comActDiscussCommentVOFirst = collect1.get(0);
                            String userName = comActDiscussCommentVOFirst.getUserName();
                            String userNickName = comActDiscussCommentVOFirst.getUserNickName();
                            comActDiscussCommentVO1.setUserNameBack(userName);
                            comActDiscussCommentVO1.setUserNickNameBack(userNickName);
                        }
                        comActDiscussCommentVO1.setPhone(DesensitizedUtil.mobilePhone(comActDiscussCommentVO1.getPhone()));
                        comActDiscussCommentVO1.setUserName(DesensitizedUtil.chineseName(comActDiscussCommentVO1.getUserName()));
                        comActDiscussCommentVO1.setUserNameBack(DesensitizedUtil.chineseName(comActDiscussCommentVO1.getUserNameBack()));
                        if (pageComActDiscussCommentDTO.getLoginUserId() != null
                                && !pageComActDiscussCommentDTO.getLoginUserId().equals(0L)) {
                            Integer integer = comActDiscussCommentUserDAO
                                    .selectCount(new QueryWrapper<ComActDiscussCommentUserDO>().lambda()
                                            .eq(ComActDiscussCommentUserDO::getDisscussCommentId,
                                                    comActDiscussCommentVO1.getId())
                                            .eq(ComActDiscussCommentUserDO::getUserId,
                                                    pageComActDiscussCommentDTO.getLoginUserId()));
                            if (integer > 0) {
                                comActDiscussCommentVO1.setHaveSign(1);
                            } else {
                                comActDiscussCommentVO1.setHaveSign(0);
                            }
                        }
//                        if(StringUtils.isEmpty(comActDiscussCommentVO1.getUserNickNameBack())){
//                            comActDiscussCommentVO1.setUserNickNameBack("社区管理员");
//                        }
                    });
                    comActDiscussCommentVO.setComActDiscussCommentVOList(comActDiscussCommentVOList);
                }
                if (pageComActDiscussCommentDTO.getLoginUserId() != null
                        && !pageComActDiscussCommentDTO.getLoginUserId().equals(0L)) {
                    Integer integer =
                            comActDiscussCommentUserDAO.selectCount(new QueryWrapper<ComActDiscussCommentUserDO>().lambda()
                                    .eq(ComActDiscussCommentUserDO::getDisscussCommentId, comActDiscussCommentVO.getId())
                                    .eq(ComActDiscussCommentUserDO::getUserId, pageComActDiscussCommentDTO.getLoginUserId()));
                    if (integer > 0) {
                        comActDiscussCommentVO.setHaveSign(1);
                    } else {
                        comActDiscussCommentVO.setHaveSign(0);
                    }
                }

                // 判断当前评论是否是社区管理员评论
                if (!comActDiscussCommentVO.getUserType().equals(1)) {
                    comActDiscussCommentVO.setUserNickName("社区管理员");
                }
            });
        }
        return R.ok(iPage);
    }

    /**
     * 议事投票-详情 小程序
     *
@@ -939,6 +1192,102 @@
        }
        return R.ok(comActDiscussVO);
    }
    /**
     * 议事投票-详情 小程序 脱敏
     *
     * @param id          主键
     * @param loginUserId 登录用户主键
     * @return ComActDiscussVO
     */
    @Override
    public R detailDiscussAppletsDesensitize(Long id, Long loginUserId) {
        ComActDiscussDO comActDiscussDO = comActDiscussDAO.selectById(id);
        if (ObjectUtils.isEmpty(comActDiscussDO)) {
            return R.fail("议事投票不存在");
        }
        ComActDiscussVO comActDiscussVO = new ComActDiscussVO();
        BeanUtils.copyProperties(comActDiscussDO, comActDiscussVO);
        comActDiscussVO.setSignNum(comActDiscussDO.getFabulousNum());
        Integer type = comActDiscussVO.getType();
        if (type.equals(2)) {
            List<ComActDiscussOptionDO> comActDiscussOptionDOS = comActDiscussOptionDAO.selectList(
                    new QueryWrapper<ComActDiscussOptionDO>().lambda().eq(ComActDiscussOptionDO::getDiscussId, id));
            List<ComActDiscussOptionVO> comActDiscussOptionVOS = new ArrayList<>();
            ArrayList<Integer> votes = new ArrayList<>();
            comActDiscussOptionDOS.forEach(comActDiscussOptionDO -> {
                Long discussOptionDOId = comActDiscussOptionDO.getId();
                Integer selectCount =
                        comActDiscussOptionUserDAO.selectCount(new QueryWrapper<ComActDiscussOptionUserDO>().lambda()
                                .eq(ComActDiscussOptionUserDO::getDiscussOptionId, discussOptionDOId));
                ComActDiscussOptionVO comActDiscussOptionVO = new ComActDiscussOptionVO();
                BeanUtils.copyProperties(comActDiscussOptionDO, comActDiscussOptionVO);
                comActDiscussOptionVO.setNum(selectCount);
                if (loginUserId != null && !loginUserId.equals(0L)) {
                    // 判断选项是否已投票
                    int haveVote =
                            comActDiscussOptionUserDAO.selectHaveVotes(comActDiscussOptionDO.getId(), loginUserId);
                    votes.add(haveVote);
                    comActDiscussOptionVO.setHaveVote(haveVote > 0 ? 1 : 0);
                }
                comActDiscussOptionVOS.add(comActDiscussOptionVO);
            });
            fillThePercentAndSort(comActDiscussOptionVOS);
            comActDiscussVO.setComActDiscussOptionVOS(comActDiscussOptionVOS);
            //填充剩余可投票数
            if (loginUserId != null && !loginUserId.equals(0L)) {
                if (comActDiscussVO.getIsRepeat().intValue() == 1) {
                    //可重复投票
                    int votedVotesInToday = comActDiscussOptionUserDAO.selectVotedVotesInToday(id, loginUserId);
                    int remainingVotes = comActDiscussVO.getCount().intValue() - votedVotesInToday;
                    comActDiscussVO.setRemainingVotes(remainingVotes >= 0 ? remainingVotes : 0);
                } else {
                    //不可重复投票
                    int alreadyVotedVotes = votes.stream().mapToInt(Integer::intValue).sum();
                    int remainingVotes = comActDiscussVO.getCount().intValue() - alreadyVotedVotes;
                    comActDiscussVO.setRemainingVotes(remainingVotes >= 0 ? remainingVotes : 0);
                }
            }
            checkDiscussStatusIsCorrect(comActDiscussVO);
            //填充投票记录列表
            List<ComActDiscussOptionUserVO> comActDiscussOptionUserVOList = comActDiscussOptionUserDAO
                    .selectVotedRecords(comActDiscussVO.getId());
            comActDiscussVO.setComActDiscussOptionUserVOList(comActDiscussOptionUserVOList);
            //填充已参与投票人数
            int votedPersonNum = comActDiscussOptionUserDAO.selectVotedPersonNum(comActDiscussVO.getId());
            comActDiscussVO.setVotedPersonNum(votedPersonNum);
        }
        Long userId = comActDiscussDO.getUserId();
        LoginUserInfoVO loginUserInfoVO = comActDiscussDAO.selectUserByUserId(userId);
        if (loginUserInfoVO != null) {
            comActDiscussVO.setUserName(DesensitizedUtil.chineseName(loginUserInfoVO.getName()));
            if (StringUtils.isEmpty(loginUserInfoVO.getNickName())) {
                comActDiscussVO.setUserNickName(DesensitizedUtil.chineseName(loginUserInfoVO.getName()));
            } else {
                comActDiscussVO.setUserNickName(loginUserInfoVO.getNickName());
            }
            comActDiscussVO.setImageUrl(loginUserInfoVO.getImageUrl());
            comActDiscussVO.setUserType(loginUserInfoVO.getType());
        }
        Long communityId = comActDiscussDO.getCommunityId();
        Integer type1 = loginUserInfoVO.getType();
        if (type1.intValue() > 1) {
            ComActVO comActVO = comActDiscussDAO.selectCommunity(communityId);
            comActDiscussVO.setUserName(comActVO.getName());
            comActDiscussVO.setUserNickName(comActVO.getName());
        }
        if (loginUserId != null && !loginUserId.equals(0L)) {
            ComActDiscussVO comActDiscussVO1 = comActDiscussDAO.selectHaveSignAndHaveVote(id, loginUserId);
            comActDiscussVO.setHaveSign(comActDiscussVO1.getHaveSign());
            comActDiscussVO.setHaveVote(comActDiscussVO1.getHaveVote());
        }
        String viewNumKey = String.join("_", DISCUSS_VIEW_NUM_PREFIX, id.toString());
        if (stringRedisTemplate.hasKey(viewNumKey)) {
            ValueOperations opsForValue = stringRedisTemplate.opsForValue();
            int viewNum = Integer.parseInt((String) opsForValue.get(viewNumKey));
            comActDiscussVO.setViewsNum(viewNum);
        }
        return R.ok(comActDiscussVO);
    }

    /**
     * 计算投票占比以及排序

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

@@ -7,6 +7,8 @@

import javax.annotation.Resource;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.DesensitizedUtil;
import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoEvaluateDto;
import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo;
import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
@@ -193,6 +195,66 @@
        if (comActEasyPhotoVO.getActivityId() != null) {
            ComActEasyPhotoActivityDO photoActivityDO =
                comActEasyPhotoActivityMapper.selectById(comActEasyPhotoVO.getActivityId());
            if (photoActivityDO != null) {
                ComActEasyPhotoActivityVO easyPhotoActivityVO = new ComActEasyPhotoActivityVO();
                BeanUtils.copyProperties(photoActivityDO, easyPhotoActivityVO);
                comActEasyPhotoVO.setEasyPhotoActivityVO(easyPhotoActivityVO);
            }
        }
        PageComActEasyPhotoEvaluateDto evaluateDto = new PageComActEasyPhotoEvaluateDto();
        evaluateDto.setServiceId(id);
        evaluateDto.setServiceType(ComActEasyPhotoEvaluate.ServiceType.SSP);
        comActEasyPhotoVO.setEvaluateList(comActEasyPhotoEvaluateMapper.queryAllByList(evaluateDto));
        return R.ok(comActEasyPhotoVO);
    }
    /**
     * 随手拍详情 - 脱敏
     *
     * @param id
     *            随手拍主键
     * @param userId
     * @return 详情内容
     */
    @Override
    public R detailEasyPhotoDesensitize(Long id, Long userId) {
        ComActEasyPhotoVO comActEasyPhotoVO = comActEasyPhotoDAO.detailEasyPhoto(id);
        Integer status = comActEasyPhotoVO.getStatus();
        if (ObjectUtils.isEmpty(comActEasyPhotoVO) || null == status) {
            return R.fail("随手拍不存在");
        }
        if (!userId.equals(0L)) {
            ComActEasyPhotoUserDO comActEasyPhotoUserDO =
                    comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda()
                            .eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
            if (ObjectUtils.isEmpty(comActEasyPhotoUserDO)) {
                comActEasyPhotoVO.setHaveGiveThumbsUp(0);
            } else {
                comActEasyPhotoVO.setHaveGiveThumbsUp(1);
            }
        }
        comActEasyPhotoVO.setSponsorName(DesensitizedUtil.chineseName(comActEasyPhotoVO.getSponsorName()));
        comActEasyPhotoVO.setHandlerName(DesensitizedUtil.chineseName(comActEasyPhotoVO.getHandlerName()));
        comActEasyPhotoVO.setCompleteName(DesensitizedUtil.chineseName(comActEasyPhotoVO.getCompleteName()));
        comActEasyPhotoVO.setPhone(DesensitizedUtil.mobilePhone(comActEasyPhotoVO.getPhone()));

        // 查询反馈信息
        List<ComActEasyPhotoFeedbackVO> photoFeedbackList = comActEasyPhotoFeedbackMapper.getPhotoFeedbackList(id);
        if (!photoFeedbackList.isEmpty()) {
            if (CollUtil.isNotEmpty(photoFeedbackList)){
                for (ComActEasyPhotoFeedbackVO comActEasyPhotoFeedbackVO : photoFeedbackList) {
                    comActEasyPhotoFeedbackVO.setCreateByName(DesensitizedUtil.chineseName(comActEasyPhotoFeedbackVO.getCreateByName()));
                }
            }
            comActEasyPhotoVO.setPhotoFeedbackList(photoFeedbackList);
        }

        if (comActEasyPhotoVO.getAddrRemark() == null) {
            comActEasyPhotoVO.setAddrRemark("");
        }

        if (comActEasyPhotoVO.getActivityId() != null) {
            ComActEasyPhotoActivityDO photoActivityDO =
                    comActEasyPhotoActivityMapper.selectById(comActEasyPhotoVO.getActivityId());
            if (photoActivityDO != null) {
                ComActEasyPhotoActivityVO easyPhotoActivityVO = new ComActEasyPhotoActivityVO();
                BeanUtils.copyProperties(photoActivityDO, easyPhotoActivityVO);
@@ -467,6 +529,65 @@
    }

    /**
     * 小程序分页查询随手拍 脱敏
     *
     * @param comActEasyPhotoVO
     *            查询参数
     * @return 返回结果
     */
    @Override
    public R pageEasyPhotoAppletsDesensitize(ComActEasyPhotoVO comActEasyPhotoVO) {
        Page page = new Page<>();
        Long pageNum = comActEasyPhotoVO.getPageNum();
        Long pageSize = comActEasyPhotoVO.getPageSize();
        Long userId = comActEasyPhotoVO.getLogInUserId();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActEasyPhotoVO> iPage = comActEasyPhotoDAO.pageEasyPhotoApplets(page, comActEasyPhotoVO);
        List<ComActEasyPhotoVO> records = iPage.getRecords();
        if (userId != null) {
            if (!ObjectUtils.isEmpty(records)) {
                records.forEach(comActEasyPhotoVO1 -> {
                    Long id = comActEasyPhotoVO1.getId();
                    Integer status = comActEasyPhotoVO1.getStatus();
                    Date feedbackAt = comActEasyPhotoVO1.getFeedbackAt();
                    comActEasyPhotoVO1.setSponsorName(DesensitizedUtil.chineseName(comActEasyPhotoVO1.getSponsorName()));
                    comActEasyPhotoVO1.setHandlerName(DesensitizedUtil.chineseName(comActEasyPhotoVO1.getHandlerName()));
                    comActEasyPhotoVO1.setCompleteName(DesensitizedUtil.chineseName(comActEasyPhotoVO1.getCompleteName()));
                    comActEasyPhotoVO1.setPhone(DesensitizedUtil.mobilePhone(comActEasyPhotoVO1.getPhone()));
                    List<ComActEasyPhotoUserDO> comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectList(
                            new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id)
                                    .eq(ComActEasyPhotoUserDO::getUserId, userId));
                    if (comActEasyPhotoUserDO == null || comActEasyPhotoUserDO.size() == 0) {
                        comActEasyPhotoVO1.setHaveGiveThumbsUp(0);
                    } else {
                        comActEasyPhotoVO1.setHaveGiveThumbsUp(1);
                    }
                    if (status.intValue() == 4 && null == feedbackAt) {
                        comActEasyPhotoVO1.setFeedbackAt(comActEasyPhotoVO1.getExamineAt());
                    }
                    //反馈信息列表
                    List<ComActEasyPhotoFeedbackVO> photoFeedbackList = comActEasyPhotoVO1.getPhotoFeedbackList();
                    if (CollUtil.isNotEmpty(photoFeedbackList)){
                        for (ComActEasyPhotoFeedbackVO comActEasyPhotoFeedbackVO : photoFeedbackList) {
                            comActEasyPhotoFeedbackVO.setCreateByName(DesensitizedUtil.chineseName(comActEasyPhotoFeedbackVO.getCreateByName()));
                        }
                    }
                    comActEasyPhotoVO1.setPhotoFeedbackList(photoFeedbackList);
                });
                iPage.setRecords(records);
            }
        }
        return R.ok(iPage);
    }

    /**
     * 随手拍评论分页查询
     *
     * @param pageComActEasyPhotoCommentDTO
@@ -499,6 +620,39 @@
    }

    /**
     * 随手拍评论分页查询 - 脱敏
     *
     * @param pageComActEasyPhotoCommentDTO
     *            查询参数
     * @return 查询结果
     */
    @Override
    public R pageComActEasyPhotoCommentDesensitize(PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO) {
        Page page = new Page<>();
        Long pageNum = pageComActEasyPhotoCommentDTO.getPageNum();
        Long pageSize = pageComActEasyPhotoCommentDTO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActEasyPhotoCommentVO> iPage =
                comActEasyPhotoCommentDAO.pageComActEasyPhotoComment(page, pageComActEasyPhotoCommentDTO);
        if (!iPage.getRecords().isEmpty()) {
            for (ComActEasyPhotoCommentVO commentVO : iPage.getRecords()) {
                commentVO.setNickName(DesensitizedUtil.chineseName(commentVO.getNickName()));
                if (StringUtils.isEmpty(commentVO.getName())) {
                    commentVO.setName(commentVO.getNickName());
                }
            }
        }
        return R.ok(iPage);
    }

    /**
     * 评论点赞/取消点赞
     *
     * @param comActEasyPhotoCommentUserDTO

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

@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service.impl;

import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.DesensitizedUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -128,6 +129,32 @@
        }
        return R.ok(iPage);
    }
    @Override
    public R pageMicroWishAppletsDesensitize(ComActMicroWishVO comActMicroWishVO) {
        Long userId = comActMicroWishVO.getResponsibleId();
        IPage<ComActMicroWishVO> iPage = comActMicroWishDAO.pageMicroWishApplets(new Page(comActMicroWishVO.getPageNum()
                ,comActMicroWishVO.getPageSize()), comActMicroWishVO);
        List<ComActMicroWishVO> records = iPage.getRecords();
        if (!ObjectUtils.isEmpty(records)) {
            records.forEach(comActMicroWishVO1 -> {
                if(userId != null){
                    Long id = comActMicroWishVO1.getId();
                    ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getMicroWishId, id)
                            .eq(ComActMicroWishUserDO::getUserId, userId));
                    if (ObjectUtils.isEmpty(comActMicroWishUserDO)) {
                        comActMicroWishVO1.setHaveGiveThumbsUp(0);
                    } else {
                        comActMicroWishVO1.setHaveGiveThumbsUp(1);
                    }
                }
                comActMicroWishVO1.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO1.getSponsorPhone()));
                comActMicroWishVO1.setSponsorName(DesensitizedUtil.chineseName(comActMicroWishVO1.getSponsorName()));
                comActMicroWishVO1.setResponsibleName(DesensitizedUtil.chineseName(comActMicroWishVO1.getResponsibleName()));
            });
            iPage.setRecords(records);
        }
        return R.ok(iPage);
    }

    /**
     * 心愿详情
@@ -177,6 +204,59 @@
        comActMicroWishVO.setResponsibleName(this.getWishHandleName(comActMicroWishVO.getHandleId()));
        return R.ok(comActMicroWishVO);
    }
    /**
     * 心愿详情 - 脱敏
     *
     * @param id 查询主键
     * @param userId 登录用户id
     * @return 心愿内容
     */
    @Override
    public R detailMicroWishDesensitize(Long id, Long userId) {
        ComActMicroWishVO comActMicroWishVO = comActMicroWishDAO.detailMicroWish(id);
        if (ObjectUtils.isEmpty(comActMicroWishVO)) {
            return R.fail("微心愿不存在");
        }
        Integer starNum = comActMicroWishVO.getStarNum();
        if (null==starNum) {
            comActMicroWishVO.setStarNum(0);
        }
        if (ObjectUtils.isEmpty(comActMicroWishVO)) {
            return R.fail("心愿不存在");
        }
        if(userId != null){
            ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getUserId, userId).eq(ComActMicroWishUserDO::getMicroWishId, id));
            if (ObjectUtils.isEmpty(comActMicroWishUserDO)) {
                comActMicroWishVO.setHaveGiveThumbsUp(0);
            }else {
                comActMicroWishVO.setHaveGiveThumbsUp(1);
            }
        }
        //查询反馈列表
        List<ComActMicroWishFeedbackVO> feedList=comActMicroWishFeedbackMapper.selectByWishId(id);
        if(!feedList.isEmpty()){
            for (ComActMicroWishFeedbackVO comActMicroWishFeedbackVO : feedList) {
                comActMicroWishFeedbackVO.setName(DesensitizedUtil.chineseName(comActMicroWishFeedbackVO.getName()));
            }
            comActMicroWishVO.setFeedbackVOList(feedList);
        }
        //查询操作记录
        List<ComActMicroWishOperationRecordVO> operationList=comActMicroWishOperationRecordMapper.getByWishId(id);
        if(!operationList.isEmpty()){
            comActMicroWishVO.setOperationRecordVOList(operationList);
        }
        comActMicroWishVO.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO.getSponsorPhone()));
        comActMicroWishVO.setSponsorName(DesensitizedUtil.chineseName(comActMicroWishVO.getSponsorName()));
        comActMicroWishVO.setResponsibleName(DesensitizedUtil.chineseName(comActMicroWishVO.getResponsibleName()));
        //查询同类型id数组
        List<Long> idList=comActMicroWishOperationRecordMapper.selectId(comActMicroWishVO);
        if(!idList.isEmpty()){
            comActMicroWishVO.setIdList(idList);
        }
        //查询处理人
        comActMicroWishVO.setResponsibleName(DesensitizedUtil.chineseName(this.getWishHandleName(comActMicroWishVO.getHandleId())));
        return R.ok(comActMicroWishVO);
    }

    /**
     * 审核、分配、反馈心愿

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java

@@ -37,6 +37,15 @@
        return this.comPropertyRepairService.pageList(commonPage);
    }

    /**
     * 分页查询所有数据 脱敏
     * @return 所有数据
     */
    @PostMapping("queryAllDesensitize")
    public R selectAllDesensitize(@RequestBody CommonPage commonPage) {
        return this.comPropertyRepairService.pageListDesensitize(commonPage);
    }



    /**
@@ -50,6 +59,19 @@
        return this.comPropertyRepairService.selectDetail(id);
    }


    /**
     * 通过主键查询单条数据 脱敏
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("desensitize/{id}")
    public R selectOneDesensitize(@PathVariable("id") Long id) {
        return this.comPropertyRepairService.selectDetailDesensitize(id);
    }


    /**
     * 新增数据
     *

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/ComPropertyRepairService.java

@@ -19,9 +19,21 @@
     * @return
     */
    R pageList(CommonPage commonPage);
    /**
     * 多条件查询维修列表
     * @param commonPage
     * @return
     */
    R pageListDesensitize(CommonPage commonPage);

    /**
     * 详情查询
     */
    R selectDetail(Long id);


    /**
     * 详情查询脱敏
     */
    R selectDetailDesensitize(Long id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java

@@ -9,14 +9,13 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.property.ComPropertyRepairVO;
import com.panzhihua.common.utlis.RSAUtils;
import com.panzhihua.service_property.entity.ComPropertyRepair;
import com.panzhihua.service_property.dao.ComPropertyRepairDao;
import com.panzhihua.service_property.entity.ComPropertyRepair;
import com.panzhihua.service_property.service.ComPropertyRepairService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
 * (ComPropertyRepair)表服务实现类
@@ -29,23 +28,42 @@
public class ComPropertyRepairServiceImpl extends ServiceImpl<ComPropertyRepairDao, ComPropertyRepair> implements ComPropertyRepairService {
    @Resource
    private ComPropertyRepairDao comPropertyRepairDao;

    @Override
    public R pageList(CommonPage commonPage) {
//        try {
//            commonPage.setUsername(RSAUtils.decrypt(commonPage.getUsername(), Constants.PRIVATE_KEY));
//            commonPage.setPhone(RSAUtils.decrypt(commonPage.getPhone(), Constants.PRIVATE_KEY));
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
        IPage<ComPropertyRepairVO> list=comPropertyRepairDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()),commonPage);
        IPage<ComPropertyRepairVO> list = comPropertyRepairDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()), commonPage);
        return R.ok(list);
    }

    @Override
    public R pageListDesensitize(CommonPage commonPage) {
        try {
            commonPage.setUsername(RSAUtils.decrypt(commonPage.getUsername(), Constants.PRIVATE_KEY));
            commonPage.setPhone(RSAUtils.decrypt(commonPage.getPhone(), Constants.PRIVATE_KEY));
        } catch (Exception e) {
            e.printStackTrace();
        }
        IPage<ComPropertyRepairVO> list = comPropertyRepairDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()), commonPage);
        for (ComPropertyRepairVO record : list.getRecords()) {
            record.setRepairName(DesensitizedUtil.mobilePhone(record.getRepairPhone()));
            record.setRepairName(DesensitizedUtil.chineseName(record.getRepairName()));
            record.setFeedback(DesensitizedUtil.chineseName(record.getFeedback()));
        }
        return R.ok(list);
    }

    @Override
    public R selectDetail(Long id) {
        ComPropertyRepairVO vo = comPropertyRepairDao.selectDetail(id);
        return R.ok(vo);
    }

    @Override
    public R selectDetailDesensitize(Long id) {
        ComPropertyRepairVO vo = comPropertyRepairDao.selectDetail(id);
        vo.setRepairPhone(DesensitizedUtil.mobilePhone(vo.getRepairPhone()));
        vo.setRepairName(DesensitizedUtil.chineseName(vo.getRepairName()));
        vo.setFeedback(DesensitizedUtil.chineseName(vo.getFeedback()));
        return R.ok(vo);
    }
}