From 9c41aa48cf856308cccf855ad9535b5526c79f84 Mon Sep 17 00:00:00 2001
From: v_kkhuang <420895376@qq.com>
Date: Thu, 19 Oct 2023 09:47:03 +0800
Subject: [PATCH 1/3] push taskprediction  code

---
 .../linkis-application-manager/pom.xml        |   5 +
 .../manager/am/restful/EMRestfulApi.java      | 131 ++++++++++++++++++
 2 files changed, 136 insertions(+)

diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml b/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml
index 289939aa3c..9d3cc8a048 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml
@@ -115,6 +115,11 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.linkis</groupId>
+      <artifactId>linkis-computation-governance-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java
index 1ed66173d4..b6c98afe23 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java
@@ -20,6 +20,8 @@
 import org.apache.linkis.common.ServiceInstance;
 import org.apache.linkis.common.conf.Configuration;
 import org.apache.linkis.common.utils.JsonUtils;
+import org.apache.linkis.governance.common.protocol.conf.TenantRequest;
+import org.apache.linkis.governance.common.protocol.conf.TenantResponse;
 import org.apache.linkis.manager.am.conf.AMConfiguration;
 import org.apache.linkis.manager.am.converter.DefaultMetricsConverter;
 import org.apache.linkis.manager.am.exception.AMErrorCode;
@@ -35,16 +37,32 @@
 import org.apache.linkis.manager.common.entity.node.EMNode;
 import org.apache.linkis.manager.common.entity.node.EngineNode;
 import org.apache.linkis.manager.common.entity.persistence.ECResourceInfoRecord;
+import org.apache.linkis.manager.common.entity.persistence.PersistenceLabelRel;
+import org.apache.linkis.manager.common.entity.persistence.PersistenceResource;
+import org.apache.linkis.manager.common.entity.resource.UserResource;
 import org.apache.linkis.manager.common.protocol.OperateRequest$;
 import org.apache.linkis.manager.common.protocol.em.ECMOperateRequest;
 import org.apache.linkis.manager.common.protocol.em.ECMOperateRequest$;
 import org.apache.linkis.manager.common.protocol.em.ECMOperateResponse;
+import org.apache.linkis.manager.common.utils.ResourceUtils;
+import org.apache.linkis.manager.exception.PersistenceErrorException;
+import org.apache.linkis.manager.label.builder.CombinedLabelBuilder;
 import org.apache.linkis.manager.label.builder.factory.LabelBuilderFactory;
 import org.apache.linkis.manager.label.builder.factory.LabelBuilderFactoryContext;
 import org.apache.linkis.manager.label.entity.Label;
 import org.apache.linkis.manager.label.entity.UserModifiable;
+import org.apache.linkis.manager.label.entity.engine.EngineTypeLabel;
+import org.apache.linkis.manager.label.entity.engine.UserCreatorLabel;
 import org.apache.linkis.manager.label.exception.LabelErrorException;
 import org.apache.linkis.manager.label.service.NodeLabelService;
+import org.apache.linkis.manager.persistence.LabelManagerPersistence;
+import org.apache.linkis.manager.persistence.ResourceManagerPersistence;
+import org.apache.linkis.manager.rm.restful.RMMonitorRest;
+import org.apache.linkis.manager.rm.restful.vo.UserCreatorEngineType;
+import org.apache.linkis.manager.rm.restful.vo.UserResourceVo;
+import org.apache.linkis.manager.rm.utils.RMUtils;
+import org.apache.linkis.rpc.Sender;
+import org.apache.linkis.server.BDPJettyServerHelper;
 import org.apache.linkis.server.Message;
 import org.apache.linkis.server.utils.ModuleUserUtils;
 
