From d3c223eaa4df46d17c138ef8ed5eab8da9638416 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 10 Apr 2024 18:38:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/es/controller/EsController.java | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/springblade/es/controller/EsController.java b/src/main/java/org/springblade/es/controller/EsController.java
index cf08cc7..7aa4a08 100644
--- a/src/main/java/org/springblade/es/controller/EsController.java
+++ b/src/main/java/org/springblade/es/controller/EsController.java
@@ -5,7 +5,9 @@
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.annotation.PreAuth;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.Func;
import org.springblade.es.service.ElasticsearchDocumentService;
import org.springblade.es.vo.EsParam;
@@ -35,35 +37,37 @@
* 初始化
*/
@GetMapping("/init")
+ @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
@ApiOperationSupport(order = 2)
public R init(EsParam esParam) {
return R.status(elasticsearchDocumentService.init(esParam));
}
- /**
- * 新增数据
- */
- @GetMapping("/add")
- @ApiOperationSupport(order = 3)
- public R add(EsParam esParam) {
- return R.status(elasticsearchDocumentService.add(esParam,null));
- }
-
- /**
- * 修改数据
- */
- @GetMapping("/update")
- @ApiOperationSupport(order = 4)
- public R update(EsParam esParam) {
- elasticsearchDocumentService.update(esParam,null,null);
- return R.status(true);
- }
+// /**
+// * 新增数据
+// */
+// @GetMapping("/add")
+// @ApiOperationSupport(order = 3)
+// public R add(EsParam esParam) {
+// return R.status(elasticsearchDocumentService.add(esParam,null));
+// }
+//
+// /**
+// * 修改数据
+// */
+// @GetMapping("/update")
+// @ApiOperationSupport(order = 4)
+// public R update(EsParam esParam) {
+// elasticsearchDocumentService.update(esParam,null,null);
+// return R.status(true);
+// }
/**
* 根据索引删除
*/
@PostMapping("/removeBatchByIndexNames")
@ApiOperationSupport(order = 5)
+ @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
public R removeBatchByIndexNames(@RequestParam String indexNames) {
return R.status(elasticsearchDocumentService.removeBatchByIndexNames(Func.toStrList(indexNames)));
}
@@ -72,6 +76,7 @@
* 根据条件删除
*/
@PostMapping("/removeByQuery")
+ @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
@ApiOperationSupport(order = 6)
public R removeByQuery(EsParam esParam) {
return R.status(elasticsearchDocumentService.removeByQuery(esParam));
--
Gitblit v1.9.3