From fd7b9aabefdcfa4e2f8504c77d5a4e6f4f955585 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sun, 22 Aug 2021 14:50:28 +0800
Subject: [PATCH] 1.ftp
---
src/main/java/org/springblade/modules/record/controller/RecordController.java | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/springblade/modules/record/controller/RecordController.java b/src/main/java/org/springblade/modules/record/controller/RecordController.java
index e0d1e4e..79b7ee3 100644
--- a/src/main/java/org/springblade/modules/record/controller/RecordController.java
+++ b/src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -16,23 +16,26 @@
*/
package org.springblade.modules.record.controller;
+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 com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.core.boot.ctrl.BladeController;
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.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.permit.entity.Permit;
import org.springblade.modules.record.entity.Record;
-import org.springblade.modules.record.vo.RecordVO;
import org.springblade.modules.record.service.IRecordService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.modules.record.vo.RecordVO;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.validation.Valid;
+import java.util.Map;
/**
* 控制器
@@ -42,7 +45,7 @@
*/
@RestController
@AllArgsConstructor
-@RequestMapping("blade-record/record")
+@RequestMapping("/record")
@Api(value = "", tags = "接口")
public class RecordController extends BladeController {
@@ -60,18 +63,18 @@
}
/**
- * 分页
+ * 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入record")
- public R<IPage<Record>> list(Record record, Query query) {
- IPage<Record> pages = recordService.page(Condition.getPage(query), Condition.getQueryWrapper(record));
+ public R<IPage<Record>> list(@ApiIgnore @RequestParam Map<String, Object> record, Query query) {
+ IPage<Record> pages = recordService.page(Condition.getPage(query), Condition.getQueryWrapper(record, Record.class));
return R.data(pages);
}
/**
- * 自定义分页
+ * 自定义分页
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@@ -82,17 +85,18 @@
}
/**
- * 新增
+ * 新增
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入record")
public R save(@Valid @RequestBody Record record) {
+ record.setType("2");
return R.status(recordService.save(record));
}
/**
- * 修改
+ * 修改
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@@ -102,7 +106,7 @@
}
/**
- * 新增或修改
+ * 新增或修改
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@@ -111,9 +115,9 @@
return R.status(recordService.saveOrUpdate(record));
}
-
+
/**
- * 删除
+ * 删除
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 8)
@@ -122,5 +126,5 @@
return R.status(recordService.removeByIds(Func.toLongList(ids)));
}
-
+
}
--
Gitblit v1.9.3