From 2ca2e51f3a838252ed9cd8989f4f5d6fe35d468c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 30 六月 2021 18:02:00 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 191 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 191 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 0ededa1..c449e01 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
@@ -9,9 +9,18 @@
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg;
+import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
+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.*;
+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;
@@ -267,6 +276,13 @@
*/
@PostMapping("addeasyphoto")
R addEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ * 查询随手拍是否有活动
+ * @return 活动详情
+ */
+ @PostMapping("getEasyPhotoActivity")
+ R getEasyPhotoActivity(@RequestParam("communityId") Long communityId);
/**
* 发布微心愿
@@ -3031,4 +3047,179 @@
*/
@PostMapping("/screen/getScreenEventDetail")
R getScreenEventDetail(@RequestBody BigScreenEventDetailDTO eventDetailDTO);
+
+ /**
+ * 工作大屏-一起议列表
+ * @param discussListDTO 请求参数
+ * @return 一起议列表
+ */
+ @PostMapping("/screen/work/getScreenDiscussList")
+ R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO);
+
+ /**
+ * 工作大屏-社区活动列表
+ * @param actActivityListDTO 请求参数
+ * @return 活动列表
+ */
+ @PostMapping("/screen/work/getScreenActActivityList")
+ R getScreenActActivityList(@RequestBody ScreenActActivityListDTO actActivityListDTO);
+
+ /**
+ * 工作大屏-社区活动报名人员列表
+ * @param activityPeopleListDTO 请求参数
+ * @return 社区活动报名人员列表
+ */
+ @PostMapping("/screen/work/getActActivityPeopleList")
+ R getActActivityPeopleList(@RequestBody ScreenActActivityPeopleListDTO activityPeopleListDTO);
+
+ /**
+ * 工作大屏-微心愿列表
+ * @param microListDTO 请求参数
+ * @return 微心愿列表
+ */
+ @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);
+
+ /**
+ * 综治后台-居民详情
+ * @param populationId 居民id
+ * @return 居民详情
+ */
+ @GetMapping("/population/grid/get")
+ R getGridPopulationDetail(@RequestParam("populationId")Long populationId);
+
+ /**
+ * 综治app-小区列表
+ * @param villageListAppDTO 请求参数
+ * @return 小区列表
+ */
+ @PostMapping("/village/grid/list")
+ R getGridVillageList(@RequestBody ComMngVillageListAppDTO villageListAppDTO);
+
+ /**
+ * 综治app-根据小区id查询小区下楼栋列表
+ * @param villageId 小区id
+ * @return 楼栋列表
+ */
+ @PostMapping("/village/grid/building/list")
+ R getGridVillageBuildingList(@RequestParam("villageId")Long villageId);
+
+ /**
+ * 小区楼栋下房屋列表
+ * @param buildHouseAppDTO 请求参数
+ * @return 房屋列表
+ */
+ @PostMapping("/village/grid/building/house/list")
+ R getGridVillageBuildingHouseList(@RequestBody PageComMngVillageBuildHouseAppDTO buildHouseAppDTO);
+
+ /**
+ * 小区楼栋下房屋信息
+ * @param houseId 房屋id
+ * @return 房屋信息
+ */
+ @PostMapping("/village/grid/building/house/detail")
+ R getGridVillageBuildingHouseDetail(@RequestParam("houseId")Long houseId);
+
+ /**
+ * 查询平台人口列表
+ * @param populationDTO 请求参数
+ * @return 人口列表
+ */
+ @PostMapping("/village/grid/building/house/population/list")
+ R getBuildingHousePopulationList(@RequestBody PageComMngPopulationDTO populationDTO);
+
+ /**
+ * 批量向房屋新增人员
+ * @param housePopulationDTO 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/village/grid/building/house/add/population")
+ R addBuildingHousePopulation(@RequestBody AddComMngHousePopulationDTO housePopulationDTO);
+
+ /**
+ * 批量删除房屋内人员
+ * @param housePopulationDTO 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("/village/grid/building/house/del/population")
+ R delBuildingHousePopulation(@RequestBody DelComMngHousePopulationDTO housePopulationDTO);
}
--
Gitblit v1.7.1