|
@@ -118,6 +118,8 @@ public class TaskService {
|
|
|
List<IndexTemplatePO> leafIndexTemplateList = indexTemplateMapper.selectLeafIndexWithRuleDetailsByPackageId(scenePackageId);
|
|
|
List<TaskIndexPO> leafTaskIndexList = new ArrayList<>();
|
|
|
log.info("------- /state 共有 " + leafIndexTemplateList.size() + "个叶子节点!");
|
|
|
+
|
|
|
+ ClientSession session = SshUtil.getSession(hostname, username, password);
|
|
|
for (int i = 0; i < leafIndexTemplateList.size(); i++) {
|
|
|
IndexTemplatePO indexTemplatePO = leafIndexTemplateList.get(i);
|
|
|
String indexId = indexTemplatePO.getIndexId();
|
|
@@ -162,8 +164,9 @@ public class TaskService {
|
|
|
log.info("------- /state 下载 minio 上的结果文件 " + runResultMinio + " 到本地:" + runResultLinux);
|
|
|
MinioUtil.downloadToFile(minioClient, bucketName, runResultMinio, runResultLinux);
|
|
|
log.info("------- /state 开始执行打分命令:" + command);
|
|
|
- ClientSession session = SshUtil.getSession(hostname, username, password);
|
|
|
+
|
|
|
score = JsonUtil.jsonToBean(SshUtil.execute(session, command), ScoreTO.class);
|
|
|
+
|
|
|
log.info("------- /state 打分结束,结果为:" + score);
|
|
|
} catch (Exception e) {
|
|
|
log.error("------- /state 任务 " + task2Id + " 打分出错,命令为:" + command + " 修改状态为:" + DictConstants.TASK_ABORTED);
|
|
@@ -198,6 +201,7 @@ public class TaskService {
|
|
|
leafTaskIndex.setIsDeleted("0");
|
|
|
leafTaskIndexList.add(leafTaskIndex);
|
|
|
}
|
|
|
+ SshUtil.stop(session);
|
|
|
|
|
|
// 根据每个指标的得分和权重算出 project 的总得分。
|
|
|
double totalScore = compute(leafIndexTemplateList);
|