public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-15 05:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf(仪表板): 解决冲突合并代码

Browse Source
This commit is contained in:
fit2cloud-chenyw
2024-12-17 19:49:40 +08:00
parent a1a0780ed4 4518a16a99
commit 1927e9fbf7
69 changed files with 2196 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/embedded/api/EmbeddedApi.java
View File

@@ -1,5 +1,6 @@
package io.dataease.api.permissions.embedded.api;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.api.permissions.embedded.dto.EmbeddedCreator;
@@ -8,6 +9,7 @@ import io.dataease.api.permissions.embedded.dto.EmbeddedOrigin;
import io.dataease.api.permissions.embedded.dto.EmbeddedResetRequest;
import io.dataease.api.permissions.embedded.vo.EmbeddedGridVO;
import io.dataease.license.config.XpackResource;
import io.dataease.model.KeywordRequest;
import io.swagger.v3.oas.annotations.Hidden;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -28,8 +30,8 @@ public interface EmbeddedApi {
@Operation(summary = "查询")
@ApiOperationSupport(order = 1)
@GetMapping("/queryGrid")
List<EmbeddedGridVO> queryGrid();
@PostMapping("/pager/{goPage}/{pageSize}")
IPage<EmbeddedGridVO> queryGrid(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody KeywordRequest request);
@Operation(summary = "创建")
@ApiOperationSupport(order = 2)
@@ -47,6 +49,11 @@ public interface EmbeddedApi {
@PostMapping("/delete/{id}")
void delete(@PathVariable("id") Long id);
@Operation(summary = "批量删除")
@ApiOperationSupport(order = 4)
@PostMapping("/batchDelete")
void batchDelete(@RequestBody List<Long> ids);
@ApiOperationSupport(order = 5)
@Operation(summary = "重置密钥")
@PostMapping("/reset")