From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/place/controller/PlaceCheckController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/controller/PlaceCheckController.java b/src/main/java/org/springblade/modules/place/controller/PlaceCheckController.java
index ab07052..145cbe4 100644
--- a/src/main/java/org/springblade/modules/place/controller/PlaceCheckController.java
+++ b/src/main/java/org/springblade/modules/place/controller/PlaceCheckController.java
@@ -21,13 +21,24 @@
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.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
+import org.springblade.core.log.logger.BladeLogger;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
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.place.dto.PlaceCheckDTO;
+import org.springblade.modules.place.excel.NinePlaceExcel;
+import org.springblade.modules.place.excel.PlaceCheckExcel;
+import org.springblade.modules.place.vo.PlaceVO;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.place.entity.PlaceCheckEntity;
@@ -35,6 +46,8 @@
import org.springblade.modules.place.wrapper.PlaceCheckWrapper;
import org.springblade.modules.place.service.IPlaceCheckService;
import org.springblade.core.boot.ctrl.BladeController;
+
+import java.util.List;
/**
* 场所检查表 控制器
@@ -49,6 +62,7 @@
public class PlaceCheckController{
private final IPlaceCheckService placeCheckService;
+ private final BladeLogger bladeLogger;
/**
* 场所检查表 详情
@@ -56,8 +70,8 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入placeCheck")
- public R<PlaceCheckEntity> detail(PlaceCheckEntity placeCheck) {
- PlaceCheckEntity detail = placeCheckService.getOne(Condition.getQueryWrapper(placeCheck));
+ public R<PlaceCheckVO> detail(PlaceCheckEntity placeCheck) {
+ PlaceCheckVO detail = placeCheckService.selectPlaceCheckById(placeCheck.getId());
return R.data(detail);
}
/**
@@ -76,8 +90,10 @@
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
+ @ApiLog("场所检查表 自定义分页")
@ApiOperation(value = "分页", notes = "传入placeCheck")
public R<IPage<PlaceCheckVO>> page(PlaceCheckVO placeCheck, Query query) {
+ bladeLogger.info("场所检查表 自定义分页", JsonUtil.toJson(placeCheck));
IPage<PlaceCheckVO> pages = placeCheckService.selectPlaceCheckPage(Condition.getPage(query), placeCheck);
return R.data(pages);
}
@@ -88,8 +104,20 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入placeCheck")
- public R save(@Valid @RequestBody PlaceCheckEntity placeCheck) {
+ public R save(@Valid @RequestBody PlaceCheckVO placeCheck){
return R.status(placeCheckService.save(placeCheck));
+ }
+
+ /**
+ * 场所检查表 新增
+ */
+ @PostMapping("/saveTwo")
+ @ApiOperationSupport(order = 4)
+ @ApiLog("场所检查表 新增")
+ @ApiOperation(value = "新增", notes = "传入placeCheck")
+ public R saveTwo(@Valid @RequestBody PlaceCheckVO placeCheck) throws Exception {
+ bladeLogger.info("场所检查表 新增", JsonUtil.toJson(placeCheck));
+ return R.status(placeCheckService.savePlace(placeCheck));
}
/**
@@ -108,7 +136,7 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入placeCheck")
- public R submit(@Valid @RequestBody PlaceCheckEntity placeCheck) {
+ public R submit(@Valid @RequestBody PlaceCheckVO placeCheck) {
return R.status(placeCheckService.saveOrUpdate(placeCheck));
}
@@ -116,11 +144,27 @@
* 场所检查表 删除
*/
@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(placeCheckService.removeByIds(Func.toLongList(ids)));
}
+ /**
+ * 导出场所检查信息
+ * @param placeCheck
+ */
+ @GetMapping("export-placeCheck")
+ @ApiLog("导出场所检查信息")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "导出场所检查", notes = "传入placeCheck")
+ public void exportPlaceCheck(PlaceCheckVO placeCheck, HttpServletResponse response) {
+ bladeLogger.info("导出场所检查信息", JsonUtil.toJson(placeCheck));
+ List<PlaceCheckExcel> list = placeCheckService.exportPlaceCheck(placeCheck);
+ ExcelUtil.export(response, "场所检查" + DateUtil.time(), "场所检查记录表", list, PlaceCheckExcel.class);
+ }
+
}
--
Gitblit v1.9.3