From 8d493a008ce655963f0363b116d5b55e02eff3d6 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 16 十一月 2022 09:45:13 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into zigonggao_dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoService.java | 164 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 132 insertions(+), 32 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoService.java
index 32f45d9..42a0963 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoService.java
@@ -1,19 +1,17 @@
package com.panzhihua.service_community.service;
+import java.util.List;
+
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO;
+import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
import com.panzhihua.common.model.dtos.community.GrantRewardDTO;
import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO;
-import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO;
-import com.panzhihua.common.model.dtos.partybuilding.ComPbServiceTeamDTO;
-import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO;
-
-import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -24,102 +22,183 @@
public interface ComActEasyPhotoService extends IService<ComActEasyPhotoDO> {
/**
* 分页查询随手拍
- * @param comActEasyPhotoVO 查询参数
+ *
+ * @param comActEasyPhotoVO
+ * 查询参数
* @return 心愿列表
*/
R pageEasyPhoto(ComActEasyPhotoVO comActEasyPhotoVO);
+
/**
* 随手拍详情
- * @param id 随手拍主键
- * @param userId 登录用户id
+ *
+ * @param id
+ * 随手拍主键
+ * @param userId
+ * 登录用户id
* @return 详情内容
*/
R detailEasyPhoto(Long id, Long userId);
/**
+ * 随手拍详情 - 脱敏
+ *
+ * @param id
+ * 随手拍主键
+ * @param userId
+ * 登录用户id
+ * @return 详情内容
+ */
+ R detailEasyPhotoDesensitize(Long id, Long userId);
+
+ /**
* 上传随手拍
- * @param comActEasyPhotoVO 上传数据
+ *
+ * @param comActEasyPhotoVO
+ * 上传数据
* @return 上传结果
*/
R addEasyPhoto(ComActEasyPhotoVO comActEasyPhotoVO);
+
/**
* 点赞/取消点赞随手拍
- * @param comActEasyPhotoVO 操作参数
+ *
+ * @param comActEasyPhotoVO
+ * 操作参数
* @return 操作结果
*/
R putEasyPhoto(ComActEasyPhotoVO comActEasyPhotoVO);
+
/**
* 审核反馈随手拍
- * @param comActEasyPhotoVO 操作参数
+ *
+ * @param comActEasyPhotoVO
+ * 操作参数
* @return 操作结果
*/
R putEasypHotoStatus(ComActEasyPhotoVO comActEasyPhotoVO);
/**
* 随手拍是否有待审核和带反馈的事件
- * @param communityId 社区id
- * @param userId 登录用户id
+ *
+ * @param communityId
+ * 社区id
+ * @param userId
+ * 登录用户id
* @return 待处理事件集合
*/
List<TodoEventsVO> selectNeedToDo(Long communityId, Long userId);
+
/**
* 小程序分页查询随手拍
- * @param comActEasyPhotoVO 查询参数
+ *
+ * @param comActEasyPhotoVO
+ * 查询参数
* @return 返回结果
*/
R pageEasyPhotoApplets(ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ * 小程序分页查询随手拍
+ *
+ * @param comActEasyPhotoVO
+ * 查询参数
+ * @return 返回结果
+ */
+ R pageEasyPhotoAppletsDesensitize(ComActEasyPhotoVO comActEasyPhotoVO);
+
/**
* 随手拍评论分页查询
- * @param pageComActEasyPhotoCommentDTO 查询参数
+ *
+ * @param pageComActEasyPhotoCommentDTO
+ * 查询参数
* @return 查询结果
*/
R pageComActEasyPhotoComment(PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO);
/**
+ * 随手拍评论分页查询 - 脱敏
+ *
+ * @param pageComActEasyPhotoCommentDTO
+ * 查询参数
+ * @return 查询结果
+ */
+ R pageComActEasyPhotoCommentDesensitize(PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO);
+
+
+ /**
* 评论点赞/取消点赞
- * @param comActEasyPhotoCommentUserDTO 操作
+ *
+ * @param comActEasyPhotoCommentUserDTO
+ * 操作
* @return 操作结果
*/
R commentSign(ComActEasyPhotoCommentUserDTO comActEasyPhotoCommentUserDTO);
+
/**
* 随手拍--评论--新增评论
- * @param comActEasyPhotoCommentDTO 新增内容
+ *
+ * @param comActEasyPhotoCommentDTO
+ * 新增内容
* @return 新增结果
*/
R addComActEasyPhotoComment(ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO);
/**
* 社区随手拍列表统计
- * @param communityId 社区id
- * @return 统计结果
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计结果
*/
R easyPhotoStatistics(Long communityId);
/**
* 随手拍发放奖励
- * @param grantRewardDTO 请求参数
- * @return 发放结果
+ *
+ * @param grantRewardDTO
+ * 请求参数
+ * @return 发放结果
*/
R grantReward(GrantRewardDTO grantRewardDTO);
/**
* 获取最新活动和用户最新收益
- * @param userId 用户id
- * @param communityId 社区id
- * @return 最新活动和用户最新收益
+ *
+ * @param userId
+ * 用户id
+ * @param communityId
+ * 社区id
+ * @return 最新活动和用户最新收益
*/
- R getUserReward(Long userId,Long communityId);
+ R getUserReward(Long userId, Long communityId);
+
+ /**
+ * 获取首页弹窗接口
+ *
+ * @param userId
+ * 用户id
+ * @param communityId
+ * 社区id
+ * @return 首页弹窗接口
+ */
+ R getUserRewards(Long userId, Long communityId);
/**
* 读取用户随手拍奖励
- * @param userId 用户id
- * @return 读取结果
+ *
+ * @param userId
+ * 用户id
+ * @return 读取结果
*/
- R readUserReward(Long userId,Long communityId);
+ R readUserReward(Long userId, Long communityId);
R easyPhotoCount(ComActEasyPhotoVO comActEasyPhotoVO);
+
/**
* 社区后台-切换随手拍公示状态
- * @param comActEasyPhotoVO 请求参数
- * @return 切换结果
+ *
+ * @param comActEasyPhotoVO
+ * 请求参数
+ * @return 切换结果
*/
R easyPhotoSwitchPublicity(ComActEasyPhotoVO comActEasyPhotoVO);
@@ -129,8 +208,29 @@
/**
* 查询社区待处理随手拍id集合
- * @param communityId 社区id
- * @return 社区待处理随手拍id集合
+ *
+ * @param communityId
+ * 社区id
+ * @return 社区待处理随手拍id集合
*/
R easyPhotoNoHandleList(Long communityId);
+
+ /**
+ * 获取人大代表反馈记录
+ * @param id
+ * @return
+ */
+ R getFeedbackList(Long id);
+
+ /**
+ * 人大代表反馈随手拍
+ * @param comActEasyPhotoVO
+ * @return
+ */
+ R addEasyPhotoFeedbackForDpc(ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ * 获取社区置顶动态banner
+ * */
+ R getUserRewardNew(Long userId, Long communityId);
}
--
Gitblit v1.7.1