From 62d2377c27bf65a048a7c104b256efcd32ad2319 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 19 八月 2021 17:53:40 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 167 insertions(+), 11 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 1800518..32ea945 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,18 +1,22 @@
package com.panzhihua.service_community.api;
import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
-import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
+import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngVillageListExportAdminDTO;
+import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
+import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationHouseDTO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
-import com.panzhihua.common.model.vos.community.ComStreetVO;
+import com.panzhihua.service_community.model.dos.ComMngVillageDO;
+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 com.panzhihua.service_community.service.ComStreetService;
import lombok.extern.slf4j.Slf4j;
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.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
@@ -28,6 +32,12 @@
public class ComMngVillageApi {
@Resource
private ComMngVillageService comMngVillageService;
+ @Resource
+ private ComMngPopulationHouseService comMngPopulationHouseService;
+ @Resource
+ private ComMngPopulationHouseUserService comMngPopulationHouseUserService;
+ @Resource
+ private ComMngPopulationService comMngPopulationService;
/**
* 新增实有房屋
@@ -37,7 +47,7 @@
@PostMapping("addvillage")
@Transactional(rollbackFor = Exception.class)
public R addVillage(@Valid @RequestBody ComMngVillageVO comMngVillageVO) {
- R r = comMngVillageService.addComMngVillage(comMngVillageVO);
+ R r = comMngVillageService.addComActVillage(comMngVillageVO);
return R.ok(r);
}
@@ -48,7 +58,7 @@
*/
@PostMapping("pagevillage")
public R pageVillage(@RequestBody PageComMngVillageDTO pageComMngVillageDTO) {
- R r = comMngVillageService.pageComMngVillage(pageComMngVillageDTO);
+ R r = comMngVillageService.pageComActVillage(pageComMngVillageDTO);
return R.ok(r);
}
@@ -59,8 +69,23 @@
*/
@PostMapping("listvillage")
public R listVillage(@RequestBody ComMngVillageVO comMngVillageVO) {
- R r = comMngVillageService.listComMngVillage(comMngVillageVO);
+ R r = comMngVillageService.listComActVillage(comMngVillageVO);
return R.ok(r);
+ }
+
+ /**
+ * 根据房屋id查询实有房屋
+ *
+ * @param villageId 查询条件
+ * @return 查询结果
+ */
+ @PostMapping("getVillageById")
+ public R getVillageById(@RequestParam(value = "villageId")Long villageId){
+ ComMngVillageDO comMngVillageDO = comMngVillageService.getVillageById(villageId);
+ if (comMngVillageDO != null) {
+ return R.ok(comMngVillageDO);
+ }
+ return R.fail();
}
/**
@@ -71,8 +96,139 @@
@PostMapping("deletevillage")
@Transactional(rollbackFor = Exception.class)
public R delectVillage(@RequestBody List<Long> Ids) {
- R r = comMngVillageService.delecComMngVillage(Ids);
+ R r = comMngVillageService.delecComActVillage(Ids);
return R.ok(r);
}
+
+ /**
+ * 社区后台导入实有房屋
+ * @param list 数据
+ * @param communityId 社区编号
+ * @return
+ */
+ @PostMapping("/village/import")
+ @Transactional(rollbackFor = Exception.class)
+ public R listSaveMngCarExcelVO(@RequestBody List<ComMngVillageServeExcelVO> list, @RequestParam(value = "communityId") Long communityId){
+ 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);
+ }
+
+ /**
+ * 查询平台人口列表
+ * @param populationDTO 请求参数
+ * @return 人口列表
+ */
+ @PostMapping("/village/grid/building/house/population/list")
+ public R getBuildingHousePopulationList(@RequestBody PageComMngPopulationDTO populationDTO) {
+ return comMngPopulationService.getBuildingHousePopulationList(populationDTO);
+ }
+
+ /**
+ * 批量向房屋新增人员
+ * @param housePopulationDTO 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/village/grid/building/house/add/population")
+ public R addBuildingHousePopulation(@RequestBody AddComMngHousePopulationDTO housePopulationDTO) {
+ return comMngPopulationHouseUserService.addBuildingHousePopulation(housePopulationDTO);
+ }
+
+ /**
+ * 批量删除房屋内人员
+ * @param housePopulationDTO 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("/village/grid/building/house/del/population")
+ public R delBuildingHousePopulation(@RequestBody DelComMngHousePopulationDTO housePopulationDTO) {
+ return comMngPopulationHouseUserService.delBuildingHousePopulation(housePopulationDTO);
+ }
+
+ @PostMapping("/village/admin/del")
+ public R delGridVillage(@RequestBody List<Long> villageIds) {
+ return comMngVillageService.delGridVillage(villageIds);
+ }
+
+ @PostMapping("/village/admin/population/list")
+ public R getVillagePopulationAdmin(@RequestBody PageComMngVillagePopulationDTO villagePopulationDTO) {
+ return comMngPopulationService.getVillagePopulationAdmin(villagePopulationDTO);
+ }
+
+ @PostMapping("/village/admin/population/house/list")
+ public R getVillagePopulationHouseAdmin(@RequestBody PageComMngVillagePopulationHouseDTO villagePopulationHouseDTO) {
+ return comMngPopulationHouseUserService.getVillagePopulationHouseAdmin(villagePopulationHouseDTO);
+ }
+
+ @GetMapping("/village/admin/statistics")
+ public R getGridVillageStatistics() {
+ return comMngVillageService.getGridVillageStatistics();
+ }
+
+ @PostMapping("/village/admin/export")
+ public R getGridPopulationAdminListExport(@RequestBody ComMngVillageListExportAdminDTO villageListAppDTO) {
+ return comMngVillageService.getGridVillageListExport(villageListAppDTO);
+ }
+
+
}
--
Gitblit v1.7.1