[dolphinscheduler] branch 2.0.1-prepare updated: fix worker group display (#7208) (#7211)

[leonbao]

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

leonbao pushed a commit to branch 2.0.1-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/2.0.1-prepare by this push:
     new 58f5f39  fix worker group display (#7208) (#7211)
58f5f39 is described below

commit 58f5f398bc5ec0c56f54501c412ce009147c273f
Author: JinYong Li <42576980+jinyleech...@users.noreply.github.com>
AuthorDate: Mon Dec 6 16:40:56 2021 +0800

    fix worker group display (#7208) (#7211)
---
 .../apache/dolphinscheduler/api/controller/SchedulerController.java  | 2 +-
 .../dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java
 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java
index 7df20da..e1edfea 100644
--- 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java
+++ 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java
@@ -143,7 +143,7 @@ public class SchedulerController extends BaseController {
         @ApiImplicitParam(name = "warningType", value = "WARNING_TYPE", type = 
"WarningType"),
         @ApiImplicitParam(name = "warningGroupId", value = "WARNING_GROUP_ID", 
dataType = "Int", example = "100"),
         @ApiImplicitParam(name = "failureStrategy", value = 
"FAILURE_STRATEGY", type = "FailureStrategy"),
-        @ApiImplicitParam(name = "workerGroupId", value = "WORKER_GROUP_ID", 
dataType = "Int", example = "100"),
+        @ApiImplicitParam(name = "workerGroup", value = "WORKER_GROUP", 
dataType = "String", example = "default"),
         @ApiImplicitParam(name = "processInstancePriority", value = 
"PROCESS_INSTANCE_PRIORITY", type = "Priority"),
         @ApiImplicitParam(name = "environmentCode", value = 
"ENVIRONMENT_CODE", dataType = "Long"),
     })
diff --git 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java
 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java
index 46a9241..05adaa5 100644
--- 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java
+++ 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java
@@ -287,8 +287,9 @@ public class WorkerGroupServiceImpl extends BaseServiceImpl 
implements WorkerGro
             if (isPaging) {
                 wg.setAddrList(String.join(Constants.COMMA, childrenNodes));
                 String registeredValue = registryClient.get(workerGroupPath + 
Constants.SINGLE_SLASH + childrenNodes.iterator().next());
-                
wg.setCreateTime(DateUtils.stringToDate(registeredValue.split(Constants.COMMA)[6]));
-                
wg.setUpdateTime(DateUtils.stringToDate(registeredValue.split(Constants.COMMA)[7]));
+                String[] rv = registeredValue.split(Constants.COMMA);
+                wg.setCreateTime(new Date(Long.parseLong(rv[6])));
+                wg.setUpdateTime(new Date(Long.parseLong(rv[7])));
                 wg.setSystemDefault(true);
             }
             workerGroups.add(wg);