From 14e9e46c441de408616f5ce500623ac1d3d93b5c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 24 六月 2021 13:55:18 +0800
Subject: [PATCH] Merge branch 'test_visit' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 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 cb0da89..25abdb6 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
@@ -17,6 +17,7 @@
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
+import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
@@ -47,7 +48,6 @@
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
-import com.panzhihua.common.utlis.ExcelSelectObject;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -2872,10 +2872,17 @@
*/
@PostMapping("/elders/records/page")
R pageQueryEldersAuthRecord(@RequestBody PageEldersAuthRecordDTO pageEldersAuthElderlyDTO);
-
+ /**
+ * description 批量保存重点人群人员信息
+ *
+ * @param list 重点人群信息
+ * @return R 保存结果
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
@PostMapping("/key_person/batch/save")
R saveBatchKeyPerson(@RequestBody List<KeyPersonInfoDTO> list);
-
+
@GetMapping("/screen/population/statistic")
R statistic(@RequestParam("communityId")Long communityId);
@@ -2893,7 +2900,7 @@
@PostMapping("/elders/getAuthHistoryExport")
R getAuthHistoryExport(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO);
-
+
@GetMapping("/screen/work/neighborCircle")
R statisticNeighborCircle(@RequestParam("communityId") Long communityId);
@@ -2956,7 +2963,7 @@
*/
@GetMapping("/screen/getScreenCivil")
R getScreenCivil(@RequestParam("communityId")Long communityId);
-
+
/**
* 大屏统计邻里圈
*/
@@ -3003,7 +3010,7 @@
*/
@GetMapping("/screen/work/workCount")
R workCount(@RequestParam("communityId")Long communityId);
-
+
/**
* description 批量保存残疾人人员信息
*
@@ -3063,4 +3070,34 @@
@PostMapping("/screen/work/getScreenMicroList")
R getScreenMicroList(@RequestBody ScreenMicroListDTO microListDTO);
+ /**
+ * 获取系统参数接口
+ * @param code 参数code
+ * @return 系统参数
+ */
+ @GetMapping("/sys/conf/get")
+ R getConf(@RequestParam("code") String code);
+
+ /**
+ * 根据社区id获取社区下人口数据信息
+ * @param populationListDTO 请求参数
+ * @return 人口数据
+ */
+ @PostMapping("/population/list/app")
+ R getPopulationListByApp(@RequestBody PagePopulationListDTO populationListDTO);
+
+ /**
+ * 根据人口id获取人口详情
+ * @param populationId
+ * @return
+ */
+ @GetMapping("/population/detail/app")
+ R getPopulationDetailByApp(@RequestParam("populationId") Long populationId);
+
+ /**
+ * 修复人口加密问题
+ * @return 修复结果
+ */
+ @GetMapping("/population/repair")
+ R getPopulationRepairByApp();
}
--
Gitblit v1.7.1