Parcourir la source

Merge remote-tracking branch 'origin/master'

LingxinMeng il y a 2 ans
Parent
commit
b260f1d7bf

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/TaskApplicationService.java

@@ -171,7 +171,7 @@ public class TaskApplicationService {
         } catch (io.kubernetes.client.openapi.ApiException apiException) {
             log.info("POD:" + podName + "已删除。");
         } catch (Exception e) {
-            log.error("项目 {} 已结束。", projectId);
+            log.error("项目 {} 已结束。", projectId, e);
         } finally {
             customRedisClient.unlock(lock1);
         }

+ 2 - 2
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/domain/service/ProjectDomainService.java

@@ -858,7 +858,7 @@ public class ProjectDomainService {
         params.put("projectType", projectType);
         params.put("id", projectId);
         String result = HttpUtil.post(customConfiguration.getProjectDetailsUri(), headers, params);
-        log.debug("访问仿真云平台项目详情接口:" + customConfiguration.getProjectDetailsUri() + ",请求头为:" + headers + ",请求体为:" + params + "结果为:" + result);
+        log.info("访问仿真云平台项目详情接口:" + customConfiguration.getProjectDetailsUri() + ",请求头为:" + headers + ",请求体为:" + params + "结果为:" + result);
         ResponseBodyVO<?> responseBodyVO = JsonUtil.jsonToBean(result, ResponseBodyVO.class);
         String projectDetailsVOJson = JsonUtil.beanToJson(responseBodyVO.getInfo());
         TimeUnit.SECONDS.sleep(3);
@@ -887,7 +887,7 @@ public class ProjectDomainService {
         params.put("projectType", projectType);
         params.put("id", projectId);
         String result = HttpUtil.post(customConfiguration.getProjectReportUri(), headers, params);
-        log.debug("访问仿真云平台项目报告接口:" + customConfiguration.getProjectReportUri() + ",请求头为:" + headers + ",请求体为:" + params + "结果为:" + result);
+        log.info("访问仿真云平台项目报告接口:" + customConfiguration.getProjectReportUri() + ",请求头为:" + headers + ",请求体为:" + params + "结果为:" + result);
         ResponseBodyVO<?> responseBodyVO = JsonUtil.jsonToBean(result, ResponseBodyVO.class);
         String projectReportVOJson = JsonUtil.beanToJson(responseBodyVO.getInfo());
         TimeUnit.SECONDS.sleep(3);

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/service/job_manage/JobManageApplicationService.java

@@ -36,7 +36,7 @@ public class JobManageApplicationService {
     public List<String> getLastVideoListByAlgorithmId(String algorithmId) {
         String projectId = projectDomainService.getLastProjectIdByAlgorithmId(algorithmId);
         if (StringUtil.isEmpty(projectId)) {
-            throw new RuntimeException("该算法还未执行过项目。");
+            return null;
         }
         String projectType = projectDomainService.getProjectTypeByProjectId(projectId);
         return projectDomainService.getVideoList(SimulationManualProjectParam.builder()