From a4aa79a8fd9a40b34bac8ebb153f7ab1977282d3 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 09 四月 2021 15:45:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java | 131 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 128 insertions(+), 3 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 f356d90..90be175 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,10 +3,11 @@
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.ComMngRealAssetsService;
-import com.panzhihua.service_community.service.ComMngRealCompanyService;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.service_community.service.*;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -30,6 +31,12 @@
@Resource
private ComMngRealAssetsService comMngRealAssetsService;
+
+ @Resource
+ private ComMngProvinceService comMngProvinceService;
+ @Resource
+ private ComMngPopulationService comMngPopulationService;
+
/**
* 小程序用户车辆登记
@@ -126,6 +133,10 @@
return comMngRealCompanyService.detailComMngRealCompany(id);
}
+ @PostMapping("/company/belongs")
+ public R belongsComMngRealCompany(@RequestBody ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO) {
+ return comMngRealCompanyService.belongsComMngRealCompany(comMngRealCompanyBelongsDTO);
+ }
/**
* 社区后台导入实有单位
* @param list 车实有单位列表
@@ -203,4 +214,118 @@
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);
+ }
+
+ /**
+ * 社区后台实有人口管理列表
+ * @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);
+ }
+
+ /**
+ * 根据实有人口id查询详情
+ * @param populationId 实有人口id
+ * @return 实有人口详情查询结果
+ */
+ @PostMapping("/population/detail")
+ public R detailPopulation(@RequestParam(value = "populationId") Long populationId) {
+ return comMngPopulationService.detailPopulation(populationId);
+ }
+
+ /**
+ * 根据实有人口id修改标签列表
+ * @param populationTagDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/population/editTag")
+ public R editTagPopulation(@RequestBody ComMngPopulationTagDTO populationTagDTO) {
+ return comMngPopulationService.editTagPopulation(populationTagDTO);
+ }
+
+ /**
+ * 批量删除实有人口
+ * @param Ids 删除id集合
+ * @return 删除结果
+ */
+ @ApiOperation(value = "批量删除实有人口")
+ @PostMapping("/population/delete")
+ public R deletePopulations(@RequestBody List<Long> Ids) {
+ return comMngPopulationService.deletePopulations(Ids);
+ }
+
+ /**
+ * 根据社区id查询所有实有人口
+ * @param communityId 社区id
+ * @return 查询结果
+ */
+ @ApiOperation(value = "根据社区id查询所有实有人口")
+ @PostMapping("/population/getAll")
+ public R getPopulationListByCommunityId(@RequestParam(value = "communityId") Long communityId) {
+ return comMngPopulationService.getPopulationListByCommunityId(communityId);
+ }
+
+ /**
+ * 根据id集合查询实有人口
+ * @param Ids 实有人口id集合
+ * @return 查询结果
+ */
+ @ApiOperation(value = "批量删除实有人口")
+ @PostMapping("/population/getList")
+ public R getPopulationLists(@RequestBody List<Long> Ids) {
+ return comMngPopulationService.getPopulationLists(Ids);
+ }
}
--
Gitblit v1.7.1