From 566e7986291e73051d30ee252b0ebf852b1577a7 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 02 Apr 2024 14:25:51 +0800
Subject: [PATCH] 娱乐场所标签新增180200
---
src/main/java/org/springblade/modules/house/controller/HouseholdController.java | 81 +++++++++++++++++++++++++++++++++++-----
1 files changed, 70 insertions(+), 11 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 8392379..9cf38c8 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
@@ -16,40 +16,38 @@
*/
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.apache.logging.log4j.util.Strings;
+import org.springblade.common.node.TreeIntegerNode;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
+import org.springblade.core.log.logger.BladeLogger;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.jackson.JsonUtil;
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;
+import java.util.Map;
/**
* 住户 控制器
@@ -64,28 +62,35 @@
public class HouseholdController extends BladeController {
private final IHouseholdService householdService;
+ private final BladeLogger bladeLogger;
/**
* 住户 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
+ @ApiLog("住户 详情")
@ApiOperation(value = "详情", notes = "传入household")
public R<HouseholdVO> detail(HouseholdEntity household) {
+ bladeLogger.info("住户 详情", JsonUtil.toJson(household));
HouseholdEntity detail = householdService.getOne(Condition.getQueryWrapper(household));
return R.data(HouseholdWrapper.build().entityVO(detail));
}
/**
* 住户 自定义查询详情
+ *
* @param household
* @return
*/
@GetMapping("/getDetail")
+ @ApiLog("住户 详情")
@ApiOperation(value = "详情", notes = "传入household")
public R getDetail(HouseholdEntity household) {
+ bladeLogger.info("住户 详情", JsonUtil.toJson(household));
return R.data(householdService.getDetail(household));
}
+
/**
* 住户 分页
*/
@@ -102,20 +107,51 @@
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
+ @ApiLog("住户 自定义分页")
@ApiOperation(value = "分页", notes = "传入household")
public R<IPage<HouseholdVO>> page(HouseholdVO household, Query query) {
+ bladeLogger.info("住户 自定义分页", JsonUtil.toJson(household));
IPage<HouseholdVO> pages = householdService.selectHouseholdPage(Condition.getPage(query), household);
+ return R.data(pages);
+ }
+
+ /**
+ * 住户 自定义分页
+ */
+ @GetMapping("/getKeynotePersonnelPage")
+ @ApiOperationSupport(order = 3)
+ @ApiLog("住户 自定义分页")
+ @ApiOperation(value = "分页", notes = "传入household")
+ public R<IPage<HouseholdVO>> getKeynotePersonnelPage(HouseholdVO household, Query query) {
+ bladeLogger.info("住户 自定义分页", JsonUtil.toJson(household));
+ IPage<HouseholdVO> pages = householdService.getKeynotePersonnelPage(Condition.getPage(query), household);
+ return R.data(pages);
+ }
+
+ /**
+ * 住户标签统计
+ */
+ @GetMapping("/getlabelStatistics")
+ @ApiOperationSupport(order = 3)
+ @ApiLog("住户标签统计")
+ @ApiOperation(value = "住户标签统计", notes = "传入household")
+ public R<List<TreeIntegerNode>> getlabelStatistics(HouseholdVO household) {
+ bladeLogger.info("住户标签统计", JsonUtil.toJson(household));
+ List<TreeIntegerNode> pages = householdService.getlabelStatistics(household);
return R.data(pages);
}
/**
* 住户列表查询
+ *
* @param household
* @return
*/
@GetMapping("/selectHouseholdList")
+ @ApiLog("住户列表查询")
public R selectHouseholdList(HouseholdVO household) {
+ bladeLogger.info("住户列表查询", JsonUtil.toJson(household));
return R.data(householdService.selectHouseholdList(household));
}
@@ -151,12 +187,15 @@
/**
* 住户 自定义新增或修改
+ *
* @param household
* @return
*/
@PostMapping("/saveOrUpdateHousehold")
+ @ApiLog("住户 自定义新增或修改")
@ApiOperation(value = "自定义新增或修改", notes = "传入household")
public R saveOrUpdateHousehold(@Valid @RequestBody HouseholdVO household) {
+ bladeLogger.info("住户 自定义新增或修改", JsonUtil.toJson(household));
return R.status(householdService.saveOrUpdateHousehold(household));
}
@@ -165,9 +204,11 @@
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
+ @ApiLog("住户 删除")
@ApiOperation(value = "逻辑删除", notes = "传入ids")
@Transactional(rollbackFor = Exception.class)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ bladeLogger.info("住户 删除", JsonUtil.toJson(ids));
// 返回
return R.status(householdService.removeHousehold(ids));
}
@@ -178,9 +219,10 @@
*/
@PostMapping("/statistics")
@ApiOperationSupport(order = 7)
+ @ApiLog("住户审核统计")
@ApiOperation(value = "住户审核统计", notes = "网格员调用")
public R getStatistics() {
- return R.data(householdService.statistics(AuthUtil.getUserId(), ""));
+ return R.data(householdService.statistics(AuthUtil.getUserId(), "",0));
}
/**
@@ -209,32 +251,38 @@
/**
* 住户对应物业，网格，公安负责人查询
+ *
* @param household
* @return
*/
@GetMapping("/getHouseholdOtherInfo")
@ApiOperationSupport(order = 14)
+ @ApiLog("住户对应物业，网格，公安负责人查询")
@ApiOperation(value = "住户对应物业，网格，公安负责人查询", notes = "住户对应物业，网格，公安负责人查询")
public R getHouseholdOtherInfo(HouseholdVO household) {
+ bladeLogger.info("住户对应物业，网格，公安负责人查询", JsonUtil.toJson(household));
return R.data(householdService.getHouseholdOtherInfo(household));
}
/**
* 用户信息统计
+ *
* @param code
* @param roleType
* @return
*/
@GetMapping("/getHouseHoldStatistics")
@ApiOperationSupport(order = 14)
+ @ApiLog("e呼即办表 详情")
@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")
@@ -244,6 +292,7 @@
/**
* 获取所有住户
+ *
* @return
*/
@GetMapping("/getAllHouseHold")
@@ -252,6 +301,16 @@
}
-
+ /**
+ * 通过小区id查询用户
+ */
+ @GetMapping("/getUserInfoByDistrictIds")
+ @ApiOperation(value = "通过小区id查询用户")
+ @ApiLog("通过小区id查询用户")
+ public R<IPage<HouseholdVO>> getUserInfoByDistrictIds(Query query,HouseholdVO householdVO) {
+ bladeLogger.info("通过小区id查询用户", JsonUtil.toJson(householdVO));
+ IPage<HouseholdVO> pages = householdService.getUserInfoByDistrictIds(householdVO, Condition.getPage(query));
+ return R.data(pages);
+ }
}
--
Gitblit v1.9.3