From 36a72f73278e6faab61e0049a8bf1c744fcfca98 Mon Sep 17 00:00:00 2001
From: lanyuanxiaoyao <lanyuanxiaoyao@gmail.com>
Date: Tue, 13 Jun 2023 15:10:18 +0800
Subject: [PATCH] =?UTF-8?q?fix(web):=20=E4=BF=AE=E5=A4=8D=20version=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20id=20=E7=B2=BE=E5=BA=A6=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/OverviewController.java    |  3 +-
 .../service/web/entity/JobIdAndAliasVO.java   | 41 +++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/JobIdAndAliasVO.java

diff --git a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/OverviewController.java b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/OverviewController.java
index 09b9609..3cc543d 100644
--- a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/OverviewController.java
+++ b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/OverviewController.java
@@ -10,6 +10,7 @@ import com.lanyuanxiaoyao.service.configuration.entity.yarn.YarnRootQueue;
 import com.lanyuanxiaoyao.service.forest.service.InfoService;
 import com.lanyuanxiaoyao.service.forest.service.QueueService;
 import com.lanyuanxiaoyao.service.forest.service.YarnService;
+import com.lanyuanxiaoyao.service.web.entity.JobIdAndAliasVO;
 import org.eclipse.collections.api.factory.Lists;
 import org.eclipse.collections.api.factory.Maps;
 import org.eclipse.collections.api.list.ImmutableList;
@@ -150,6 +151,6 @@ public class OverviewController extends BaseController {
         } else {
             throw new Exception("Target not found " + target);
         }
-        return responseCrudData(jobIdAndAliases);
+        return responseCrudData(jobIdAndAliases.collect(JobIdAndAliasVO::new));
     }
 }
diff --git a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/JobIdAndAliasVO.java b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/JobIdAndAliasVO.java
new file mode 100644
index 0000000..1824dbd
--- /dev/null
+++ b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/JobIdAndAliasVO.java
@@ -0,0 +1,41 @@
+package com.lanyuanxiaoyao.service.web.entity;
+
+import com.lanyuanxiaoyao.service.configuration.entity.info.JobIdAndAlias;
+
+/**
+ * @author lanyuanxiaoyao
+ * @date 2023-06-13
+ */
+public class JobIdAndAliasVO {
+    private final String id;
+    private final String alias;
+
+    public JobIdAndAliasVO(String id, String alias) {
+        this.id = id;
+        this.alias = alias;
+    }
+
+    public JobIdAndAliasVO(Long id, String alias) {
+        this(id.toString(), alias);
+    }
+
+    public JobIdAndAliasVO(JobIdAndAlias jiaa) {
+        this(jiaa.getId(), jiaa.getAlias());
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getAlias() {
+        return alias;
+    }
+
+    @Override
+    public String toString() {
+        return "JobIdAndAliasVO{" +
+                "id='" + id + '\'' +
+                ", alias='" + alias + '\'' +
+                '}';
+    }
+}