From e75b4aa72e9f260912a96a9bc36b58f9985862b0 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 30 六月 2021 18:13:15 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java | 93 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 91 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
index 1b902ea..4050c0a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
@@ -1,10 +1,14 @@
package com.panzhihua.service_community.api;
import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
+import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
+import com.panzhihua.service_community.service.ComMngPopulationHouseService;
+import com.panzhihua.service_community.service.ComMngPopulationHouseUserService;
+import com.panzhihua.service_community.service.ComMngPopulationService;
import com.panzhihua.service_community.service.ComMngVillageService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +28,12 @@
public class ComMngVillageApi {
@Resource
private ComMngVillageService comMngVillageService;
+ @Resource
+ private ComMngPopulationHouseService comMngPopulationHouseService;
+ @Resource
+ private ComMngPopulationHouseUserService comMngPopulationHouseUserService;
+ @Resource
+ private ComMngPopulationService comMngPopulationService;
/**
* 新增实有房屋
@@ -71,9 +81,10 @@
return R.ok(r);
}
+
/**
* 社区后台导入实有房屋
- * @param list 车辆列表
+ * @param list 数据
* @param communityId 社区编号
* @return
*/
@@ -83,4 +94,82 @@
return comMngVillageService.listSaveVillage(list,communityId);
}
+
+ /**
+ * 编辑实有房屋
+ * @param villageId 动态id
+ * @return 删除结果
+ */
+ @PostMapping("editvillage/{villageId}")
+ @Transactional(rollbackFor = Exception.class)
+ public R editvillage(@PathVariable("villageId")Long villageId,@Valid @RequestBody ComMngVillageVO comMngVillageVO) {
+ return comMngVillageService.editVillage(villageId,comMngVillageVO);
+ }
+
+ /**
+ * 小区详情
+ * @param villageId 小区id
+ * @return 小区详情
+ */
+ @PostMapping("/village/getVillage")
+ public R getVillage(@RequestParam("villageId") Long villageId) {
+ return comMngVillageService.getVillage(villageId);
+ }
+
+ /**
+ * 综治app-小区列表
+ * @param villageListAppDTO 请求参数
+ * @return 小区列表
+ */
+ @PostMapping("/village/grid/list")
+ public R getGridPopulationAdminList(@RequestBody ComMngVillageListAppDTO villageListAppDTO) {
+ return comMngVillageService.getGridVillageList(villageListAppDTO);
+ }
+
+ /**
+ * 综治app-根据小区id查询小区下楼栋列表
+ * @param villageId 小区id
+ * @return 楼栋列表
+ */
+ @PostMapping("/village/grid/building/list")
+ public R getGridVillageBuildingList(@RequestParam("villageId")Long villageId) {
+ return comMngVillageService.getGridVillageBuildingList(villageId);
+ }
+
+ /**
+ * 小区楼栋下房屋列表
+ * @param buildHouseAppDTO 请求参数
+ * @return 房屋列表
+ */
+ @PostMapping("/village/grid/building/house/list")
+ public R getGridVillageBuildingHouseList(@RequestBody PageComMngVillageBuildHouseAppDTO buildHouseAppDTO) {
+ return comMngPopulationHouseService.getGridVillageBuildingHouseList(buildHouseAppDTO);
+ }
+
+ /**
+ * 小区楼栋下房屋信息
+ * @param houseId 房屋id
+ * @return 房屋信息
+ */
+ @PostMapping("/village/grid/building/house/detail")
+ public R getGridVillageBuildingHouseDetail(@RequestParam("houseId")Long houseId) {
+ return comMngPopulationHouseService.getGridVillageBuildingHouseDetail(houseId);
+ }
+
+ @PostMapping("/village/grid/building/house/population/list")
+ public R getBuildingHousePopulationList(@RequestBody PageComMngPopulationDTO populationDTO) {
+ return comMngPopulationService.getBuildingHousePopulationList(populationDTO);
+ }
+
+ @PostMapping("/village/grid/building/house/add/population")
+ public R addBuildingHousePopulation(@RequestBody AddComMngHousePopulationDTO housePopulationDTO) {
+ return comMngPopulationHouseUserService.addBuildingHousePopulation(housePopulationDTO);
+ }
+
+ @PostMapping("/village/grid/building/house/del/population")
+ public R delBuildingHousePopulation(@RequestBody DelComMngHousePopulationDTO housePopulationDTO) {
+ return comMngPopulationHouseUserService.delBuildingHousePopulation(housePopulationDTO);
+ }
+
+
}
--
Gitblit v1.7.1