From f7a3546bb4f6c0b00acb9899710ff25979a70be3 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 26 七月 2021 16:36:28 +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 | 75 +++++++++++++++++++++++++++++++++++++
1 files changed, 74 insertions(+), 1 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 e18060f..4f40b5c 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
@@ -1442,7 +1442,7 @@
* @return
*/
@PostMapping("/common/data/car/export")
- R exportRealCar(ExportComMngCarExcelDTO exportComMngCarExcelDTO);
+ R exportRealCar(@RequestBody ExportComMngCarExcelDTO exportComMngCarExcelDTO);
/**
* 社区后台实有单位管理列表
@@ -3662,4 +3662,77 @@
*/
@PostMapping("/population/page/exServiceman")
R pageExServiceman(@RequestBody ComExServicemanDTO comExServicemanDTO);
+
+ /**
+ * 分页查询社区动态分类列表
+ * @param comActDynTypeDTO 请求参数
+ * @return 动态分类列表
+ */
+ @PostMapping("/dyn/type/page")
+ R pageDynTypeByAdmin(@RequestBody PageComActDynTypeDTO comActDynTypeDTO);
+
+ /**
+ * 查询社区下所有动态分类列表
+ * @param comActDynTypeDTO 请求参数
+ * @return 动态分类列表
+ */
+ @PostMapping("/dyn/type/list")
+ R getDynTypeListByAdmin(@RequestBody PageComActDynTypeDTO comActDynTypeDTO);
+
+ /**
+ * 添加社区动态分类
+ * @param comActDynTypeDTO 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/dyn/type/add")
+ R addDynTypeByAdmin(@RequestBody AddComActDynTypeDTO comActDynTypeDTO);
+
+ /**
+ * 编辑社区动态分类
+ * @param comActDynTypeDTO 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/dyn/type/edit")
+ R editDynTypeByAdmin(@RequestBody EditComActDynTypeDTO comActDynTypeDTO);
+
+ /**
+ * 删除社区动态分类
+ * @param ids 社区动态分类id集合
+ * @return 删除结果
+ */
+ @PostMapping("/dyn/type/delete")
+ R deleteDynTypeByAdmin(@RequestBody List<Long> ids);
+
+ /**
+ * 随手拍发放奖励
+ * @param grantRewardDTO 请求参数
+ * @return 发放结果
+ */
+ @PostMapping("/easyphoto/grantReward")
+ R grantReward(@RequestBody GrantRewardDTO grantRewardDTO);
+
+ /**
+ * 获取最新活动和用户最新收益
+ * @param userId 用户id
+ * @param communityId 社区id
+ * @return 最新活动和用户最新收益
+ */
+ @PostMapping("/easyphoto/getUserReward")
+ R getUserReward(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId);
+
+ /**
+ * 读取用户随手拍奖励
+ * @param userId 用户id
+ * @return 读取结果
+ */
+ @PostMapping("/easyphoto/readUserReward")
+ R readUserReward(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页查询巡查记录
+ * @param comSwPatrolRecordDTO 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("/patrolRecor/page")
+ R pagePatrolRecord(@RequestBody ComSwPatrolRecordDTO comSwPatrolRecordDTO);
}
--
Gitblit v1.7.1