@@ -68,6 +86,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.google.common.collect.Lists;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -95,6 +114,11 @@ public class EMRestfulApi {
   @Autowired private ECMOperateService ecmOperateService;
 
   @Autowired private ECResourceInfoService ecResourceInfoService;
+
+  @Autowired private ResourceManagerPersistence resourceManagerPersistence;
+
+  @Autowired private LabelManagerPersistence labelManagerPersistence;
+
   private LabelBuilderFactory stdLabelBuilderFactory =
       LabelBuilderFactoryContext.getLabelBuilderFactory();
 
@@ -492,4 +516,111 @@ private Message executeECMOperation(
         .data("errorMsg", engineOperateResponse.errorMsg())
         .data("isError", engineOperateResponse.isError());
   }
+
+  @ApiOperationSupport(ignoreParameters = {"jsonNode"})
+  @RequestMapping(path = "/taskprediction", method = RequestMethod.GET)
+  public Message taskprediction(
+      HttpServletRequest req,
+      @RequestParam(value = "username", required = false) String username,
+      @RequestParam(value = "engineType", required = false) String engineType,
+      @RequestParam(value = "creator", required = false) String creator)
+      throws PersistenceErrorException, LabelErrorException {
+    //    String userName = ModuleUserUtils.getOperationUser(req, "taskprediction");
+    // 获取yarn资源数据和用户资源数据
+    String searchUsername = StringUtils.isEmpty(username) ? "" : username;
+    String searchCreator = StringUtils.isEmpty(creator) ? "" : creator;
+    String searchEngineType = StringUtils.isEmpty(engineType) ? "" : engineType;
+    LabelBuilderFactory labelFactory = LabelBuilderFactoryContext.getLabelBuilderFactory();
+    UserCreatorLabel userCreatorLabel = labelFactory.createLabel(UserCreatorLabel.class);
+    EngineTypeLabel engineTypeLabel = labelFactory.createLabel(EngineTypeLabel.class);
+    Label<?> combinedLabel =
+        new CombinedLabelBuilder().build("", Lists.newArrayList(userCreatorLabel, engineTypeLabel));
+    String labelKey = combinedLabel.getLabelKey();
+    String labelValuePattern =
+        MessageFormat.format(
+            "%{0}%,%{1}%,%{2}%,%", searchCreator, searchUsername, searchEngineType);
+    List<PersistenceLabelRel> userLabels =
+        labelManagerPersistence.getLabelByPattern(labelValuePattern, labelKey, 0, 0);
+    List<PersistenceResource> resourceByLabels =
+        resourceManagerPersistence.getResourceByLabels(userLabels);
+    List<UserResourceVo> userResources = new ArrayList<>();
+    // 4. Store users and resources in Vo
+    for (PersistenceResource resource : resourceByLabels) {
+      UserResource userResource = ResourceUtils.fromPersistenceResourceAndUser(resource);
+      PersistenceLabelRel userLabel = null;
+      for (PersistenceLabelRel label : userLabels) {
+        if (label.getResourceId().equals(resource.getId())) {
+          userLabel = label;
+        }
+      }
+      if (userLabel != null) {
+        UserCreatorEngineType userCreatorEngineType =
+            BDPJettyServerHelper.gson()
+                .fromJson(userLabel.getStringValue(), UserCreatorEngineType.class);
+        if (userCreatorEngineType != null) {
+          userResource.setUsername(userCreatorEngineType.getUser());
+          userResource.setCreator(userCreatorEngineType.getCreator());
+          userResource.setEngineType(userCreatorEngineType.getEngineType());
+          userResource.setVersion(userCreatorEngineType.getVersion());
+        }
+      }
+      userResources.add(RMUtils.toUserResourceVo(userResource));
+    }
+
+
+
+    // 获取租户标签数据
+    String tenant = "";
+    List<EMNodeVo> emNodeVos = AMUtils.copyToEMVo(emInfoService.getAllEM());
+    List<EMNodeVo> emNodeList = new ArrayList<>();
+    for (EMNodeVo emNodeVo : emNodeVos) {
+      List<Label> labels = emNodeVo.getLabels();
+      //    tenant不为空
+      if (StringUtils.isNotBlank(tenant)) {
+        String finalTenant = tenant;
+        labels =
+            labels.stream()
+                .filter(
+                    label ->
+                        KEY_TENANT.equals(label.getLabelKey())
+                            && label.getStringValue().contains(finalTenant))
+                .collect(Collectors.toList());
+        if (labels.size() > 0) {
+          emNodeList.add(emNodeVo);
+        }
+      } else {
+        labels =
+            labels.stream()
+                .filter(label -> !KEY_TENANT.equals(label.getLabelKey()))
+                .collect(Collectors.toList());
+        if (labels.size() > 0) {
+          emNodeList.add(emNodeVo);
+        }
+      }
+      if (labels.size() > 0) {
+        emNodeList.add(emNodeVo);
+      }
+    }
+
+    // 获取租户标签数据
+    Sender sender =
+        Sender.getSender(
+            Configuration.CLOUD_CONSOLE_CONFIGURATION_SPRING_APPLICATION_NAME().getValue());
+    TenantResponse ask = (TenantResponse) sender.ask(new TenantRequest(username, creator));
+    if (null == ask) {
+      ask = (TenantResponse) sender.ask(new TenantRequest(username, "*"));
+      if (null == ask) {
+        ask = (TenantResponse) sender.ask(new TenantRequest("*", creator));
+        if (null != ask) {
+          tenant = ask.tenant();
+        }
+      } else {
+        tenant = ask.tenant();
+      }
+    } else {
+      tenant = ask.tenant();
+    }
+
+    return Message.ok().data("test", userResources);
+  }
 }

