From 9df0483cadea4eda56b69c15763b5e999c113858 Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Thu, 10 Oct 2024 15:10:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=8D=E5=8A=A1=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/service/ServiceController.java | 5 +++-- .../com/ruoyi/platform/service/ServiceService.java | 3 ++- .../platform/service/impl/ServiceServiceImpl.java | 12 +++++++++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/service/ServiceController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/service/ServiceController.java index c677555c..7d973bae 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/service/ServiceController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/service/ServiceController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.io.IOException; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -126,8 +127,8 @@ public class ServiceController extends BaseController { @GetMapping("/getServiceVersionLog") @ApiOperation("获取服务版本日志") - public GenericsAjaxResult getServiceVersionLog(@RequestParam("id") Long id, - @RequestParam("start_time") String startTime, @RequestParam("end_time") String endTime) { + public GenericsAjaxResult> getServiceVersionLog(@RequestParam("id") Long id, + @RequestParam("start_time") String startTime, @RequestParam("end_time") String endTime) { return genericsSuccess(serviceService.getServiceVersionLog(id, startTime, endTime)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ServiceService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ServiceService.java index d4e62528..6ce6bc6a 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ServiceService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ServiceService.java @@ -7,6 +7,7 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import java.io.IOException; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -37,7 +38,7 @@ public interface ServiceService { String updateServiceVersion(ServiceVersion serviceVersion); - String getServiceVersionLog(Long id, String startTime, String endTime); + HashMap getServiceVersionLog(Long id, String startTime, String endTime); Map getServiceVersionDocs(Long id); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java index 7c1a17f3..c6ecdf33 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java @@ -255,7 +255,7 @@ public class ServiceServiceImpl implements ServiceService { } @Override - public String getServiceVersionLog(Long id, String startTime, String endTime) { + public HashMap getServiceVersionLog(Long id, String startTime, String endTime) { ServiceVersion serviceVersion = serviceDao.getServiceVersionById(id); HashMap paramMap = new HashMap<>(); paramMap.put("deployment_name", serviceVersion.getDeploymentName()); @@ -264,8 +264,14 @@ public class ServiceServiceImpl implements ServiceService { String req = HttpUtils.sendPost(argoUrl + modelService + "/getLog", JSON.toJSONString(paramMap)); if (StringUtils.isNotEmpty(req)) { Map reqMap = JacksonUtil.parseJSONStr2Map(req); - HashMap data = (HashMap) reqMap.get("data"); - return data.get("log_content"); + if (reqMap.get("code") != null && "200".equals(reqMap.get("code"))) { + HashMap data = (HashMap) reqMap.get("data"); + data.put("start_time", data.get("end_time")); + data.put("end_time", endTime); + return data; + } else { + throw new RuntimeException("获取日志失败"); + } } else { throw new RuntimeException("获取日志失败"); }