From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java |   74 +++++++++++++++++++++++++++++++++++--
 1 files changed, 70 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 e8d9dd6..5c68b0b 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
@@ -19,6 +19,10 @@
 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.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * 实有人口Service
@@ -58,7 +62,7 @@
      *            实有人口id
      * @return 实有人口详情
      */
-    R detailPopulation(Long populationId);
+    R detailPopulation(Long populationId, Long communityId);
 
     /**
      * 分页查询实有人口
@@ -68,6 +72,15 @@
      * @return 分页集合
      */
     R pagePopulation(ComMngPopulationDTO comMngPopulationVO);
+
+    /**
+     * 老人导出
+     *
+     * @param comMngPopulationVO
+     *            查询参数
+     * @return 分页集合
+     */
+    R exportOld(ComMngPopulationDTO comMngPopulationVO);
 
     /**
      * 查询平台所有的实有人口
@@ -203,6 +216,26 @@
     R listSaveLowSecurityPopulation(List<ComMngPopulationLowSecurityExcelVO> list, Long communityId, Long userId);
 
     /**
+     * 批量导入高龄老人  listSavePopulationElderExcelVO  批量导入高龄老人
+     * @param    list  高龄老人数据
+     * @param    communityId   社区id
+     * @return    R   导入结果
+     * @author txb
+     * @date 2021/9/01 15:03
+     */
+    R listSaveEdlerPopulation(List<ComMngPopulationElderExcelVO> list, Long communityId, Long userId);
+
+    /**
+     * 批量导入养老金人员  listSavePopulationPensionExcelVO  批量导入养老金人员
+     * @param    list  养老金人员数据
+     * @param    communityId   社区id
+     * @return    R   导入结果
+     * @author txb
+     * @date 2021/9/01 15:03
+     */
+    R listSavePensionPopulation(List<ComMngPopulationPensionExcelVO> list, Long communityId, Long userId);
+
+    /**
      * 确认导入实有人口(有则更新,无则新建)
      *
      * @param list
@@ -225,11 +258,11 @@
     /**
      * 批量删除实有人口
      *
-     * @param Ids
+     * @param ids
      *            实有人口id集合
      * @return 删除结果
      */
-    R deletePopulations(List<Long> Ids);
+    R deletePopulations(List<Long> ids, Long communityId);
 
     /**
      * 根据社区id查询所有实有人口
@@ -283,7 +316,7 @@
      *            特殊群体id
      * @return 删除结果
      */
-    R deleteSpecialInputUser(Long id);
+    R deleteSpecialInputUser(Long id,Long communityId);
 
     /**
      * 基础数据》特殊群体》分页查询标签列表
@@ -490,4 +523,37 @@
     R relationVillage(String name);
 
     R getVillagePopulationAdmin(PageComMngVillagePopulationDTO villagePopulationDTO);
+
+    /**
+     * 导出特殊人群
+     * @param PageInputUserDTO
+     * @return
+     */
+    R specialInputUserExport(PageInputUserDTO PageInputUserDTO);
+
+    /**
+     * 西区大屏治理数据
+     * @return
+     */
+    R westScreenStatics();
+
+    R getComprehensivePopulationStatics(Long streetId);
+
+    R getComprehensiveStreetList();
+
+    /**
+     * 新版大屏首页
+     * @param communityId
+     * @return
+     */
+    R indexInfo(Long communityId);
+
+    /**
+     * 历史数据人员类型填充
+     * @param newVoList
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    R filledPopulationPersonType(List<ComMngPopulationServeExcelVO> newVoList, Long communityId, Long userId);
 }

--
Gitblit v1.7.1