From 6375ca6c370b007d68786ec7dd941c6eb0e4efa7 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 26 四月 2021 09:27:57 +0800
Subject: [PATCH] bugfixed: 78658
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 57 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
index 92b7a6c..40a1599 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
@@ -3,8 +3,8 @@
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
-import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.service.*;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -276,6 +276,18 @@
}
/**
+ * 确认导入实有人口（有则更新，无则新建）
+ * @param list 用户信息
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/population/import/confirm")
+ @Transactional(rollbackFor = Exception.class)
+ public R listSavePopulationConfirm(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId){
+ return comMngPopulationService.listSavePopulationConfirm(list,communityId);
+ }
+
+ /**
* 根据实有人口id查询详情
* @param populationId 实有人口id
* @return 实有人口详情查询结果
@@ -285,6 +297,7 @@
return comMngPopulationService.detailPopulation(populationId);
}
+
/**
* 根据实有人口id修改标签列表
* @param populationTagDTO 请求参数
@@ -294,4 +307,47 @@
public R editTagPopulation(@RequestBody ComMngPopulationTagDTO populationTagDTO) {
return comMngPopulationService.editTagPopulation(populationTagDTO);
}
+
+ /**
+ * 批量删除实有人口
+ * @param Ids 删除id集合
+ * @return 删除结果
+ */
+ @ApiOperation(value = "批量删除实有人口")
+ @PostMapping("/population/delete")
+ public R deletePopulations(@RequestBody List<Long> Ids) {
+ return comMngPopulationService.deletePopulations(Ids);
+ }
+
+ /**
+ * 根据社区id查询所有实有人口
+ * @param communityId 社区id
+ * @return 查询结果
+ */
+ @ApiOperation(value = "根据社区id查询所有实有人口")
+ @PostMapping("/population/getAll")
+ public R getPopulationListByCommunityId(@RequestParam(value = "communityId") Long communityId) {
+ return comMngPopulationService.getPopulationListByCommunityId(communityId);
+ }
+
+ /**
+ * 根据id集合查询实有人口
+ * @param Ids 实有人口id集合
+ * @return 查询结果
+ */
+ @ApiOperation(value = "批量删除实有人口")
+ @PostMapping("/population/getList")
+ public R getPopulationLists(@RequestBody List<Long> Ids) {
+ return comMngPopulationService.getPopulationLists(Ids);
+ }
+
+ /**
+ * 编辑实有人口
+ * @param editComMngPopulationVO
+ * @return
+ */
+ @PostMapping("/population/edit")
+ R editPopulation(@RequestBody EditComMngPopulationVO editComMngPopulationVO,@RequestParam("communityId") Long communityId){
+ return comMngPopulationService.editPopulation(editComMngPopulationVO, communityId);
+ }
}
--
Gitblit v1.7.1