center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #11462 from dataease/pr@dev-v2@perf_data_fill_auth

Browse Source 
perf(X-Pack): 权限矩阵增加数据填报
This commit is contained in:
fit2cloud-chenyw 2024-08-09 12:13:14 +08:00 committed by GitHub
commit 32bf7d278c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
de-xpack

@ -1 +1 @@
Subproject commit 4481e6aa512c3f1e37975ef8f34a8fb14a9d9962
Subproject commit 4bdf44b1e1912ad26b1f20172ca468efb410f985

2
sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java
View File

@ -6,6 +6,7 @@ import io.dataease.api.report.dto.ReportInstanceMsgRequest;
import io.dataease.api.report.vo.ReportGridVO;
import io.dataease.api.xpack.dataFilling.dto.*;
import io.dataease.auth.DeApiPath;
import io.dataease.auth.DePermit;
import io.dataease.exception.DEException;
import io.dataease.extensions.datasource.dto.SimpleDatasourceDTO;
import io.dataease.model.BusiNodeRequest;
@ -29,6 +30,7 @@ public interface DataFillingApi {
@PostMapping("tree")
List<BusiNodeVO> tree(@RequestBody BusiNodeRequest request) throws DEException;
@DePermit({"#p0+':read'"})
@GetMapping("/get/{id}")
DataFillingDTO get(@PathVariable("id") Long id);

7
sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/api/SyncDatasourceApi.java
View File

@ -6,7 +6,6 @@ import io.dataease.api.sync.datasource.dto.GetDatasourceRequest;
import io.dataease.api.sync.datasource.dto.SyncDatasourceDTO;
import io.dataease.api.sync.datasource.vo.SyncDatasourceVO;
import io.dataease.auth.DeApiPath;
import io.dataease.auth.DePermit;
import io.dataease.exception.DEException;
import io.dataease.request.BaseGridRequest;
import org.springframework.web.bind.annotation.GetMapping;
@ -36,7 +35,7 @@ public interface SyncDatasourceApi {
void save(@RequestBody SyncDatasourceDTO dataSourceDTO) throws DEException;
@PostMapping("/update")
Map<String,Object> update(@RequestBody SyncDatasourceDTO dataSourceDTO) throws DEException;
Map<String, Object> update(@RequestBody SyncDatasourceDTO dataSourceDTO) throws DEException;
@PostMapping("/delete/{datasourceId}")
void delete(@PathVariable("datasourceId") String datasourceId) throws DEException;
@ -63,7 +62,7 @@ public interface SyncDatasourceApi {
void batchDel(@RequestBody List<String> ids) throws DEException;
@PostMapping("/fields")
Map<String, Object> getFields(@RequestBody GetDatasourceRequest getDsRequest) throws DEException ;
Map<String, Object> getFields(@RequestBody GetDatasourceRequest getDsRequest) throws DEException;
@GetMapping("/list/{type}")
List<SyncDatasourceDTO> listByType(@PathVariable("type") String type) throws DEException;
@ -72,6 +71,4 @@ public interface SyncDatasourceApi {
List<DBTableDTO> getTableList(@PathVariable("dsId") String dsId) throws DEException;
}

2
sdk/common/src/main/java/io/dataease/constant/AuthResourceEnum.java
View File

@ -2,7 +2,7 @@ package io.dataease.constant;
public enum AuthResourceEnum {
PANEL(2, 1), SCREEN(3, 2), DATASET(5, 3), DATASOURCE(6, 4), SYSTEM(7, 0), USER(8, 5), ROLE(8, 6), ORG(9, 7), SYNC_DATASOURCE(23, 8), TASK(24, 9), SUMMARY(22, 10), DATA_FILLING(60, 11);
PANEL(2, 1), SCREEN(3, 2), DATASET(5, 3), DATASOURCE(6, 4), SYSTEM(7, 0), USER(8, 5), ROLE(8, 6), ORG(9, 7), SYNC_DATASOURCE(23, 9), TASK(24, 9), SUMMARY(22, 9), DATA_FILLING(60, 8);
private long menuId;