[dolphinscheduler] branch dev updated: [Fix-7773][Api] malform batchDeleteProcessInstanceByIds log output (#7774)

[caishunfeng]

This is an automated email from the ASF dual-hosted git repository.

caishunfeng pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new e34a8bc  [Fix-7773][Api] malform batchDeleteProcessInstanceByIds log 
output (#7774)
e34a8bc is described below

commit e34a8bc3dcc3e8036d18b28fc0a564a45341035a
Author: xiangzihao <460888...@qq.com>
AuthorDate: Tue Jan 4 10:11:06 2022 +0800

    [Fix-7773][Api] malform batchDeleteProcessInstanceByIds log output (#7774)
    
    * bug_7773
    
    * bug_7773
    
    * bug_7773
    
    * bug_7773
    
    * bug_7773
---
 .../src/main/java/org/apache/dolphinscheduler/api/enums/Status.java   | 2 +-
 .../dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
index 3b5427d..2e5f3fc 100644
--- 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
+++ 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
@@ -166,7 +166,7 @@ public enum Status {
     NAME_EXIST(10135, "name {0} already exists", "名称[{0}]已存在"),
     SAVE_ERROR(10136, "save error", "保存错误"),
     DELETE_PROJECT_ERROR_DEFINES_NOT_NULL(10137, "please delete the process 
definitions in project first!", "请先删除全部工作流定义"),
-    BATCH_DELETE_PROCESS_INSTANCE_BY_IDS_ERROR(10117, "batch delete process 
instance by ids {0} error", "批量删除工作流实例错误"),
+    BATCH_DELETE_PROCESS_INSTANCE_BY_IDS_ERROR(10117, "batch delete process 
instance by ids {0} error", "批量删除工作流实例错误: {0}"),
     PREVIEW_SCHEDULE_ERROR(10139, "preview schedule error", "预览调度配置错误"),
     PARSE_TO_CRON_EXPRESSION_ERROR(10140, "parse cron to cron expression 
error", "解析调度表达式错误"),
     SCHEDULE_START_TIME_END_TIME_SAME(10141, "The start time must not be the 
same as the end", "开始时间不能和结束时间一样"),
diff --git 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java
 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java
index f4f1e2f..179f361 100644
--- 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java
+++ 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java
@@ -612,13 +612,13 @@ public class ProcessInstanceServiceImpl extends 
BaseServiceImpl implements Proce
         }
         ProcessInstance processInstance = 
processService.findProcessInstanceDetailById(processInstanceId);
         if (null == processInstance) {
-            putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, 
processInstanceId);
+            putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, 
String.valueOf(processInstanceId));
             return result;
         }
 
         ProcessDefinition processDefinition = 
processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode());
         if (processDefinition != null && projectCode != 
processDefinition.getProjectCode()) {
-            putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, 
processInstanceId);
+            putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, 
String.valueOf(processInstanceId));
             return result;
         }