From 038537a132c3d2ba4f6b28dc427a38f62f1ce009 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 30 三月 2021 13:23:26 +0800
Subject: [PATCH] no

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java |   40 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 36 insertions(+), 4 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 d7c7ef9..2721829 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,11 +3,9 @@
 import com.panzhihua.common.model.dtos.community.*;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.community.*;
-import com.panzhihua.service_community.service.ComMngCarService;
-import com.panzhihua.service_community.service.ComMngProvinceService;
-import com.panzhihua.service_community.service.ComMngRealAssetsService;
-import com.panzhihua.service_community.service.ComMngRealCompanyService;
+import com.panzhihua.service_community.service.*;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -34,6 +32,8 @@
 
     @Resource
     private ComMngProvinceService comMngProvinceService;
+    @Resource
+    private ComMngPopulationService comMngPopulationService;
 
     /**
      * 小程序用户车辆登记
@@ -236,4 +236,36 @@
     R getDistrictByCityCode(@RequestParam(value = "cityAdcode") Integer cityAdcode){
         return comMngProvinceService.getDistrictByCityCode(cityAdcode);
     }
+
+    /**
+     * 查询特定省下所有区域 tree结构
+     * @param provinceAdcode
+     * @return
+     */
+    @GetMapping("/area/all")
+    R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode){
+        return comMngProvinceService.getCityTreeByProvinceCode(provinceAdcode);
+    }
+
+    /**
+     * 社区后台实有人口管理列表
+     * @param comMngPopulationVO 查询参数
+     * @return  实有人口分页查询结果
+     */
+    @PostMapping("/population/page")
+    public R pagePopulation(@RequestBody ComMngPopulationDTO comMngPopulationVO) {
+        return comMngPopulationService.pagePopulation(comMngPopulationVO);
+    }
+
+    /**
+     * 社区后台导入实有人口
+     * @param list 数据
+     * @param communityId 社区编号
+     * @return
+     */
+    @PostMapping("/population/import")
+    @Transactional(rollbackFor = Exception.class)
+    public R listSavePopulationExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId){
+        return comMngPopulationService.listSavePopulation(list,communityId);
+    }
 }

--
Gitblit v1.7.1