|
@@ -85,7 +85,7 @@ public class TrackSequenceServiceImpl extends BaseServiceImpl<TrackSequenceMappe
|
|
public String getTrainOutputPath(TrackSequence entity, SysOssVo ossEntity) {
|
|
public String getTrainOutputPath(TrackSequence entity, SysOssVo ossEntity) {
|
|
String resourcePath = getResourcePath(ossEntity);
|
|
String resourcePath = getResourcePath(ossEntity);
|
|
Path path = Paths.get(resourcePath);
|
|
Path path = Paths.get(resourcePath);
|
|
- Path outputPath = path.resolveSibling(entity.getId().toString() + BizConstant.TARGET_DETECTION_SUFFIX);
|
|
|
|
|
|
+ Path outputPath = path.resolveSibling(entity.getId().toString() + BizConstant.TRACK_SEQUENCE_SUFFIX);
|
|
return outputPath.toString();
|
|
return outputPath.toString();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -96,11 +96,7 @@ public class TrackSequenceServiceImpl extends BaseServiceImpl<TrackSequenceMappe
|
|
}
|
|
}
|
|
|
|
|
|
public String getPredictOutputPath(TrackSequence entity, SysOssVo ossEntity) {
|
|
public String getPredictOutputPath(TrackSequence entity, SysOssVo ossEntity) {
|
|
- // todo
|
|
|
|
- String resourcePath = getResourcePath(ossEntity);
|
|
|
|
- Path path = Paths.get(resourcePath);
|
|
|
|
- Path outputPath = path.resolveSibling(entity.getId().toString() + BizConstant.TARGET_DETECTION_SUFFIX);
|
|
|
|
- return outputPath.toString();
|
|
|
|
|
|
+ return getTrainOutputPath(entity, ossEntity);
|
|
}
|
|
}
|
|
|
|
|
|
public String getTestInputPath(SysOssVo ossEntity) {
|
|
public String getTestInputPath(SysOssVo ossEntity) {
|
|
@@ -110,7 +106,7 @@ public class TrackSequenceServiceImpl extends BaseServiceImpl<TrackSequenceMappe
|
|
|
|
|
|
public String getTestOutputPath(TrackSequence entity, SysOssVo ossEntity) {
|
|
public String getTestOutputPath(TrackSequence entity, SysOssVo ossEntity) {
|
|
// todo
|
|
// todo
|
|
- return getUnZipDirPath(ossEntity) + File.separator + BizConstant.TO_INFRARED_PREDICT_OUTPUT_DIR;
|
|
|
|
|
|
+ return getTrainOutputPath(entity, ossEntity);
|
|
}
|
|
}
|
|
|
|
|
|
private String getModelPath(TrackSequence entity) {
|
|
private String getModelPath(TrackSequence entity) {
|
|
@@ -123,6 +119,12 @@ public class TrackSequenceServiceImpl extends BaseServiceImpl<TrackSequenceMappe
|
|
return getResourcePath(ossEntity);
|
|
return getResourcePath(ossEntity);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ private String getTxtDirPath(Long id) {
|
|
|
|
+ TrackSequence entity = getById(id);
|
|
|
|
+ return entity.getOutputPath();
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public QueryWrapper query() {
|
|
public QueryWrapper query() {
|
|
@@ -292,10 +294,13 @@ public class TrackSequenceServiceImpl extends BaseServiceImpl<TrackSequenceMappe
|
|
String log_path = getLogFilePath(result_dir, entity.getId(), BizConstant.TO_INFRARED_SUFFIX);
|
|
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"));
|
|
Long inputLabelOssId = entityBo.getOtherParams().get("inputLabelOssId") == null ? null : Long.parseLong((String) entityBo.getOtherParams().get("inputLabelOssId"));
|
|
String label_dir = getLabelDirPath(inputLabelOssId);
|
|
String label_dir = getLabelDirPath(inputLabelOssId);
|
|
|
|
+ Long predictAlgorithmId = (Long) entityBo.getOtherParams().get("predictAlgorithmId");
|
|
|
|
+ String txt_dir = getTxtDirPath(predictAlgorithmId);
|
|
result.put("source_dir", source_dir);
|
|
result.put("source_dir", source_dir);
|
|
result.put("result_dir", result_dir);
|
|
result.put("result_dir", result_dir);
|
|
result.put("log_path", log_path);
|
|
result.put("log_path", log_path);
|
|
result.put("label_dir", label_dir);
|
|
result.put("label_dir", label_dir);
|
|
|
|
+ result.put("txt_dir", txt_dir);
|
|
} else {
|
|
} else {
|
|
throw new RuntimeException("算法类型错误");
|
|
throw new RuntimeException("算法类型错误");
|
|
}
|
|
}
|