From 5212d81afeb0c0174fe2c0b2b956e719607ffcd6 Mon Sep 17 00:00:00 2001
From: v_kkhuang <420895376@qq.com>
Date: Mon, 23 Oct 2023 14:27:15 +0800
Subject: [PATCH 2/3] push code

---
 .../manager/am/restful/EMRestfulApi.java      | 178 +++++++++---------
 .../apache/linkis/manager/am/vo/ConfigVo.java |  64 +++++++
 .../manager/rm/restful/RMMonitorRest.scala    |  30 +--
 .../linkis/manager/rm/utils/RMUtils.scala     |  57 +++++-
 4 files changed, 204 insertions(+), 125 deletions(-)
 create mode 100644 linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/vo/ConfigVo.java

diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java
index b6c98afe23..807facb73a 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java
@@ -31,6 +31,7 @@
 import org.apache.linkis.manager.am.service.em.ECMOperateService;
 import org.apache.linkis.manager.am.service.em.EMInfoService;
 import org.apache.linkis.manager.am.utils.AMUtils;
+import org.apache.linkis.manager.am.vo.ConfigVo;
 import org.apache.linkis.manager.am.vo.EMNodeVo;
 import org.apache.linkis.manager.common.entity.enumeration.NodeHealthy;
 import org.apache.linkis.manager.common.entity.metrics.NodeHealthyInfo;
@@ -39,30 +40,22 @@
 import org.apache.linkis.manager.common.entity.persistence.ECResourceInfoRecord;
 import org.apache.linkis.manager.common.entity.persistence.PersistenceLabelRel;
 import org.apache.linkis.manager.common.entity.persistence.PersistenceResource;
-import org.apache.linkis.manager.common.entity.resource.UserResource;
 import org.apache.linkis.manager.common.protocol.OperateRequest$;
 import org.apache.linkis.manager.common.protocol.em.ECMOperateRequest;
 import org.apache.linkis.manager.common.protocol.em.ECMOperateRequest$;
 import org.apache.linkis.manager.common.protocol.em.ECMOperateResponse;
-import org.apache.linkis.manager.common.utils.ResourceUtils;
 import org.apache.linkis.manager.exception.PersistenceErrorException;
-import org.apache.linkis.manager.label.builder.CombinedLabelBuilder;
 import org.apache.linkis.manager.label.builder.factory.LabelBuilderFactory;
 import org.apache.linkis.manager.label.builder.factory.LabelBuilderFactoryContext;
 import org.apache.linkis.manager.label.entity.Label;
 import org.apache.linkis.manager.label.entity.UserModifiable;
-import org.apache.linkis.manager.label.entity.engine.EngineTypeLabel;
-import org.apache.linkis.manager.label.entity.engine.UserCreatorLabel;
 import org.apache.linkis.manager.label.exception.LabelErrorException;
 import org.apache.linkis.manager.label.service.NodeLabelService;
 import org.apache.linkis.manager.persistence.LabelManagerPersistence;
 import org.apache.linkis.manager.persistence.ResourceManagerPersistence;
-import org.apache.linkis.manager.rm.restful.RMMonitorRest;
-import org.apache.linkis.manager.rm.restful.vo.UserCreatorEngineType;
 import org.apache.linkis.manager.rm.restful.vo.UserResourceVo;
 import org.apache.linkis.manager.rm.utils.RMUtils;
 import org.apache.linkis.rpc.Sender;
