From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计
---
src/main/java/org/springblade/modules/house/controller/HouseRentalController.java | 100 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 96 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java b/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
index 0344c12..2546aca 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
@@ -21,13 +21,22 @@
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
+
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import org.springblade.core.secure.BladeUser;
+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.vo.HouseRentalTenantVO;
+import org.springblade.modules.house.excel.HouseRentalExcel;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.house.entity.HouseRentalEntity;
@@ -35,6 +44,9 @@
import org.springblade.modules.house.wrapper.HouseRentalWrapper;
import org.springblade.modules.house.service.IHouseRentalService;
import org.springblade.core.boot.ctrl.BladeController;
+
+import java.util.Date;
+import java.util.List;
/**
* 出租屋 控制器
@@ -49,14 +61,17 @@
public class HouseRentalController extends BladeController {
private final IHouseRentalService houseRentalService;
+ private final BladeLogger bladeLogger;
/**
* 出租屋 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
+ @ApiLog("出租屋 详情")
@ApiOperation(value = "详情", notes = "传入houseRental")
public R<HouseRentalVO> detail(HouseRentalEntity houseRental) {
+ bladeLogger.info("出租屋 详情", JsonUtil.toJson(houseRental));
HouseRentalEntity detail = houseRentalService.getOne(Condition.getQueryWrapper(houseRental));
return R.data(HouseRentalWrapper.build().entityVO(detail));
}
@@ -76,9 +91,11 @@
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
+ @ApiLog("出租屋 自定义分页")
@ApiOperation(value = "分页", notes = "传入houseRental")
- public R<IPage<HouseRentalVO>> page(HouseRentalVO houseRental, Query query) {
- IPage<HouseRentalVO> pages = houseRentalService.selectHouseRentalPage(Condition.getPage(query), houseRental);
+ public R<IPage<HouseRentalTenantVO>> page(HouseRentalTenantVO houseRental, Query query) {
+ bladeLogger.info("出租屋 自定义分页", JsonUtil.toJson(houseRental));
+ IPage<HouseRentalTenantVO> pages = houseRentalService.selectHouseRentalPage(Condition.getPage(query), houseRental);
return R.data(pages);
}
@@ -93,13 +110,50 @@
}
/**
+ * 出租屋 自定义新增
+ */
+ @PostMapping("/add")
+ @ApiLog("出租屋 自定义新增")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "自定义新增", notes = "传入houseRentalVo")
+ public R add(@RequestBody HouseRentalVO houseRentalVO) {
+ bladeLogger.info("出租屋 自定义新增", JsonUtil.toJson(houseRentalVO));
+ return R.status(houseRentalService.add(houseRentalVO));
+ }
+
+ /**
* 出租屋 修改
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入houseRental")
- public R update(@Valid @RequestBody HouseRentalEntity houseRental) {
+ public R update(@RequestBody HouseRentalEntity houseRental) {
+ houseRental.setUpdateUser(AuthUtil.getUserId());
return R.status(houseRentalService.updateById(houseRental));
+ }
+
+ /**
+ * 出租屋 自定义修改
+ * @param houseRental
+ * @return
+ */
+ @ApiLog("出租屋 自定义修改")
+ @PostMapping("/updateHouseRental")
+ public R updateHouseRental(@RequestBody HouseRentalVO houseRental) {
+ bladeLogger.info("出租屋 自定义修改", JsonUtil.toJson(houseRental));
+ return R.status(houseRentalService.updateHouseRental(houseRental));
+ }
+
+ /**
+ * 出租屋 确认
+ * @param houseRental
+ * @return
+ */
+ @ApiLog("出租屋 确认")
+ @PostMapping("/confirmHouseRental")
+ public R confirmHouseRental(@RequestBody HouseRentalVO houseRental) {
+ bladeLogger.info("出租屋 确认", JsonUtil.toJson(houseRental));
+ return R.status(houseRentalService.confirmHouseRental(houseRental));
}
/**
@@ -116,11 +170,49 @@
* 出租屋 删除
*/
@PostMapping("/remove")
+ @ApiLog("出租屋 删除")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ bladeLogger.info("出租屋 删除", JsonUtil.toJson(ids));
return R.status(houseRentalService.removeByIds(Func.toLongList(ids)));
}
+ /**
+ * 出租屋 自定义删除
+ * @param id
+ * @return
+ */
+ @PostMapping("/removeHouseRental")
+ @ApiLog("出租屋 详情")
+ public R removeHouseRental(@ApiParam(value = "主键集合", required = true) @RequestParam Long id) {
+ return R.status(houseRentalService.removeHouseRental(id));
+ }
+
+ /**
+ * 获取统计数据
+ * @return
+ */
+ @GetMapping("/getStatistics")
+ public R getStatistics(HouseRentalTenantVO houseRental){
+ return R.data(houseRentalService.getStatistics(houseRental));
+ }
+
+
+ @GetMapping("/getStatisticsCount")
+ public R getStatisticsCount(HouseRentalTenantVO houseRental){
+ houseRental.setUserId(AuthUtil.getUserId());
+ return R.data(houseRentalService.getStatisticsCount(houseRental));
+ }
+
+ /**
+ * 导出租赁信息
+ */
+ @GetMapping("export-houseRental")
+ public void exportHouseRental(HouseRentalTenantVO houseRentalVO, HttpServletResponse response) {
+ List<HouseRentalExcel> list = houseRentalService.export(houseRentalVO);
+ ExcelUtil.export(response, "出租屋数据" + DateUtil.time(), "出租屋数据表", list, HouseRentalExcel.class);
+ }
+
}
--
Gitblit v1.9.3