From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java | 129 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 125 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
index b8d1155..e435632 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
@@ -4,14 +4,27 @@
import com.panzhihua.common.model.dtos.community.ComMngPopulationEditDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagCardNoDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
+import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
+import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
+import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationSubordinateDTO;
+import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.model.vos.community.EditComMngPopulationVO;
+import com.panzhihua.common.model.vos.user.ComMngTagVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -77,7 +90,6 @@
* @return 导入结果
*/
R listSavePopulationConfirm(List<ComMngPopulationServeExcelVO> list, Long communityId);
-
/**
* 根据实有人口id修改用户标签
*
@@ -111,6 +123,14 @@
R getPopulationLists(List<Long> Ids);
/**
+ * 根据小区id查询实有人口
+ *
+ * @param villageId 小区id
+ * @return 查询结果
+ */
+ R getPopulationListByVillageId(Long villageId);
+
+ /**
* 编辑实有人口
*
* @param populationEditDTO
@@ -134,6 +154,27 @@
* @return 删除结果
*/
R deleteSpecialInputUser(Long id);
+
+ /**
+ * 基础数据》特殊群体》分页查询标签列表
+ * @param comMngUserTagDTO
+ * @return
+ */
+ R specialInputUserTags(PageInputUserDTO comMngUserTagDTO);
+
+ /**
+ * 新增或修改特殊群体标签
+ * @param comMngTagVO
+ * @return
+ */
+ R saveSpecialInputUserTags(ComMngTagVO comMngTagVO);
+
+ /**
+ * 删除特殊群体标签
+ * @param id
+ * @return
+ */
+ R deleteSpecialInputUserTags(Long id);
/**
* 查询实有人口电子档信息
@@ -166,10 +207,10 @@
/**
* 事件大屏统计接口
- * @param communityId 社区id
+ * @param screenEventDTO 请求参数
* @return 统计结果
*/
- R getScreenEvent(Long communityId);
+ R getScreenEvent(BigScreenEventDTO screenEventDTO);
/**
* 民生大屏统计接口
@@ -177,7 +218,7 @@
* @return 统计结果
*/
R getScreenCivil(Long communityId);
-
+
/**
* description 根据身份证信息修改用户标签信息
*
@@ -205,7 +246,87 @@
*/
R screenStatistic(Long communityId);
+ /**
+ * 获取社区网格
+ *
+ * @param communityId 社区id
+ * @return 网格数据
+ */
R getScreenGirds(Long communityId);
+ /**
+ * 事件大屏查询事件详情
+ *
+ * @param eventDetailDTO 请求参数
+ * @return 事件详情
+ */
R getScreenEventDetail(BigScreenEventDetailDTO eventDetailDTO);
+
+ /**
+ * 获取人口数据信息
+ *
+ * @param populationListDTO 请求参数
+ * @return 人口数据
+ */
+ R pagePopulationListApp(PagePopulationListDTO populationListDTO);
+
+ /**
+ * 根据人口id获取人口详情
+ *
+ * @param populationId 人口id
+ * @return 人口详情
+ */
+ R getPopulationDetailApp(Long populationId);
+
+ /**
+ * 修复人口加密问题
+ *
+ * @return 修复结果
+ */
+ R getPopulationRepairByApp();
+
+ /**
+ * 综治后台-居民列表
+ * @param populationListDTO 请求参数
+ * @return 居民列表
+ */
+ R getGridPopulationAdminList(ComMngPopulationListDTO populationListDTO);
+
+ /**
+ * 综治后台-删除居民
+ * @param ids 居民id集合
+ * @return 删除结果
+ */
+ R delGridPopulationAdmin(List<Long> ids);
+
+ /**
+ * 查询平台人口列表
+ * @param populationDTO 请求参数
+ * @return 人口列表
+ */
+ R getBuildingHousePopulationList(PageComMngPopulationDTO populationDTO);
+
+ R binding();
+
+ /**
+ * 综治后台-居民标签栏统计
+ * @return 居民统计
+ */
+ R getGridPopulationStatistics(Long communityId);
+
+ /**
+ * 综治后台-居民导出查询居民数据
+ * @param populationExportDTO 请求参数
+ * @return 导出结果
+ */
+ R getGridPopulationExport(ComMngPopulationExportDTO populationExportDTO);
+
+ /**
+ * 综治后台-居民管理小区列表
+ * @param name 小区名字
+ * @return 小区列表
+ */
+ R relationVillage(String name);
+
+ R getVillagePopulationAdmin(PageComMngVillagePopulationDTO villagePopulationDTO);
}
--
Gitblit v1.7.1