From 643cb66759d06f84d134b9247087fcf730c72f09 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Wed, 14 Aug 2024 13:47:03 +0800
Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20=E8=B0=83=E6=95=B4=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=A1=AB=E6=8A=A5=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 de-xpack                                      |  2 +-
 .../api/xpack/dataFilling/DataFillingApi.java | 39 +++++++++----------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/de-xpack b/de-xpack
index c274ebbb22..3718015f9b 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit c274ebbb22e31d05c63c5ff8e1eee9799dc97af2
+Subproject commit 3718015f9bae51a22cabfd6a3dacc7fe4be7e2d5
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 7ad9234e30..1b073d2744 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
@@ -31,15 +31,18 @@ public interface DataFillingApi {
     @GetMapping("/get/{id}")
     DataFillingDTO get(@PathVariable("id") Long id);
 
-    @DePermit({"#p0+':manage'"})
+    @DePermit({"#p0.id+':manage'"})
     @PostMapping("/move")
     DataFillingDTO move(@RequestBody DataFillingDTO dataFillingDTO);
 
-    @DePermit({"#p0+':manage'"})
     @PostMapping("/save")
     DataFillingDTO save(@RequestBody DataFillingDTO dataFillingDTO) throws Exception;
 
-    @DePermit({"#p0+':manage'"})
+    @DePermit({"#p0.id+':manage'"})
+    @PostMapping("/update")
+    DataFillingDTO update(@RequestBody DataFillingDTO dataFillingDTO) throws Exception;
+
+    @DePermit({"#p0.id+':manage'"})
     @PostMapping("/rename")
     DataFillingDTO rename(@RequestBody DataFillingDTO dataFillingDTO);
 
@@ -47,7 +50,6 @@ public interface DataFillingApi {
     @GetMapping("delete/{id}")
     void delete(@PathVariable("id") Long id);
 
-    @DePermit({"#p0+':manage'"})
     @GetMapping("/datasource/list")
     List<SimpleDatasourceDTO> listDatasourceList();
 
@@ -68,43 +70,38 @@ public interface DataFillingApi {
     @PostMapping("/form/{formId}/rowData/save")
     DataFillFormTableDataResponse saveRowData(@PathVariable("formId") Long formId, @RequestBody Map<String, Object> data) throws Exception;
 
-    @DePermit({"#p0+':manage'"})
     @GetMapping("/task/info/{taskId}")
     TaskInfoVO info(@PathVariable("taskId") Long taskId);
 
-    @DePermit({"#p0+':manage'"})
+    @DePermit({"#p0.formId+':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<ReportGridVO> taskPager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody DfTaskInfoRequest request);
 
-    @DePermit({"#p0+':manage'"})
     @PostMapping("/sub-task/page/{goPage}/{pageSize}")
     IPage<DfSubTaskVo> subTaskPager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody DfSubTaskInfoRequest request);
 
     @DePermit({"#p0+':manage'"})
-    @PostMapping("/task/delete")
-    void batchDeleteTask(@RequestBody List<Long> ids) throws Exception;
+    @PostMapping("/form/{formId}/task/delete")
+    void batchDeleteTask(@PathVariable("formId") Long formId, @RequestBody List<Long> ids) throws Exception;
 
     @DePermit({"#p0+':manage'"})
-    @GetMapping("/task/{id}/stop")
-    void stopTask(@PathVariable("id") Long id) throws Exception;
+    @GetMapping("/form/{formId}/task/{id}/stop")
+    void stopTask(@PathVariable("formId") Long formId, @PathVariable("id") Long id) throws Exception;
 
     @DePermit({"#p0+':manage'"})
-    @GetMapping("/task/{id}/start")
-    void startTask(@PathVariable("id") Long id) throws Exception;
+    @GetMapping("/form/{formId}/task/{id}/start")
+    void startTask(@PathVariable("formId") Long formId, @PathVariable("id") Long id) throws Exception;
 
     @DePermit({"#p0+':manage'"})
-    @PostMapping("/sub-task/delete")
-    void batchDeleteSubTask(@RequestBody List<Long> ids) throws Exception;
+    @PostMapping("/form/{formId}/sub-task/delete")
+    void batchDeleteSubTask(@PathVariable("formId") Long formId, @RequestBody List<Long> ids) throws Exception;
 
-    @DePermit({"#p0+':manage'"})
     @GetMapping("/sub-task/{id}/users/list/{type}")
     List<Map<String, Object>> listSubTaskUser(@PathVariable("id") Long id, @PathVariable("type") String type) throws Exception;
 
@@ -117,14 +114,14 @@ public interface DataFillingApi {
     @PostMapping("/user-task/saveData/{id}")
     DataFillFormTableDataResponse saveFormRowData(@PathVariable("id") Long id, @RequestBody Map<String, Object> data) throws Exception;
 
-    @DePermit({"#p0+':read'"})
+    @DePermit({"#p0.formId+':read'"})
     @PostMapping("/log/page/{goPage}/{pageSize}")
-    IPage<DfCommitLog> logPager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody DfCommitLogRequest request);
+    IPage<DfCommitLog> logPager(@RequestBody DfCommitLogRequest request, @PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize);
 
 
     @DePermit({"#p0+':manage'"})
     @PostMapping("/form/{formId}/uploadFile")
-    DfExcelData excelUpload(@RequestParam("file") MultipartFile file, @PathVariable("formId") Long formId) throws Exception;
+    DfExcelData excelUpload(@PathVariable("formId") Long formId, @RequestParam("file") MultipartFile file) throws Exception;
 
     @DePermit({"#p0+':manage'"})
     @GetMapping("/form/{formId}/excelTemplate")