Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

张天森

2022-11-10 d99a56e37cf9109b46ee68d34a06594ef5615ed3

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

@@ -5,6 +5,7 @@
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.acid.*;
import com.panzhihua.common.model.dtos.community.convenient.*;
import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
@@ -85,22 +86,6 @@
import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterMemberAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterMemberAdminDto;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductCategoryDTO;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductDTO;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientServiceCategoryDTO;
import com.panzhihua.common.model.dtos.community.convenient.DeleteConvenientProductDTO;
import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.ExportMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.OnShelfOrOffShelfProductDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientProductCategoryDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientProductDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientServiceCategoryDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageSearchDTO;
import com.panzhihua.common.model.dtos.community.convenient.ResetPasswordConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO;
@@ -623,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
@@ -653,6 +651,15 @@
     */
    @PostMapping("pagemicrowish/applets")
    R pageMicroWishApplets(@RequestBody ComActMicroWishVO comActMicroWishVO);
    /**
     * 小程序分页查询微心愿
     *
     * @param comActMicroWishVO
     *            查询参数
     * @return 分页集合
     */
    @PostMapping("pagemicrowish/appletsDesensitize")
    R pageMicroWishAppletsDesensitize(@RequestBody ComActMicroWishVO comActMicroWishVO);

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

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

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


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

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

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

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

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

    /**
     * 议事投票-详情 小程序
     *
     * @param id
@@ -1553,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);

    /**
     * 议事投票-投票
@@ -10495,4 +10564,96 @@
    @PostMapping("/proceedings")
    R addOrUpdateProceedings(@RequestBody ComActProceedingsDTO comActProceedingsDTO);

    /**
     * 自提点分页查询
     * @param pageConvenientElevatingPointDTO
     * @return
     */
    @PostMapping("/convenient/point/page")
    R pagePoint(PageConvenientElevatingPointDTO pageConvenientElevatingPointDTO);

    /**
     * 新增自提点
     * @param convenientElevatingPointDTO
     * @return
     */
    @PostMapping("/convenient/point/add")
    R addPoint(ConvenientElevatingPointDTO convenientElevatingPointDTO);

    /**
     * 编辑自提点
     * @param convenientElevatingPointDTO
     * @return
     */
    @PutMapping("/convenient/point/put")
    R putPoint(ConvenientElevatingPointDTO convenientElevatingPointDTO);

    /**
     * 删除便民服务 自提点
     * @param pointId
     * @param operator
     * @return
     */
    @DeleteMapping("/point/delete")
    R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator);

    /**
     * 便民服务详情 自提点
     * @param pointId
     * @return
     */
    @GetMapping("/point/detail")
    R detailPoint(@RequestParam("pointId") Long pointId);

    /**
     * 新增商品分类
     * @param convenientGoodsCategoryDTO
     * @return
     */
    @PostMapping("/goodsCategory/add")
    R addGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);

    /**
     * 编辑
     * @param convenientGoodsCategoryDTO
     * @return
     */
    @PutMapping("/goodsCategory/put")
    R putGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);

    /**
     * 删除商品分类
     * @param categoryId
     * @return
     */
    @DeleteMapping("/goodsCategory/delete")
    R deleteGoodsCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);

    /**
     * 获取商品分类详情
     * @param categoryId
     * @return
     */
    @GetMapping("/goodsCategory/get")
    R getGoodsCategory(@RequestParam("categoryId") Long categoryId);

    /**
     * 分页查询商品分类
     * @param pageConvenientGoodsCategoryDTO
     * @return
     */
    @PostMapping("/goodsCategory/page")
     R pageGoodsCategory(@RequestBody PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO);

    @GetMapping("/dataCount")
    R dataCount();

    @DeleteMapping("/proceedings/remove")
    R removeProceedings(@RequestParam("id") Long id);

    /**
     * 获取物业公司通知公告列表
     * */
    @GetMapping("comProperty/noticeList")
    R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId);
}