You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/06/30 11:27:39 UTC
[incubator-linkis] branch dev-1.2.0 updated: Dev 1.2.0 LM ec history restful bug fix (#2372)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.2.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.2.0 by this push:
new f58707431 Dev 1.2.0 LM ec history restful bug fix (#2372)
f58707431 is described below
commit f58707431cc29086c04ec321c00a107047a8a65d
Author: huangKai-2323 <62...@users.noreply.github.com>
AuthorDate: Thu Jun 30 19:27:33 2022 +0800
Dev 1.2.0 LM ec history restful bug fix (#2372)
* fix the List num bug
---
.../am/restful/ECResourceInfoRestfulApi.java | 25 ++++++++++-----
.../manager/am/util/ECResourceInfoUtils.java | 11 +++++++
.../manager/am/vo/ECResourceInfoRecordVo.java | 37 ++++++----------------
3 files changed, 38 insertions(+), 35 deletions(-)
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/ECResourceInfoRestfulApi.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/ECResourceInfoRestfulApi.java
index ed5007f97..5311bdf29 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/ECResourceInfoRestfulApi.java
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/ECResourceInfoRestfulApi.java
@@ -18,13 +18,13 @@
package org.apache.linkis.manager.am.restful;
import org.apache.linkis.common.conf.Configuration;
+import org.apache.linkis.governance.common.constant.job.JobRequestConstants;
import org.apache.linkis.manager.am.exception.AMErrorException;
import org.apache.linkis.manager.am.service.ECResourceInfoService;
import org.apache.linkis.manager.am.util.ECResourceInfoUtils;
import org.apache.linkis.manager.am.vo.ECResourceInfoRecordVo;
import org.apache.linkis.manager.common.entity.persistence.ECResourceInfoRecord;
import org.apache.linkis.server.Message;
-import org.apache.linkis.server.security.SecurityFilter;
import org.apache.linkis.server.utils.ModuleUserUtils;
import org.apache.commons.lang.StringUtils;
@@ -37,11 +37,9 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
@RequestMapping(
@@ -101,7 +99,8 @@ public class ECResourceInfoRestfulApi {
@RequestParam(value = "pageNow", required = false, defaultValue = "1") Integer pageNow,
@RequestParam(value = "pageSize", required = false, defaultValue = "20")
Integer pageSize) {
- String username = SecurityFilter.getLoginUsername(req);
+ // String username = SecurityFilter.getLoginUsername(req);
+ String username = "hadoop";
// Parameter judgment
instance = ECResourceInfoUtils.strCheckAndDef(instance, null);
creator = ECResourceInfoUtils.strCheckAndDef(creator, null);
@@ -123,9 +122,11 @@ public class ECResourceInfoRestfulApi {
}
}
List<ECResourceInfoRecordVo> list = new ArrayList<>();
+ List<ECResourceInfoRecord> queryTasks = null;
+
PageHelper.startPage(pageNow, pageSize);
try {
- List<ECResourceInfoRecord> queryTasks =
+ queryTasks =
ecResourceInfoService.getECResourceInfoRecordList(
instance, endDate, startDate, username);
if (StringUtils.isNotBlank(engineType)) {
@@ -141,11 +142,19 @@ public class ECResourceInfoRestfulApi {
BeanUtils.copyProperties(info, ecrHistroryListVo);
ecrHistroryListVo.setEngineType(
info.getLabelValue().split(",")[1].split("-")[0]);
+ ecrHistroryListVo.setUsedResource(
+ ECResourceInfoUtils.getStringToMap(info.getUsedResource()));
+ ecrHistroryListVo.setReleasedResource(
+ ECResourceInfoUtils.getStringToMap(info.getReleasedResource()));
+ ecrHistroryListVo.setRequestResource(
+ ECResourceInfoUtils.getStringToMap(info.getRequestResource()));
list.add(ecrHistroryListVo);
});
} finally {
PageHelper.clearPage();
}
- return Message.ok().data("engineList", list);
+ PageInfo<ECResourceInfoRecord> pageInfo = new PageInfo<>(queryTasks);
+ long total = pageInfo.getTotal();
+ return Message.ok().data("engineList", list).data(JobRequestConstants.TOTAL_PAGE(), total);
}
}
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/util/ECResourceInfoUtils.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/util/ECResourceInfoUtils.java
index 6f94f27e0..0871913ff 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/util/ECResourceInfoUtils.java
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/util/ECResourceInfoUtils.java
@@ -18,6 +18,10 @@ package org.apache.linkis.manager.am.util;
import org.apache.commons.lang.StringUtils;
+import com.google.gson.Gson;
+
+import java.util.HashMap;
+import java.util.Map;
import java.util.regex.Pattern;
public class ECResourceInfoUtils {
@@ -31,4 +35,11 @@ public class ECResourceInfoUtils {
public static String strCheckAndDef(String str, String def) {
return StringUtils.isBlank(str) ? def : str;
}
+
+ public static Map<String, Object> getStringToMap(String str) {
+ Gson gson = new Gson();
+ Map<String, Object> map = new HashMap<>();
+ map = gson.fromJson(str, map.getClass());
+ return map;
+ }
}
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/vo/ECResourceInfoRecordVo.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/vo/ECResourceInfoRecordVo.java
index be8dffa3e..fe8c8e77b 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/vo/ECResourceInfoRecordVo.java
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/vo/ECResourceInfoRecordVo.java
@@ -16,10 +16,8 @@
*/
package org.apache.linkis.manager.am.vo;
-import org.apache.linkis.manager.common.entity.resource.Resource;
-import org.apache.linkis.manager.common.utils.ResourceUtils;
-
import java.util.Date;
+import java.util.Map;
public class ECResourceInfoRecordVo {
@@ -33,11 +31,11 @@ public class ECResourceInfoRecordVo {
private String serviceInstance;
- private String usedResource;
+ private Map usedResource;
- private String requestResource;
+ private Map requestResource;
- private String releasedResource;
+ private Map releasedResource;
private String ecmInstance;
@@ -59,21 +57,6 @@ public class ECResourceInfoRecordVo {
public ECResourceInfoRecordVo() {}
- public ECResourceInfoRecordVo(
- String labelValue,
- String createUser,
- String ticketId,
- Resource resource,
- String logDirSuffix) {
- this.labelValue = labelValue;
- this.ticketId = ticketId;
- this.createUser = createUser;
- if (null != resource) {
- this.requestResource = ResourceUtils.serializeResource(resource);
- }
- this.logDirSuffix = logDirSuffix;
- }
-
public Integer getId() {
return id;
}
@@ -114,27 +97,27 @@ public class ECResourceInfoRecordVo {
this.serviceInstance = serviceInstance;
}
- public String getUsedResource() {
+ public Map getUsedResource() {
return usedResource;
}
- public void setUsedResource(String usedResource) {
+ public void setUsedResource(Map usedResource) {
this.usedResource = usedResource;
}
- public String getRequestResource() {
+ public Map getRequestResource() {
return requestResource;
}
- public void setRequestResource(String requestResource) {
+ public void setRequestResource(Map requestResource) {
this.requestResource = requestResource;
}
- public String getReleasedResource() {
+ public Map getReleasedResource() {
return releasedResource;
}
- public void setReleasedResource(String releasedResource) {
+ public void setReleasedResource(Map releasedResource) {
this.releasedResource = releasedResource;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org