From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java | 118 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 75 insertions(+), 43 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 32ea945..0d74d92 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,8 +1,15 @@
package com.panzhihua.service_community.api;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
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.dtos.grid.admin.ComMngVillageListExportAdminDTO;
import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationHouseDTO;
@@ -14,13 +21,8 @@
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;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
+import lombok.extern.slf4j.Slf4j;
/**
* @Author: llming
@@ -41,19 +43,23 @@
/**
* 新增实有房屋
- * @param comMngVillageVO 新增信息
+ *
+ * @param comMngVillageVO
+ * 新增信息
* @return 新增结果
*/
@PostMapping("addvillage")
@Transactional(rollbackFor = Exception.class)
- public R addVillage(@Valid @RequestBody ComMngVillageVO comMngVillageVO) {
+ public R addVillage(@Valid @RequestBody ComMngVillageVO comMngVillageVO) {
R r = comMngVillageService.addComActVillage(comMngVillageVO);
return R.ok(r);
}
/**
* 分页查询实有房屋
- * @param pageComMngVillageDTO 查询条件
+ *
+ * @param pageComMngVillageDTO
+ * 查询条件
* @return 新增结果
*/
@PostMapping("pagevillage")
@@ -64,7 +70,9 @@
/**
* 查询实有房屋
- * @param comMngVillageVO 查询条件
+ *
+ * @param comMngVillageVO
+ * 查询条件
* @return 新增结果
*/
@PostMapping("listvillage")
@@ -76,11 +84,12 @@
/**
* 根据房屋id查询实有房屋
*
- * @param villageId 查询条件
+ * @param villageId
+ * 查询条件
* @return 查询结果
*/
@PostMapping("getVillageById")
- public R getVillageById(@RequestParam(value = "villageId")Long villageId){
+ public R getVillageById(@RequestParam(value = "villageId") Long villageId) {
ComMngVillageDO comMngVillageDO = comMngVillageService.getVillageById(villageId);
if (comMngVillageDO != null) {
return R.ok(comMngVillageDO);
@@ -90,7 +99,9 @@
/**
* 删除实有房屋
- * @param Ids 动态id
+ *
+ * @param Ids
+ * 动态id
* @return 删除结果
*/
@PostMapping("deletevillage")
@@ -100,35 +111,42 @@
return R.ok(r);
}
-
/**
* 社区后台导入实有房屋
- * @param list 数据
- * @param communityId 社区编号
+ *
+ * @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);
+ public R listSaveMngCarExcelVO(@RequestBody List<ComMngVillageServeExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId) {
+ return comMngVillageService.listSaveVillage(list, communityId);
}
-
/**
* 编辑实有房屋
- * @param villageId 动态id
+ *
+ * @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);
+ public R editvillage(@PathVariable("villageId") Long villageId,
+ @Valid @RequestBody ComMngVillageVO comMngVillageVO) {
+ return comMngVillageService.editVillage(villageId, comMngVillageVO);
}
/**
* 小区详情
- * @param villageId 小区id
- * @return 小区详情
+ *
+ * @param villageId
+ * 小区id
+ * @return 小区详情
*/
@PostMapping("/village/getVillage")
public R getVillage(@RequestParam("villageId") Long villageId) {
@@ -137,8 +155,10 @@
/**
* 综治app-小区列表
- * @param villageListAppDTO 请求参数
- * @return 小区列表
+ *
+ * @param villageListAppDTO
+ * 请求参数
+ * @return 小区列表
*/
@PostMapping("/village/grid/list")
public R getGridPopulationAdminList(@RequestBody ComMngVillageListAppDTO villageListAppDTO) {
@@ -147,18 +167,22 @@
/**
* 综治app-根据小区id查询小区下楼栋列表
- * @param villageId 小区id
- * @return 楼栋列表
+ *
+ * @param villageId
+ * 小区id
+ * @return 楼栋列表
*/
@PostMapping("/village/grid/building/list")
- public R getGridVillageBuildingList(@RequestParam("villageId")Long villageId) {
+ public R getGridVillageBuildingList(@RequestParam("villageId") Long villageId) {
return comMngVillageService.getGridVillageBuildingList(villageId);
}
/**
* 小区楼栋下房屋列表
- * @param buildHouseAppDTO 请求参数
- * @return 房屋列表
+ *
+ * @param buildHouseAppDTO
+ * 请求参数
+ * @return 房屋列表
*/
@PostMapping("/village/grid/building/house/list")
public R getGridVillageBuildingHouseList(@RequestBody PageComMngVillageBuildHouseAppDTO buildHouseAppDTO) {
@@ -167,18 +191,22 @@
/**
* 小区楼栋下房屋信息
- * @param houseId 房屋id
- * @return 房屋信息
+ *
+ * @param houseId
+ * 房屋id
+ * @return 房屋信息
*/
@PostMapping("/village/grid/building/house/detail")
- public R getGridVillageBuildingHouseDetail(@RequestParam("houseId")Long houseId) {
+ public R getGridVillageBuildingHouseDetail(@RequestParam("houseId") Long houseId) {
return comMngPopulationHouseService.getGridVillageBuildingHouseDetail(houseId);
}
/**
* 查询平台人口列表
- * @param populationDTO 请求参数
- * @return 人口列表
+ *
+ * @param populationDTO
+ * 请求参数
+ * @return 人口列表
*/
@PostMapping("/village/grid/building/house/population/list")
public R getBuildingHousePopulationList(@RequestBody PageComMngPopulationDTO populationDTO) {
@@ -187,8 +215,10 @@
/**
* 批量向房屋新增人员
- * @param housePopulationDTO 请求参数
- * @return 添加结果
+ *
+ * @param housePopulationDTO
+ * 请求参数
+ * @return 添加结果
*/
@PostMapping("/village/grid/building/house/add/population")
public R addBuildingHousePopulation(@RequestBody AddComMngHousePopulationDTO housePopulationDTO) {
@@ -197,8 +227,10 @@
/**
* 批量删除房屋内人员
- * @param housePopulationDTO 请求参数
- * @return 删除结果
+ *
+ * @param housePopulationDTO
+ * 请求参数
+ * @return 删除结果
*/
@PostMapping("/village/grid/building/house/del/population")
public R delBuildingHousePopulation(@RequestBody DelComMngHousePopulationDTO housePopulationDTO) {
@@ -216,7 +248,8 @@
}
@PostMapping("/village/admin/population/house/list")
- public R getVillagePopulationHouseAdmin(@RequestBody PageComMngVillagePopulationHouseDTO villagePopulationHouseDTO) {
+ public R
+ getVillagePopulationHouseAdmin(@RequestBody PageComMngVillagePopulationHouseDTO villagePopulationHouseDTO) {
return comMngPopulationHouseUserService.getVillagePopulationHouseAdmin(villagePopulationHouseDTO);
}
@@ -229,6 +262,5 @@
public R getGridPopulationAdminListExport(@RequestBody ComMngVillageListExportAdminDTO villageListAppDTO) {
return comMngVillageService.getGridVillageListExport(villageListAppDTO);
}
-
}
--
Gitblit v1.7.1