From 3ca7f722f25c1908bc4588c75dbde1f56a8d9877 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期五, 26 三月 2021 10:08:46 +0800
Subject: [PATCH] Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java |  109 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 105 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 be0d730..4071548 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
@@ -2,11 +2,10 @@
 
 import com.panzhihua.common.model.dtos.community.*;
 import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngRealCompanyVO;
+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 lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -29,6 +28,12 @@
 
     @Resource
     private ComMngRealCompanyService comMngRealCompanyService;
+
+    @Resource
+    private ComMngRealAssetsService comMngRealAssetsService;
+
+    @Resource
+    private ComMngProvinceService comMngProvinceService;
 
     /**
      * 小程序用户车辆登记
@@ -145,4 +150,100 @@
     public R exportRealCompanyExcel(@RequestBody ExportRealCompanyExcelDTO exportRealCompanyExcelDTO ){
         return comMngRealCompanyService.exportRealCompanyExcel(exportRealCompanyExcelDTO);
     }
+
+
+    /**
+     * 社区后台实有资产管理列表
+     * @param pageComMngRealAssetsDTO
+     * @return
+     */
+    @PostMapping("/assets/page")
+    public R pageQueryComMngRealAssets(@RequestBody PageComMngRealAssetsDTO pageComMngRealAssetsDTO) {
+        return comMngRealAssetsService.pageQueryComMngRealAssets(pageComMngRealAssetsDTO);
+    }
+
+    /**
+     * 社区后台添加修改实有资产
+     * @param comMngRealAssetsVO
+     * @return
+     */
+    @PostMapping("/assets/save")
+    public R saveComMngRealAssets(@RequestBody ComMngRealAssetsVO comMngRealAssetsVO) {
+        return comMngRealAssetsService.saveComMngRealAssets(comMngRealAssetsVO);
+    }
+
+    /**
+     * 社区后台删除实有资产
+     * @param id
+     * @return
+     */
+    @DeleteMapping("/assets/delete")
+    public R deleteComMngRealAssets(@RequestParam(value = "id") Long id) {
+        return comMngRealAssetsService.deleteComMngRealAssets(id);
+    }
+
+    @GetMapping("/assets/detail")
+    public R detailComMngRealAssets(@RequestParam(value = "id") Long id) {
+        return comMngRealAssetsService.detailComMngRealAssets(id);
+    }
+
+    /**
+     * 社区后台导入实有资产
+     * @param list 车实有资产列表
+     * @param communityId 社区编号
+     * @return
+     */
+    @PostMapping("/assets/import")
+    public R listSaveMngRealAssetsExcelVO(@RequestBody List<ComMngRealAssetsExcelVO> list, @RequestParam("communityId") Long communityId){
+        return comMngRealAssetsService.listSaveMngRealAssetsExcelVO(list,communityId);
+    }
+
+    /**
+     * 导出实有资产
+     * @param exportRealAssetsExcelDTO 实有资产导出查询参数
+     * @return
+     */
+    @PostMapping("/assets/export")
+    public R exportRealAssetsExcel(@RequestBody ExportRealAssetsExcelDTO exportRealAssetsExcelDTO ){
+        return comMngRealAssetsService.exportRealAssetsExcel(exportRealAssetsExcelDTO);
+    }
+
+    /**
+     * 查询所有省份
+     * @return
+     */
+    @GetMapping("/province")
+    public R getProvince() {
+        return comMngProvinceService.getProvince();
+    }
+
+    /**
+     * 查询省份下所有的城市
+     * @param provinceAdcode
+     * @return
+     */
+    @GetMapping("/city")
+    public R getCityByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode){
+        return comMngProvinceService.getCityByProvinceCode(provinceAdcode);
+    }
+
+    /**
+     * 查询城市下所有的区县
+     * @param cityAdcode
+     * @return
+     */
+    @GetMapping("/district")
+    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);
+    }
 }

--
Gitblit v1.7.1