From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/controller/HouseholdController.java | 79 ++++++++++++++++++++++++++++-----------
1 files changed, 56 insertions(+), 23 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 1c5c1ff..e8ac436 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
@@ -16,13 +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 liquibase.pro.packaged.S;
import lombok.AllArgsConstructor;
+import org.springblade.common.node.TreeIntegerNode;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
@@ -30,13 +31,10 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
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.springframework.transaction.annotation.Transactional;
@@ -46,6 +44,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
+import java.util.Map;
/**
* 住户 控制器
@@ -60,7 +59,6 @@
public class HouseholdController extends BladeController {
private final IHouseholdService householdService;
- private final IUserHouseLabelService userHouseLabelService;
/**
* 住户 详情
@@ -75,6 +73,7 @@
/**
* 住户 自定义查询详情
+ *
* @param household
* @return
*/
@@ -83,6 +82,7 @@
public R getDetail(HouseholdEntity household) {
return R.data(householdService.getDetail(household));
}
+
/**
* 住户 分页
*/
@@ -103,6 +103,40 @@
public R<IPage<HouseholdVO>> page(HouseholdVO household, Query query) {
IPage<HouseholdVO> pages = householdService.selectHouseholdPage(Condition.getPage(query), household);
return R.data(pages);
+ }
+
+ /**
+ * 住户 自定义分页
+ */
+ @GetMapping("/getKeynotePersonnelPage")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入household")
+ public R<IPage<HouseholdVO>> getKeynotePersonnelPage(HouseholdVO household, Query query) {
+ IPage<HouseholdVO> pages = householdService.getKeynotePersonnelPage(Condition.getPage(query), household);
+ return R.data(pages);
+ }
+
+ /**
+ * 住户标签统计
+ */
+ @GetMapping("/getlabelStatistics")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "住户标签统计", notes = "传入household")
+ public R<List<TreeIntegerNode>> getlabelStatistics(HouseholdVO household) {
+ List<TreeIntegerNode> pages = householdService.getlabelStatistics(household);
+ return R.data(pages);
+ }
+
+
+ /**
+ * 住户列表查询
+ *
+ * @param household
+ * @return
+ */
+ @GetMapping("/selectHouseholdList")
+ public R selectHouseholdList(HouseholdVO household) {
+ return R.data(householdService.selectHouseholdList(household));
}
/**
@@ -137,6 +171,7 @@
/**
* 住户 自定义新增或修改
+ *
* @param household
* @return
*/
@@ -154,25 +189,10 @@
@ApiOperation(value = "逻辑删除", notes = "传入ids")
@Transactional(rollbackFor = Exception.class)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- List<Long> idList = Func.toLongList(ids);
- boolean removeByIds = householdService.removeByIds(idList);
- // 同时删除当前住户对应的标签
- removeHouseholdLabel(idList);
// 返回
- return R.status(removeByIds);
+ return R.status(householdService.removeHousehold(ids));
}
- /**
- * 删除住户标签信息
- * @param idList
- */
- public void removeHouseholdLabel(List<Long> idList) {
- for (Long id : idList) {
- QueryWrapper<UserHouseLabelEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("household_id",id);
- userHouseLabelService.remove(wrapper);
- }
- }
/**
* 住户审核统计
@@ -181,7 +201,7 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "住户审核统计", notes = "网格员调用")
public R getStatistics() {
- return R.data(householdService.statistics(AuthUtil.getUserId(), ""));
+ return R.data(householdService.statistics(AuthUtil.getUserId(), "",0));
}
/**
@@ -210,6 +230,7 @@
/**
* 住户对应物业，网格，公安负责人查询
+ *
* @param household
* @return
*/
@@ -222,6 +243,7 @@
/**
* 用户信息统计
+ *
* @param code
* @param roleType
* @return
@@ -230,12 +252,13 @@
@ApiOperationSupport(order = 14)
@ApiOperation(value = "用户信息统计", notes = " ")
public R getHouseHoldStatistics(@RequestParam("code") String code, @RequestParam("roleType") String roleType) {
- return R.data(householdService.getHouseHoldStatistics(code,roleType));
+ return R.data(householdService.getHouseHoldStatistics(code, roleType));
}
/**
* 住户业主信息处理，将业主人员插入到用户表
+ *
* @return
*/
@GetMapping("/userHandle")
@@ -243,5 +266,15 @@
return R.data(householdService.userHandle());
}
+ /**
+ * 获取所有住户
+ *
+ * @return
+ */
+ @GetMapping("/getAllHouseHold")
+ public R getAllHouseHold(HouseholdVO household) {
+ return R.data(householdService.getAllHouseHold(household));
+ }
+
}
--
Gitblit v1.9.3