|
@@ -118,6 +118,11 @@ public class TrackSequenceServiceImpl extends BaseServiceImpl<TrackSequenceMappe
|
|
|
return algorithmModelTrack.getModelAddress();
|
|
|
}
|
|
|
|
|
|
+ public String getLabelDirPath(Long ossId) {
|
|
|
+ SysOssVo ossEntity = ossService.getById(ossId);
|
|
|
+ return getResourcePath(ossEntity);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
@Override
|
|
|
public QueryWrapper query() {
|
|
@@ -274,13 +279,23 @@ public class TrackSequenceServiceImpl extends BaseServiceImpl<TrackSequenceMappe
|
|
|
result.put("result_dir", result_dir);
|
|
|
result.put("log_path", log_path);
|
|
|
result.put("model_path", model_path);
|
|
|
+
|
|
|
+ if (ObjectUtil.isNotEmpty(entityBo.getOtherParams().get("algorithmModelTargetDetectionId"))) {
|
|
|
+ Long model_TD_Id = Long.parseLong((String) entityBo.getOtherParams().get("algorithmModelTargetDetectionId"));
|
|
|
+ AlgorithmModelTrack model_TD = algorithmModelTrackService.getById(model_TD_Id);
|
|
|
+ String model_path_TD = model_TD.getModelAddress();
|
|
|
+ result.put("model_path_TD", model_path_TD);
|
|
|
+ }
|
|
|
} else if (algorithmConfig.getType().equals(BizConstant.AlgorithmType.TEST)) {
|
|
|
String source_dir = getTestInputPath(ossEntity);
|
|
|
String result_dir = getTestOutputPath(entity, ossEntity);
|
|
|
String log_path = getLogFilePath(result_dir, entity.getId(), BizConstant.TO_INFRARED_SUFFIX);
|
|
|
+ Long inputLabelOssId = entityBo.getOtherParams().get("inputLabelOssId") == null ? null : Long.parseLong((String) entityBo.getOtherParams().get("inputLabelOssId"));
|
|
|
+ String label_dir = getLabelDirPath(inputLabelOssId);
|
|
|
result.put("source_dir", source_dir);
|
|
|
result.put("result_dir", result_dir);
|
|
|
result.put("log_path", log_path);
|
|
|
+ result.put("label_dir", label_dir);
|
|
|
} else {
|
|
|
throw new RuntimeException("算法类型错误");
|
|
|
}
|
|
@@ -305,7 +320,6 @@ public class TrackSequenceServiceImpl extends BaseServiceImpl<TrackSequenceMappe
|
|
|
return entity;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* 修改注视轨迹序列
|
|
|
*
|