From 07ba29f8b474c102cda0e1e5549b1ca1c90ca16b Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 05 八月 2021 18:55:35 +0800
Subject: [PATCH] Merge branch 'txb'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 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 41f09aa..571d299 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
@@ -1733,6 +1733,36 @@
R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list, @RequestParam(value = "communityId") Long communityId);
/**
+ * 批量导入邪教人员
+ *
+ * @param list 邪教人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importCult")
+ R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 批量导入刑释人员
+ *
+ * @param list 刑释人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importRehabilitation")
+ R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 批量导入重点上访人员
+ *
+ * @param list 重点上访人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importKey")
+ R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
* 确认导入实有人口（有则更新，无则新建）
*
* @param list 用户信息
@@ -4064,4 +4094,10 @@
@PostMapping("/patrolRecord/rota/import")
R listSaveSwRotaExcelVO(@RequestBody List<ComSwRotaExcelVO> list, @RequestParam("communityId") Long communityId);
+ /**
+ * 定时任务检测即将开始的社区活动，并使用订阅消息通知用户
+ */
+ @PostMapping("timedTaskActivityNotice")
+ R timedTaskActivityNotice();
+
}
--
Gitblit v1.7.1