-import org.apache.linkis.server.BDPJettyServerHelper;
 import org.apache.linkis.server.Message;
 import org.apache.linkis.server.utils.ModuleUserUtils;
 
@@ -70,6 +63,10 @@
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -77,6 +74,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 
+import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -85,8 +83,8 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.google.common.collect.Lists;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -523,104 +521,98 @@ public Message taskprediction(
       HttpServletRequest req,
       @RequestParam(value = "username", required = false) String username,
       @RequestParam(value = "engineType", required = false) String engineType,
-      @RequestParam(value = "creator", required = false) String creator)
-      throws PersistenceErrorException, LabelErrorException {
+      @RequestParam(value = "creator", required = false) String creator,
+      @RequestParam(value = "queueName", required = false) String queueName,
+      @RequestParam(value = "tenant", required = false) String tenant)
+      throws PersistenceErrorException {
     //    String userName = ModuleUserUtils.getOperationUser(req, "taskprediction");
+    String tokenName = "";
+    if (StringUtils.isBlank(username)) {
+      username = tokenName;
+    }
+    if (StringUtils.isBlank(engineType)) {
+      Message.error("parameters:engineType can't be null (请求参数【engineType】不能为空)");
+    }
+    if (StringUtils.isBlank(creator)) {
+      Message.error("parameters:creator can't be null (请求参数【creator】不能为空)");
+    }
     // 获取yarn资源数据和用户资源数据
-    String searchUsername = StringUtils.isEmpty(username) ? "" : username;
-    String searchCreator = StringUtils.isEmpty(creator) ? "" : creator;
-    String searchEngineType = StringUtils.isEmpty(engineType) ? "" : engineType;
-    LabelBuilderFactory labelFactory = LabelBuilderFactoryContext.getLabelBuilderFactory();
-    UserCreatorLabel userCreatorLabel = labelFactory.createLabel(UserCreatorLabel.class);
-    EngineTypeLabel engineTypeLabel = labelFactory.createLabel(EngineTypeLabel.class);
-    Label<?> combinedLabel =
-        new CombinedLabelBuilder().build("", Lists.newArrayList(userCreatorLabel, engineTypeLabel));
-    String labelKey = combinedLabel.getLabelKey();
     String labelValuePattern =
-        MessageFormat.format(
-            "%{0}%,%{1}%,%{2}%,%", searchCreator, searchUsername, searchEngineType);
+        MessageFormat.format("%{0}%,%{1}%,%{2}%,%", creator, username, engineType);
     List<PersistenceLabelRel> userLabels =
-        labelManagerPersistence.getLabelByPattern(labelValuePattern, labelKey, 0, 0);
-    List<PersistenceResource> resourceByLabels =
+        labelManagerPersistence.getLabelByPattern(
+            labelValuePattern, RMUtils.getCombinedLabel(), 0, 0);
+    List<PersistenceResource> resources =
         resourceManagerPersistence.getResourceByLabels(userLabels);
-    List<UserResourceVo> userResources = new ArrayList<>();
-    // 4. Store users and resources in Vo
-    for (PersistenceResource resource : resourceByLabels) {
-      UserResource userResource = ResourceUtils.fromPersistenceResourceAndUser(resource);
-      PersistenceLabelRel userLabel = null;
-      for (PersistenceLabelRel label : userLabels) {
-        if (label.getResourceId().equals(resource.getId())) {
-          userLabel = label;
-        }
-      }
-      if (userLabel != null) {
-        UserCreatorEngineType userCreatorEngineType =
-            BDPJettyServerHelper.gson()
-                .fromJson(userLabel.getStringValue(), UserCreatorEngineType.class);
-        if (userCreatorEngineType != null) {
-          userResource.setUsername(userCreatorEngineType.getUser());
-          userResource.setCreator(userCreatorEngineType.getCreator());
-          userResource.setEngineType(userCreatorEngineType.getEngineType());
-          userResource.setVersion(userCreatorEngineType.getVersion());
-        }
-      }
-      userResources.add(RMUtils.toUserResourceVo(userResource));
-    }
-
-
+    ArrayList<UserResourceVo> userResources = RMUtils.getUserResources(userLabels, resources);
 
     // 获取租户标签数据
-    String tenant = "";
-    List<EMNodeVo> emNodeVos = AMUtils.copyToEMVo(emInfoService.getAllEM());
-    List<EMNodeVo> emNodeList = new ArrayList<>();
-    for (EMNodeVo emNodeVo : emNodeVos) {
-      List<Label> labels = emNodeVo.getLabels();
-      //    tenant不为空
-      if (StringUtils.isNotBlank(tenant)) {
-        String finalTenant = tenant;
-        labels =
-            labels.stream()
-                .filter(
-                    label ->
-                        KEY_TENANT.equals(label.getLabelKey())
-                            && label.getStringValue().contains(finalTenant))
-                .collect(Collectors.toList());
-        if (labels.size() > 0) {
-          emNodeList.add(emNodeVo);
+    if (StringUtils.isBlank(tenant)) {
+      Sender sender =
+          Sender.getSender(
+              Configuration.CLOUD_CONSOLE_CONFIGURATION_SPRING_APPLICATION_NAME().getValue());
+      TenantResponse response = (TenantResponse) sender.ask(new TenantRequest(username, creator));
+      if (StringUtils.isBlank(response.tenant())) {
+        response = (TenantResponse) sender.ask(new TenantRequest(username, "*"));
+        if (StringUtils.isBlank(response.tenant())) {
+          response = (TenantResponse) sender.ask(new TenantRequest("*", creator));
         }
-      } else {
-        labels =
-            labels.stream()
-                .filter(label -> !KEY_TENANT.equals(label.getLabelKey()))
-                .collect(Collectors.toList());
-        if (labels.size() > 0) {
-          emNodeList.add(emNodeVo);
-        }
-      }
-      if (labels.size() > 0) {
-        emNodeList.add(emNodeVo);
       }
+      tenant = response.tenant();
     }
 
-    // 获取租户标签数据
-    Sender sender =
-        Sender.getSender(
-            Configuration.CLOUD_CONSOLE_CONFIGURATION_SPRING_APPLICATION_NAME().getValue());
-    TenantResponse ask = (TenantResponse) sender.ask(new TenantRequest(username, creator));
-    if (null == ask) {
-      ask = (TenantResponse) sender.ask(new TenantRequest(username, "*"));
-      if (null == ask) {
-        ask = (TenantResponse) sender.ask(new TenantRequest("*", creator));
-        if (null != ask) {
-          tenant = ask.tenant();
+    // 获取ecm列表数据
+    List<EMNodeVo> emNodeVos = AMUtils.copyToEMVo(emInfoService.getAllEM());
+    String finalTenant = tenant;
+    List<EMNodeVo> collect =
+        emNodeVos.stream()
+            .filter(
+                emNodeVo -> {
+                  Stream<Label> labelStream = emNodeVo.getLabels().stream();
+                  if (StringUtils.isNotBlank(finalTenant)) {
+                    return labelStream.anyMatch(
+                        label ->
+                            KEY_TENANT.equals(label.getLabelKey())
+                                && label.getStringValue().contains(finalTenant));
+                  } else {
+                    return labelStream.noneMatch(label -> KEY_TENANT.equals(label.getLabelKey()));
+                  }
+                })
+            .collect(Collectors.toList());
+
+    // 获取配置值
+    String responseStr = "";
+    List<ConfigVo> configlist = new ArrayList<>();
+    try {
+      HttpClient httpClient = HttpClients.createDefault();
+      String url =
+          MessageFormat.format(
+              "/api/rest_j/v1/configuration/getFullTreesByAppName?creator={0}&engineType={1}",
+              creator, engineType);
+      HttpGet httpGet = new HttpGet(Configuration.getGateWayURL() + url);
+      httpGet.addHeader("Token-User", username);
+      httpGet.addHeader("Token-Code", "BML-AUTH");
+      responseStr = EntityUtils.toString(httpClient.execute(httpGet).getEntity());
+      ObjectMapper objectMapper = new ObjectMapper();
+      JsonNode fullTree = objectMapper.readTree(responseStr).get("data").get("fullTree");
+      for (JsonNode node : fullTree) {
+        JsonNode settingsList = node.get("settings");
+        for (JsonNode key : settingsList) {
+          configlist.add(
+              new ConfigVo(
+                  key.get("key").asText(),
+                  key.get("configValue").asText(),
+                  key.get("defaultValue").asText()));
         }
-      } else {
-        tenant = ask.tenant();
       }
-    } else {
-      tenant = ask.tenant();
+    } catch (IOException e) {
+      e.printStackTrace();
     }
 
-    return Message.ok().data("test", userResources);
+    return Message.ok()
+        .data("test", userResources)
+        .data("tenant", tenant)
+        .data("test3", collect)
+        .data("test4", configlist);
   }
 }
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/vo/ConfigVo.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/vo/ConfigVo.java
new file mode 100644
index 0000000000..f5e92f168b
--- /dev/null
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/vo/ConfigVo.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.linkis.manager.am.vo;
+
+public class ConfigVo {
+
+  private String key;
+  private String defaultValue;
+  private String configValue;
+
+  public ConfigVo(String key, String defaultValue, String configValue) {
+    this.key = key;
+    this.defaultValue = defaultValue;
+    this.configValue = configValue;
+  }
+
+  public String getKey() {
+    return key;
+  }
+
+  public void setKey(String key) {
+    this.key = key;
+  }
+
+  public String getDefaultValue() {
+    return defaultValue;
+  }
+
+  public void setDefaultValue(String defaultValue) {
+    this.defaultValue = defaultValue;
+  }
+
+  public String getConfigValue() {
+    return configValue;
+  }
+
+  public void setConfigValue(String configValue) {
+    this.configValue = configValue;
+  }
+
+  @Override
+  public String toString() {
+    return "ConfigVo{" +
+            "key='" + key + '\'' +
+            ", defaultValue='" + defaultValue + '\'' +
+            ", configValue='" + configValue + '\'' +
+            '}';
+  }
+}
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala
index b50321e026..b8bd9e934c 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala
@@ -164,7 +164,7 @@ class RMMonitorRest extends Logging {
     }
 
     if (resourceId == null || resourceId <= 0) {
-      userResourceService.resetAllUserResource(COMBINED_USERCREATOR_ENGINETYPE)
+      userResourceService.resetAllUserResource(RMUtils.COMBINED_USERCREATOR_ENGINETYPE)
     } else {
       userResourceService.resetUserResource(resourceId)
     }
@@ -200,41 +200,17 @@ class RMMonitorRest extends Logging {
     // label value in db as :{"creator":"nodeexecution","user":"hadoop","engineType":"appconn","version":"1"}
     val labelValuePattern =
       MessageFormat.format("%{0}%,%{1}%,%{2}%,%", searchCreator, searchUsername, searchEngineType)
-
-    if (COMBINED_USERCREATOR_ENGINETYPE == null) {
-      val userCreatorLabel = labelFactory.createLabel(classOf[UserCreatorLabel])
-      val engineTypeLabel = labelFactory.createLabel(classOf[EngineTypeLabel])
-      val combinedLabel =
-        combinedLabelBuilder.build("", Lists.newArrayList(userCreatorLabel, engineTypeLabel))
-      COMBINED_USERCREATOR_ENGINETYPE = combinedLabel.getLabelKey
-    }
     // 2. The resource label of all users, including the associated resourceId
     val resultPage = PageMethod.startPage(page, size)
     val userLabels = labelManagerPersistence.getLabelByPattern(
       labelValuePattern,
-      COMBINED_USERCREATOR_ENGINETYPE,
+      RMUtils.getCombinedLabel,
       page,
       size
     )
     // 3. All user resources, including resourceId
     val resources = resourceManagerPersistence.getResourceByLabels(userLabels)
-    val userResources = new util.ArrayList[UserResourceVo]()
-    // 4. Store users and resources in Vo
-    resources.asScala.foreach(resource => {
-      val userResource = ResourceUtils.fromPersistenceResourceAndUser(resource)
-      val userLabel = userLabels.asScala.find(_.getResourceId.equals(resource.getId)).orNull
-      if (userLabel != null) {
-        val userCreatorEngineType =
-          gson.fromJson(userLabel.getStringValue, classOf[UserCreatorEngineType])
-        if (userCreatorEngineType != null) {
-          userResource.setUsername(userCreatorEngineType.getUser)
-          userResource.setCreator(userCreatorEngineType.getCreator)
-          userResource.setEngineType(userCreatorEngineType.getEngineType)
-          userResource.setVersion(userCreatorEngineType.getVersion)
-        }
-      }
-      userResources.add(RMUtils.toUserResourceVo(userResource))
-    })
+    val userResources = RMUtils.getUserResources(userLabels, resources)
     Message.ok().data("resources", userResources).data("total", resultPage.getTotal)
   }
 
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/utils/RMUtils.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/utils/RMUtils.scala
index 2b74c31079..932cc56c5d 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/utils/RMUtils.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/utils/RMUtils.scala
@@ -20,21 +20,29 @@ package org.apache.linkis.manager.rm.utils
 import org.apache.linkis.common.conf.{CommonVars, Configuration, TimeType}
 import org.apache.linkis.common.utils.{ByteTimeUtils, Logging, Utils}
 import org.apache.linkis.manager.common.constant.RMConstant
-import org.apache.linkis.manager.common.entity.persistence.PersistenceResource
+import org.apache.linkis.manager.common.entity.persistence.{
+  PersistenceLabelRel,
+  PersistenceResource
+}
 import org.apache.linkis.manager.common.entity.resource._
 import org.apache.linkis.manager.common.serializer.NodeResourceSerializer
-import org.apache.linkis.manager.label.entity.engine.EngineType
+import org.apache.linkis.manager.common.utils.ResourceUtils
+import org.apache.linkis.manager.label.LabelManagerUtils.labelFactory
+import org.apache.linkis.manager.label.builder.CombinedLabelBuilder
+import org.apache.linkis.manager.label.builder.factory.LabelBuilderFactoryContext
+import org.apache.linkis.manager.label.entity.engine.{EngineType, EngineTypeLabel, UserCreatorLabel}
 import org.apache.linkis.manager.rm.conf.ResourceStatus
-import org.apache.linkis.manager.rm.restful.vo.UserResourceVo
+import org.apache.linkis.manager.rm.restful.vo.{UserCreatorEngineType, UserResourceVo}
 import org.apache.linkis.server.BDPJettyServerHelper
 
 import org.apache.commons.lang3.StringUtils
 
 import java.util
-import java.util.UUID
+import java.util.{List, UUID}
 
 import scala.collection.JavaConverters.asScalaBufferConverter
 
+import com.google.common.collect.Lists
 import org.json4s.DefaultFormats
 import org.json4s.jackson.Serialization.{read, write}
 
@@ -58,7 +66,7 @@ object RMUtils extends Logging {
   val EXTERNAL_RESOURCE_REFRESH_TIME =
     CommonVars("wds.linkis.manager.rm.external.resource.regresh.time", new TimeType("30m"))
 
-  val COMBINED_USERCREATOR_ENGINETYPE = "combined_userCreator_engineType"
+  var COMBINED_USERCREATOR_ENGINETYPE: String = _
 
   val ENGINE_TYPE = CommonVars.apply(
     "wds.linkis.configuration.engine.type",
@@ -254,4 +262,43 @@ object RMUtils extends Logging {
 
   def getECTicketID: String = UUID.randomUUID().toString
 
+  def getCombinedLabel: String = {
+    if (COMBINED_USERCREATOR_ENGINETYPE == null) {
+      val userCreatorLabel = labelFactory.createLabel(classOf[UserCreatorLabel])
+      val engineTypeLabel = labelFactory.createLabel(classOf[EngineTypeLabel])
+      val combinedLabelBuilder = new CombinedLabelBuilder
+      val combinedLabel =
+        combinedLabelBuilder.build("", Lists.newArrayList(userCreatorLabel, engineTypeLabel))
+      COMBINED_USERCREATOR_ENGINETYPE = combinedLabel.getLabelKey
+      COMBINED_USERCREATOR_ENGINETYPE
+    } else {
+      COMBINED_USERCREATOR_ENGINETYPE
+    }
+  }
+
+  def getUserResources(
+      userLabels: util.List[PersistenceLabelRel],
+      resources: util.List[PersistenceResource]
+  ): util.ArrayList[UserResourceVo] = {
+    val userResources = new util.ArrayList[UserResourceVo]()
+    // 4. Store users and resources in Vo
+    resources.asScala.foreach(resource => {
+      val userResource = ResourceUtils.fromPersistenceResourceAndUser(resource)
+      val userLabel = userLabels.asScala.find(_.getResourceId.equals(resource.getId)).orNull
+      if (userLabel != null) {
+        val userCreatorEngineType =
+          BDPJettyServerHelper.gson
+            .fromJson(userLabel.getStringValue, classOf[UserCreatorEngineType])
+        if (userCreatorEngineType != null) {
+          userResource.setUsername(userCreatorEngineType.getUser)
+          userResource.setCreator(userCreatorEngineType.getCreator)
+          userResource.setEngineType(userCreatorEngineType.getEngineType)
+          userResource.setVersion(userCreatorEngineType.getVersion)
+        }
+      }
+      userResources.add(RMUtils.toUserResourceVo(userResource))
+    })
+    userResources
+  }
+
 }

From 531971904d4b0aa1b7be3b399b13fe389f09f13f Mon Sep 17 00:00:00 2001
From: v_kkhuang <420895376@qq.com>
Date: Tue, 24 Oct 2023 10:52:51 +0800
Subject: [PATCH 3/3] Rollback Code

---
 .../manager/rm/restful/RMMonitorRest.scala    | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala
index b8bd9e934c..b50321e026 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala
@@ -164,7 +164,7 @@ class RMMonitorRest extends Logging {
     }
 
     if (resourceId == null || resourceId <= 0) {
-      userResourceService.resetAllUserResource(RMUtils.COMBINED_USERCREATOR_ENGINETYPE)
+      userResourceService.resetAllUserResource(COMBINED_USERCREATOR_ENGINETYPE)
     } else {
       userResourceService.resetUserResource(resourceId)
     }
@@ -200,17 +200,41 @@ class RMMonitorRest extends Logging {
     // label value in db as :{"creator":"nodeexecution","user":"hadoop","engineType":"appconn","version":"1"}
     val labelValuePattern =
       MessageFormat.format("%{0}%,%{1}%,%{2}%,%", searchCreator, searchUsername, searchEngineType)
+
+    if (COMBINED_USERCREATOR_ENGINETYPE == null) {
+      val userCreatorLabel = labelFactory.createLabel(classOf[UserCreatorLabel])
+      val engineTypeLabel = labelFactory.createLabel(classOf[EngineTypeLabel])
+      val combinedLabel =
+        combinedLabelBuilder.build("", Lists.newArrayList(userCreatorLabel, engineTypeLabel))
+      COMBINED_USERCREATOR_ENGINETYPE = combinedLabel.getLabelKey
+    }
     // 2. The resource label of all users, including the associated resourceId
     val resultPage = PageMethod.startPage(page, size)
     val userLabels = labelManagerPersistence.getLabelByPattern(
       labelValuePattern,
-      RMUtils.getCombinedLabel,
+      COMBINED_USERCREATOR_ENGINETYPE,
       page,
       size
     )
     // 3. All user resources, including resourceId
     val resources = resourceManagerPersistence.getResourceByLabels(userLabels)
-    val userResources = RMUtils.getUserResources(userLabels, resources)
+    val userResources = new util.ArrayList[UserResourceVo]()
+    // 4. Store users and resources in Vo
+    resources.asScala.foreach(resource => {
+      val userResource = ResourceUtils.fromPersistenceResourceAndUser(resource)
+      val userLabel = userLabels.asScala.find(_.getResourceId.equals(resource.getId)).orNull
+      if (userLabel != null) {
+        val userCreatorEngineType =
+          gson.fromJson(userLabel.getStringValue, classOf[UserCreatorEngineType])
+        if (userCreatorEngineType != null) {
+          userResource.setUsername(userCreatorEngineType.getUser)
+          userResource.setCreator(userCreatorEngineType.getCreator)
+          userResource.setEngineType(userCreatorEngineType.getEngineType)
+          userResource.setVersion(userCreatorEngineType.getVersion)
+        }
+      }
+      userResources.add(RMUtils.toUserResourceVo(userResource))
+    })
     Message.ok().data("resources", userResources).data("total", resultPage.getTotal)
   }