From 52e0ad7f25ca50e375bce10e47c9e30f3d39bdb2 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期六, 04 九月 2021 16:27:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 89 ++++++++++++++++++++++++++------------------
1 files changed, 52 insertions(+), 37 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 76ad4d4..ffc3066 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
@@ -3,6 +3,7 @@
import java.util.List;
import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.vos.community.*;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
@@ -62,20 +63,6 @@
import com.panzhihua.common.model.dtos.grid.admin.ComMngVillageListExportAdminDTO;
import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationHouseDTO;
-import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAdminDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborAddBrowseAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleTopicAdminDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCommentAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCommentReplyAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborFabulousAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborForwardAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborReplyAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
-import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
import com.panzhihua.common.model.dtos.shop.ComShopCartDTO;
import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO;
@@ -1132,7 +1119,7 @@
R addComActEasyPhotoComment(@RequestBody ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO);
/**
- * 一起议-新增
+ * 议事投票-新增
*
* @param comActDiscussDTO
* 新增参数
@@ -1142,7 +1129,17 @@
R addDiscuss(@RequestBody ComActDiscussDTO comActDiscussDTO);
/**
- * 一起议-详情
+ * 议事投票-新增
+ *
+ * @param comActDiscussDTO
+ * 新增参数
+ * @return 新增结果
+ */
+ @PostMapping("editdiscuss")
+ R editDiscuss(@RequestBody ComActDiscussDTO comActDiscussDTO);
+
+ /**
+ * 议事投票-详情
*
* @param id
* 主键
@@ -1152,7 +1149,7 @@
R detailDiscuss(@RequestParam("id") Long id);
/**
- * 一起议-删除
+ * 议事投票-删除
*
* @param id
* 主键
@@ -1162,7 +1159,7 @@
R deleteDiscuss(@RequestParam("id") Long id);
/**
- * 一起议-回复
+ * 议事投票-回复
*
* @param comActDiscussCommentDTO
* 评论内容
@@ -1172,7 +1169,7 @@
R addDiscussComment(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO);
/**
- * 一起议-分页查询
+ * 议事投票-分页查询
*
* @param pageComActDiscussDTO
* 查询参数
@@ -1182,7 +1179,7 @@
R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);
/**
- * 一起议-评论-查看
+ * 议事投票-评论-查看
*
* @param id
* 主键
@@ -1192,7 +1189,7 @@
R detailDiscussComment(@RequestParam("id") Long id);
/**
- * 一起议-评论-置顶
+ * 议事投票-评论-置顶
*
* @param id
* 主键
@@ -1202,7 +1199,7 @@
R putDiscussCommentTop(@RequestParam("id") Long id);
/**
- * 一起议-评论-回复
+ * 议事投票-评论-回复
*
* @param comActDiscussCommentDTO
* 回复内容
@@ -1212,7 +1209,7 @@
R addDiscussCommentBack(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO);
/**
- * 一起议-评论-分页查询
+ * 议事投票-评论-分页查询
*
* @param pageComActDiscussCommentDTO
* 分页查询参数
@@ -1222,7 +1219,7 @@
R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
/**
- * 一起议-分页查询 小程序
+ * 议事投票-分页查询 小程序
*
* @param pageComActDiscussDTO
* 查询参数
@@ -1232,7 +1229,7 @@
R pageDiscussApplets(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);
/**
- * 一起议-点赞、取消点赞
+ * 议事投票-点赞、取消点赞
*
* @param comActDiscussUserDTO
* 操作类型
@@ -1242,7 +1239,7 @@
R putDiscussUser(@RequestBody ComActDiscussUserDTO comActDiscussUserDTO);
/**
- * 一起议-评论-分页查询 小程序
+ * 议事投票-评论-分页查询 小程序
*
* @param pageComActDiscussCommentDTO
* 分页参数
@@ -1252,7 +1249,7 @@
R pageDiscussCommentApplets(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
/**
- * 一起议-详情 小程序
+ * 议事投票-详情 小程序
*
* @param id
* 主键
@@ -1264,7 +1261,7 @@
R detailDiscussApplets(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
/**
- * 一起议-投票
+ * 议事投票-投票
*
* @param comActDiscussOptionUserDTO
* 投票信息
@@ -1274,7 +1271,7 @@
R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO);
/**
- * 一起议-评论-点赞、取消点赞
+ * 议事投票-评论-点赞、取消点赞
*
* @param comActDiscussUserDTO
* 评论点赞
@@ -1449,7 +1446,7 @@
R pageComCvtBusinessByServiceArea(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO);
/**
- * 一起议-新增
+ * 议事投票-新增
*
* @param comOpsHouseDTO
* 新增参数
@@ -1459,7 +1456,7 @@
R addOpsHouse(@RequestBody ComOpsHouseDTO comOpsHouseDTO);
/**
- * 一起议-详情
+ * 议事投票-详情
*
* @param id
* 主键
@@ -1499,7 +1496,7 @@
R undercarriageHouse(@RequestBody ComOpsHouseUndercarriageVO comOpsHouseVO);
/**
- * 一起议-删除
+ * 议事投票-删除
*
* @param id
* 主键
@@ -3841,7 +3838,7 @@
R activity(@RequestParam("communityId") Long communityId);
/**
- * 大屏统计一起议
+ * 大屏统计议事投票
*
* @param communityId
* @return
@@ -3909,11 +3906,11 @@
R getScreenEventDetail(@RequestBody BigScreenEventDetailDTO eventDetailDTO);
/**
- * 工作大屏-一起议列表
+ * 工作大屏-议事投票列表
*
* @param discussListDTO
* 请求参数
- * @return 一起议列表
+ * @return 议事投票列表
*/
@PostMapping("/screen/work/getScreenDiscussList")
R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO);
@@ -4489,6 +4486,17 @@
*/
@PostMapping("/easyphoto/getUserReward")
R getUserReward(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 获取首页弹窗接口
+ * @param userId
+ * 用户id
+ * @param communityId
+ * 社区id
+ * @return 首页弹窗接口
+ */
+ @PostMapping("/easyphoto/getUserRewards")
+ R getUserRewards(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
/**
* 读取用户随手拍奖励
@@ -5193,8 +5201,6 @@
@PostMapping("/activity/default-praise")
R timedTaskActivityDefaultPraise();
-
-
/**
* 小程序-用户新增话题
* @param circleTopicAppDTO 请求参数
@@ -5230,4 +5236,13 @@
*/
@GetMapping("/sys/conf/addSysConfValue")
R addSysConfValue(@RequestParam("key") String key,@RequestParam("communityId") Long communityId,@RequestParam("name") String name,@RequestParam("value") String value);
+
+ /**
+ * 编辑系统配置
+ * @param communityId 社区id
+ * @param status 配置值
+ * @return 编辑结果
+ */
+ @GetMapping("/sys/conf/editSysConfValue")
+ R editSysConfValue(@RequestParam("communityId") Long communityId,@RequestParam("status") Integer status);
}
--
Gitblit v1.7.1