diff --git a/de-xpack b/de-xpack index e21f4e6dc4..c396d21e32 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit e21f4e6dc4bd39a5db78594e993a11205f9bff26 +Subproject commit c396d21e32416f6e16f5670d0773c2c60287dfa3 diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java index c9c8c67e00..7ad9234e30 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java @@ -28,22 +28,26 @@ public interface DataFillingApi { @PostMapping("tree") List tree(@RequestBody BusiNodeRequest request) throws DEException; - @DePermit({"#p0+':read'"}) @GetMapping("/get/{id}") DataFillingDTO get(@PathVariable("id") Long id); + @DePermit({"#p0+':manage'"}) @PostMapping("/move") DataFillingDTO move(@RequestBody DataFillingDTO dataFillingDTO); + @DePermit({"#p0+':manage'"}) @PostMapping("/save") DataFillingDTO save(@RequestBody DataFillingDTO dataFillingDTO) throws Exception; + @DePermit({"#p0+':manage'"}) @PostMapping("/rename") DataFillingDTO rename(@RequestBody DataFillingDTO dataFillingDTO); + @DePermit({"#p0+':manage'"}) @GetMapping("delete/{id}") void delete(@PathVariable("id") Long id); + @DePermit({"#p0+':manage'"}) @GetMapping("/datasource/list") List listDatasourceList(); @@ -53,44 +57,54 @@ public interface DataFillingApi { @PostMapping("/form/{id}/tableData") DataFillFormTableDataResponse tableData(@PathVariable("id") Long id, @RequestBody DataFillFormTableDataRequest request) throws Exception; + @DePermit({"#p0+':manage'"}) @GetMapping("/form/{formId}/delete/{id}") void deleteRowData(@PathVariable("formId") Long formId, @PathVariable("id") Long id) throws Exception; + @DePermit({"#p0+':manage'"}) @PostMapping("/form/{formId}/batch-delete") void batchDeleteRowData(@PathVariable("formId") Long formId, @RequestBody List ids) throws Exception; @PostMapping("/form/{formId}/rowData/save") DataFillFormTableDataResponse saveRowData(@PathVariable("formId") Long formId, @RequestBody Map data) throws Exception; - + @DePermit({"#p0+':manage'"}) @GetMapping("/task/info/{taskId}") TaskInfoVO info(@PathVariable("taskId") Long taskId); - + @DePermit({"#p0+':manage'"}) @PostMapping("/task/save") Long save(@RequestBody TaskInfoVO task); + @DePermit({"#p0+':read'"}) @PostMapping("/task/logMsg") String logMsg(@RequestBody ReportInstanceMsgRequest request); + @DePermit({"#p0+':manage'"}) @PostMapping("/task/page/{goPage}/{pageSize}") IPage taskPager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody DfTaskInfoRequest request); + @DePermit({"#p0+':manage'"}) @PostMapping("/sub-task/page/{goPage}/{pageSize}") IPage subTaskPager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody DfSubTaskInfoRequest request); + @DePermit({"#p0+':manage'"}) @PostMapping("/task/delete") void batchDeleteTask(@RequestBody List ids) throws Exception; + @DePermit({"#p0+':manage'"}) @GetMapping("/task/{id}/stop") void stopTask(@PathVariable("id") Long id) throws Exception; + @DePermit({"#p0+':manage'"}) @GetMapping("/task/{id}/start") void startTask(@PathVariable("id") Long id) throws Exception; + @DePermit({"#p0+':manage'"}) @PostMapping("/sub-task/delete") void batchDeleteSubTask(@RequestBody List ids) throws Exception; + @DePermit({"#p0+':manage'"}) @GetMapping("/sub-task/{id}/users/list/{type}") List> listSubTaskUser(@PathVariable("id") Long id, @PathVariable("type") String type) throws Exception; @@ -103,17 +117,20 @@ public interface DataFillingApi { @PostMapping("/user-task/saveData/{id}") DataFillFormTableDataResponse saveFormRowData(@PathVariable("id") Long id, @RequestBody Map data) throws Exception; - + @DePermit({"#p0+':read'"}) @PostMapping("/log/page/{goPage}/{pageSize}") - IPage taskPager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody DfCommitLogRequest request); + IPage logPager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody DfCommitLogRequest request); + @DePermit({"#p0+':manage'"}) @PostMapping("/form/{formId}/uploadFile") DfExcelData excelUpload(@RequestParam("file") MultipartFile file, @PathVariable("formId") Long formId) throws Exception; + @DePermit({"#p0+':manage'"}) @GetMapping("/form/{formId}/excelTemplate") void excelTemplate(@PathVariable("formId") Long formId); + @DePermit({"#p0+':manage'"}) @PostMapping("/form/{formId}/confirmUpload") void confirmUpload(@PathVariable("formId") Long formId, @RequestBody Map data); }