From de291fdd4ed240c6f5c2c70070beebbb323dc4f6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 29 九月 2021 17:44:08 +0800
Subject: [PATCH] Merge branch 'base_data' into test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActFourMemberApi.java | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 119 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActFourMemberApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActFourMemberApi.java
index a345b07..8b06be0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActFourMemberApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActFourMemberApi.java
@@ -2,9 +2,11 @@
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
+import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -12,6 +14,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* (ComActFourMember)表控制层
@@ -43,4 +46,119 @@
commonPage.setStatus(1);
return this.communityService.comActFourMemberSelectAll(commonPage);
}
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询",response = ComMngPopulationVO.class)
+ @PostMapping("queryMember")
+ public R selectMember(@RequestBody CommonPage commonPage) {
+ commonPage.setParamId(this.getCommunityId());
+ return this.communityService.comActFourMemberQueryMember(commonPage);
+ }
+
+ /**
+ *居民数据详情
+ */
+ @ApiOperation(value = "居民数据详情",response = FourMemberDetailVO.class)
+ @GetMapping("/memberDetail")
+ public R memberDetail(@RequestParam("id")Long id){
+ return this.communityService.comActFourMemberMemberDetail(id);
+ }
+
+ @ApiOperation(value = "房屋级联菜单查询")
+ @PostMapping("/cascade/list")
+ public R getCascadeHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO) {
+ // 获取登陆用户绑定社区id
+ LoginUserInfoVO loginUser = this.getLoginUserInfo();
+ if (loginUser != null) {
+ cascadeHouseDTO.setCommunityId(loginUser.getCommunityId());
+ }
+ return communityService.getCascadeHouseAddress(cascadeHouseDTO);
+ }
+
+ /**
+ * 查询房屋二级级联菜单
+ *
+ * @param cascadeHouseDTO
+ * 请求参数
+ * @return 菜单列表
+ */
+ @ApiOperation(value = "房屋级联菜单查询")
+ @PostMapping("/second/list")
+ public R getSecondHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO) {
+ cascadeHouseDTO.setCommunityId(this.getCommunityId());
+ return communityService.getSecondHouseAddress(cascadeHouseDTO);
+ }
+
+ @ApiOperation(value = "分页查询实有房屋列表", response = ComMngPopulationHouseAdminVO.class)
+ @PostMapping("/pageHouse")
+ public R pageHouse(@RequestBody ComMngPopulationHouseAdminDTO populationHouseAdminDTO) {
+ // 获取登陆用户绑定社区id
+ LoginUserInfoVO loginUser = this.getLoginUserInfo();
+ if (loginUser != null) {
+ populationHouseAdminDTO.setCommunityId(loginUser.getCommunityId());
+ }
+ return communityService.pageHouse(populationHouseAdminDTO);
+ }
+
+ @ApiOperation(value = "查询实有房屋详情", response = ComMngPopulationHouseDetailAdminVO.class)
+ @PostMapping("/house/detail")
+ public R getHouseDetail(@RequestParam(value = "houseId") Long houseId) {
+ return communityService.getHouseDetail(houseId);
+ }
+
+ /**
+ * 编辑实有房屋信息
+ *
+ * @param comMngPopulationHouseUserVO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @ApiOperation(value = "编辑实有房屋信息")
+ @PostMapping("/population/house/user/edit")
+ public R editHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO) {
+ return communityService.editHouseUser(comMngPopulationHouseUserVO);
+ }
+
+ /**
+ * 新增实有房屋信息
+ *
+ * @param comMngPopulationHouseUserVO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @ApiOperation(value = "新增实有房屋信息")
+ @PostMapping("/population/house/user/insert")
+ public R insertHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO) {
+ return communityService.insertHouseUser(comMngPopulationHouseUserVO);
+ }
+
+ /**
+ * 根据房屋id列表删除房屋信息
+ *
+ * @param comMngPopulationHouseUserVO
+ * 请求参数
+ * @return 删除结果
+ */
+ @ApiOperation(value = "删除实有房屋信息")
+ @PostMapping("/population/house/user/delete")
+ public R deleteHousesUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO) {
+ return communityService.deleteHousesUser(comMngPopulationHouseUserVO);
+ }
+
+ /**
+ * 根据id查询
+ *
+ * @param id
+ * 请求参数
+ * @return 删除结果
+ */
+ @ApiOperation(value = "id查询信息")
+ @GetMapping("/population/house/user/detail")
+ public R detailHousesUser(@RequestParam("id") Long id) {
+ return communityService.detailHousesUser(id);
+ }
}
--
Gitblit v1.7.1