From 26888f46e583df1dfabd94bd5eeee2365e991c55 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 29 六月 2021 15:13:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 92 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 92 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 ed5a867..ed76c8b 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
@@ -14,9 +14,13 @@
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
+import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
+import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
+import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
@@ -272,6 +276,13 @@
*/
@PostMapping("addeasyphoto")
R addEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ * 查询随手拍是否有活动
+ * @return 活动详情
+ */
+ @PostMapping("getEasyPhotoActivity")
+ R getEasyPhotoActivity(@RequestParam("communityId") Long communityId);
/**
* 发布微心愿
@@ -3069,4 +3080,85 @@
@PostMapping("/screen/work/getScreenMicroList")
R getScreenMicroList(@RequestBody ScreenMicroListDTO microListDTO);
+ /**
+ * 获取系统参数接口
+ * @param code 参数code
+ * @return 系统参数
+ */
+ @GetMapping("/sys/conf/get")
+ R getConf(@RequestParam("code") String code);
+
+ /**
+ * 根据社区id获取社区下人口数据信息
+ * @param populationListDTO 请求参数
+ * @return 人口数据
+ */
+ @PostMapping("/population/list/app")
+ R getPopulationListByApp(@RequestBody PagePopulationListDTO populationListDTO);
+
+ /**
+ * 根据人口id获取人口详情
+ * @param populationId
+ * @return
+ */
+ @GetMapping("/population/detail/app")
+ R getPopulationDetailByApp(@RequestParam("populationId") Long populationId);
+
+ /**
+ * 修复人口加密问题
+ * @return 修复结果
+ */
+ @GetMapping("/population/repair")
+ R getPopulationRepairByApp();
+
+ /**
+ * 工作大屏-社区动态模块数据统计
+ * @param communityId 社区id
+ * @return 社区动态数据统计
+ */
+ @GetMapping("/screen/work/dynamic")
+ R dynamicWork(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 查询用户钱包信息
+ * @param walletDetailDTO 请求参数
+ * @return 用户钱包信息
+ */
+ @PostMapping("/wallet/get/my")
+ R getUserWalletDetail(@RequestBody ComActWalletDetailDTO walletDetailDTO);
+
+ /**
+ * 查询用户收支记录列表
+ * @param walletTradeDTO 请求参数
+ * @return 收支记录
+ */
+ @PostMapping("/wallet/get/trade")
+ R getUserWalletTrade(@RequestBody PageComActWalletTradeDTO walletTradeDTO);
+
+ /**
+ * 查询用户绑定的社区收益排行榜
+ * @param walletTradeDTO 请求参数
+ * @return 社区收益排行榜
+ */
+ @PostMapping("/wallet/get/ranking")
+ R getWalletRanking(@RequestBody PageComActWalletTradeDTO walletTradeDTO);
+
+ /**
+ * 综治后台-居民列表
+ * @param populationListDTO 请求参数
+ * @return 居民列表
+ */
+ @PostMapping("/population/grid/list")
+ R getGridPopulationList(@RequestBody ComMngPopulationListDTO populationListDTO);
+
+ /**
+ * 综治后台-删除居民
+ * @param ids 居民id集合
+ * @return 删除结果
+ */
+ @PostMapping("/population/grid/del")
+ R delGridPopulation(@RequestBody List<Long> ids);
+
+ @GetMapping("/population/grid/get")
+ R getGridPopulationDetail(@RequestParam("populationId")Long populationId);
}
--
Gitblit v1.7.1