From 2e6ae80c0271e5e45faa399ce94cd44678cce43f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 13 八月 2021 22:58:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 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 571d299..1e8201e 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
@@ -19,6 +19,7 @@
import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralRuleDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralTradeDTO;
+import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
import com.panzhihua.common.model.dtos.community.wallet.*;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
@@ -1761,6 +1762,46 @@
*/
@PostMapping("/common/data/population/importKey")
R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 批量导入服刑人员
+ *
+ * @param list 服刑人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importSentence")
+ R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 批量导入退役军人
+ *
+ * @param list 退役军人数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importVeterans")
+ R listSavePopulationVeteransExcelVO(@RequestBody List<ComMngPopulationVeteransExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 批量导入残疾人
+ *
+ * @param list 残疾人数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importDisability")
+ R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 批量导入低保户
+ *
+ * @param list 低保户数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importLowSecurity")
+ R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list, @RequestParam(value = "communityId") Long communityId);
/**
* 确认导入实有人口（有则更新，无则新建）
@@ -4100,4 +4141,27 @@
@PostMapping("timedTaskActivityNotice")
R timedTaskActivityNotice();
+ /**
+ * 查询社区所有列表
+ * @return 社区列表
+ */
+ @GetMapping("/switch/community/all/list")
+ R communitySwitchList();
+
+ /**
+ * 根据名字查询所有社区列表
+ * @param name 社区名字
+ * @return 社区列表
+ */
+ @GetMapping("/switch/community/search/list")
+ R communitySwitchSearchList(@RequestParam(value = "name") String name);
+
+ /**
+ * 根据经纬度以及距离搜索附近社区列表
+ * @param communityDTO 请求参数
+ * @return 社区列表
+ */
+ @PostMapping("/switch/community/search/distance/list")
+ R communitySwitchSearchDistanceList(@RequestBody SearchCommunityDTO communityDTO);
+
}
--
Gitblit v1.7.1