From 5236fa7ebc2e5f671c56dc07a7ab907fb3aefcda Mon Sep 17 00:00:00 2001 From: ulleo Date: Tue, 1 Apr 2025 17:49:51 +0800 Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20[=E6=95=B0=E6=8D=AE=E5=A1=AB?= =?UTF-8?q?=E6=8A=A5]=E6=8F=90=E4=BA=A4=E8=AE=B0=E5=BD=95=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=94=AF=E6=8C=81=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/locales/en.ts | 2 ++ core/core-frontend/src/locales/tw.ts | 2 ++ core/core-frontend/src/locales/zh-CN.ts | 2 ++ .../api/xpack/dataFilling/DataFillingApi.java | 5 +++++ .../dto/DfClearCommitLogRequest.java | 20 +++++++++++++++++++ 5 files changed, 31 insertions(+) create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfClearCommitLogRequest.java diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index 777c9e0411..61c22e5270 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -4389,6 +4389,8 @@ export default { data_not_found: '] does not exist' }, task: { + commit_operate_type: 'Commit type', + committer: 'Committer', time_check_5_minute_later_than_current: 'Cannot be less than 5 minutes after the current time', time_check_later_than_current: 'Cannot be less than the current time', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index a55cad767f..589d632049 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -4073,6 +4073,8 @@ export default { save_apply: '儲存並套用' }, data_fill: { + commit_operate_type: '提交類型', + committer: '提交人', data_fill: '資料填報', fill_in_the_task: '填報任務', data_fill_name: '資料填報名稱', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 678c72ddd6..39161d1861 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -4271,6 +4271,8 @@ export default { data_not_found: ']的数据不存在' }, task: { + commit_operate_type: '提交类型', + committer: '提交人', send_status: '任务下发状态', df_task_status: '任务填报状态', time_check_5_minute_later_than_current: '不能小于当前时间5分钟后', 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 26a1378faa..f924a2caff 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 @@ -169,6 +169,11 @@ public interface DataFillingApi { @PostMapping("/log/page/{goPage}/{pageSize}") IPage logPager(@RequestBody DfCommitLogRequest request, @PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize); + @Operation(summary = "清理数据填报操作日志") + @DePermit({"#p0.formId+':manage'"}) + @PostMapping("/log/clear") + void clearLog(@RequestBody DfClearCommitLogRequest request) throws Exception; + @Operation(summary = "上传Excel") @DePermit({"#p0+':manage'"}) @PostMapping("/form/{formId}/uploadFile") diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfClearCommitLogRequest.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfClearCommitLogRequest.java new file mode 100644 index 0000000000..2cfad490e0 --- /dev/null +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfClearCommitLogRequest.java @@ -0,0 +1,20 @@ +package io.dataease.api.xpack.dataFilling.dto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +@Data +public class DfClearCommitLogRequest implements Serializable { + + @Serial + private static final long serialVersionUID = 807091582312182724L; + + @JsonSerialize(using = ToStringSerializer.class) + private Long formId; + + private String clearType; +}