From ad2ec97fe0c60eee4bb7c8cdacff7c876f280ea7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 11:30:18 +0800
Subject: [PATCH] 公安安全监管

---
 src/main/java/org/springblade/modules/house/controller/HouseholdController.java |   47 +++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/controller/HouseholdController.java b/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
index 8bc331a..8392379 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
@@ -16,12 +16,14 @@
  */
 package org.springblade.modules.house.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.apache.logging.log4j.util.Strings;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
@@ -31,16 +33,22 @@
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.house.entity.HouseholdEntity;
+import org.springblade.modules.house.entity.UserHouseLabelEntity;
 import org.springblade.modules.house.excel.HouseHoldExcel;
 import org.springblade.modules.house.excel.HouseHoldImporter;
 import org.springblade.modules.house.service.IHouseholdService;
+import org.springblade.modules.house.service.IUserHouseLabelService;
 import org.springblade.modules.house.vo.HouseholdVO;
 import org.springblade.modules.house.wrapper.HouseholdWrapper;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IUserService;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -100,6 +108,17 @@
 		return R.data(pages);
 	}
 
+
+	/**
+	 * 住户列表查询
+	 * @param household
+	 * @return
+	 */
+	@GetMapping("/selectHouseholdList")
+	public R selectHouseholdList(HouseholdVO household) {
+		return R.data(householdService.selectHouseholdList(household));
+	}
+
 	/**
 	 * 住户 新增
 	 */
@@ -137,7 +156,7 @@
 	 */
 	@PostMapping("/saveOrUpdateHousehold")
 	@ApiOperation(value = "自定义新增或修改", notes = "传入household")
-	public R saveOrUpdateHousehold(@Valid @RequestBody HouseholdEntity household) {
+	public R saveOrUpdateHousehold(@Valid @RequestBody HouseholdVO household) {
 		return R.status(householdService.saveOrUpdateHousehold(household));
 	}
 
@@ -147,9 +166,12 @@
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@Transactional(rollbackFor = Exception.class)
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(householdService.removeByIds(Func.toLongList(ids)));
+		// 返回
+		return R.status(householdService.removeHousehold(ids));
 	}
+
 
 	/**
 	 * 住户审核统计
@@ -211,4 +233,25 @@
 	}
 
 
+	/**
+	 * 住户业主信息处理，将业主人员插入到用户表
+	 * @return
+	 */
+	@GetMapping("/userHandle")
+	public R userHandle() {
+		return R.data(householdService.userHandle());
+	}
+
+	/**
+	 * 获取所有住户
+	 * @return
+	 */
+	@GetMapping("/getAllHouseHold")
+	public R getAllHouseHold(HouseholdVO household) {
+		return R.data(householdService.getAllHouseHold(household));
+	}
+
+
+
+
 }

--
Gitblit v1.9.3