From 5f349fe34e3e33625f8593ec1b616f0c4528a12c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 27 九月 2021 10:33:45 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 137 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 137 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 6d627bc..97e6841 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
@@ -2,6 +2,21 @@
import java.util.List;
+import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
+import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
+import com.panzhihua.common.model.dtos.community.cluster.admin.*;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
+import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
+import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
+import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
+import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
+import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
+import com.panzhihua.common.model.dtos.neighbor.*;
+import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
+import io.swagger.annotations.ApiOperation;
import com.panzhihua.common.model.vos.community.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -6417,4 +6432,126 @@
*/
@GetMapping("/convenient/product/shelf-num")
R getProductShelfNum(@RequestParam("merchantId") Long merchantId);
+
+ /**
+ * 群团组织成员列表-小程序分页查询
+ * @param pageClusterMemberDto 请求参数
+ * @return 群团组织成员列表
+ */
+ @PostMapping("/cluster/member/page/applets")
+ R pageClusterMemberApplets(@RequestBody PageClusterMemberDto pageClusterMemberDto);
+
+ /**
+ * 群团组织列表-小程序查询社区群团组织列表
+ * @param communityId 社区id
+ * @return 社区群团组织列表
+ */
+ @GetMapping("/cluster/list/applets")
+ R listClusterApplets(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页查询群团组织列表
+ * @param pageClusterAdminDto 请求参数
+ * @return 群团组织列表
+ */
+ @PostMapping("/cluster/page/admin")
+ R pageClusterAdmin(@RequestBody PageClusterAdminDto pageClusterAdminDto);
+
+ /**
+ * 新增群团组织
+ * @param addClusterAdminDto 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/cluster/add/admin")
+ R addClusterAdmin(@RequestBody AddClusterAdminDto addClusterAdminDto);
+
+ /**
+ * 修改群团组织
+ * @param editClusterAdminDto 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/cluster/edit/admin")
+ R editClusterAdmin(@RequestBody EditClusterAdminDto editClusterAdminDto);
+
+ /**
+ * 删除群团组织
+ * @param id 组织id
+ * @return 删除结果
+ */
+ @GetMapping("/cluster/delete/admin")
+ R deleteClusterAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 群团组织详情
+ * @param id 组织id
+ * @return 群团组织详情
+ */
+ @GetMapping("/cluster/detail/admin")
+ R detailClusterAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询群团组织成员列表
+ * @param pageClusterMemberAdminDto 请求参数
+ * @return 群团组织成员列表
+ */
+ @PostMapping("/cluster/member/page/admin")
+ R pageClusterMemberAdmin(@RequestBody PageClusterMemberAdminDto pageClusterMemberAdminDto);
+
+ /**
+ * 新增群团组织成员
+ * @param addClusterMemberAdminDto 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/cluster/member/add/admin")
+ R addClusterMemberAdmin(@RequestBody AddClusterMemberAdminDto addClusterMemberAdminDto);
+
+ /**
+ * 编辑群团组织成员
+ * @param editClusterMemberAdminDto 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/cluster/member/edit/admin")
+ R editClusterMemberAdmin(@RequestBody EditClusterMemberAdminDto editClusterMemberAdminDto);
+
+ /**
+ * 删除群团组织成员
+ * @param id 组织成员id
+ * @return 删除结果
+ */
+ @GetMapping("/cluster/member/delete/admin")
+ R deleteClusterMemberAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 群团组织成员详情
+ * @param id 组织成员id
+ * @return 群团组织成员详情
+ */
+ @GetMapping("/cluster/member/detail/admin")
+ R detailClusterMemberAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 查询系统民族列表
+ * @return 民族列表
+ */
+ @GetMapping("/cluster/member/nation/list/admin")
+ R memberNationListAdmin();
+
+ /**
+ * 群团组织成员导入
+ * @param list 导入数据
+ * @param communityId 社区id
+ * @param userId 操作用户id
+ * @return 导入结果
+ */
+ @PostMapping("/cluster/member/import/admin")
+ R importClusterMember(@RequestBody List<ComClusterMemberExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 群团组织导出数据查询
+ * @param pageClusterMemberAdminDto 请求参数
+ * @return 导出数据结果集
+ */
+ @PostMapping("/cluster/member/export/admin")
+ R exportClusterMember(@RequestBody PageClusterMemberAdminDto pageClusterMemberAdminDto);
}
--
Gitblit v1.7.1