From d99a56e37cf9109b46ee68d34a06594ef5615ed3 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 10 十一月 2022 16:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 97 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 97 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index b02143a..890c7ae 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/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);
/**
* 议事投票-投票
@@ -10513,6 +10597,13 @@
@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);
/**
* 新增商品分类
@@ -10559,4 +10650,10 @@
@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);
}
--
Gitblit v1.7.1