MVPTeam/kamco-cd-api
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

모델등록 수정

Browse Source
This commit is contained in:
teddy
2026-01-27 17:33:03 +09:00
parent 6ed679c8d6
commit 62305119a1
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java
View File

@@ -228,6 +228,8 @@ public class ModelMngDto {
private String clsModelFileName; private String clsModelFileName;
private int chunkIndex; private int chunkIndex;
private int chunkTotalIndex; private int chunkTotalIndex;
@JsonIgnore private String jsonPath;
@JsonIgnore private String jsonFileName;
public double getUploadRate() { public double getUploadRate() {
if (chunkIndex < 0 || chunkTotalIndex < 0) { if (chunkIndex < 0 || chunkTotalIndex < 0) {

19
src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java
View File

@@ -95,18 +95,21 @@ public class ModelMngService {
|| modelUploadResDto.getCdModelConfigFileName() == null || modelUploadResDto.getCdModelConfigFileName() == null
|| modelUploadResDto.getCdModelConfigFileName().isEmpty() || modelUploadResDto.getCdModelConfigFileName().isEmpty()
|| modelUploadResDto.getClsModelFileName() == null || modelUploadResDto.getClsModelFileName() == null
|| modelUploadResDto.getClsModelFileName().isEmpty()) { || modelUploadResDto.getClsModelFileName().isEmpty()
|| modelUploadResDto.getJsonFileName() == null
|| modelUploadResDto.getJsonFileName().isEmpty()) {
log.warn( log.warn(
"model file missing: uuid={}, path={}, cdModel={}, cdConfig={}, clsModel={}", "model file missing: uuid={}, path={}, cdModel={}, cdConfig={}, clsModel={}, jsonFileName={}",
uuid, uuid,
addReq.getFilePath(), addReq.getFilePath(),
modelUploadResDto.getCdModelFileName(), modelUploadResDto.getCdModelFileName(),
modelUploadResDto.getCdModelConfigFileName(), modelUploadResDto.getCdModelConfigFileName(),
modelUploadResDto.getClsModelFileName()); modelUploadResDto.getClsModelFileName(),
modelUploadResDto.getJsonFileName());
return new ApiResponseDto.ResponseObj( return new ApiResponseDto.ResponseObj(
ApiResponseCode.NOT_FOUND, "pth,pt,py파일이 모두 존재하지 않습니다"); ApiResponseCode.NOT_FOUND, "pth,pt,py,json파일이 모두 존재하지 않습니다");
} }
addReq.setCdModelPath(modelUploadResDto.getCdModelPath()); addReq.setCdModelPath(modelUploadResDto.getCdModelPath());
@@ -142,7 +145,7 @@ public class ModelMngService {
modelMetricAddReq.setIou(0); modelMetricAddReq.setIou(0);
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
String filePath = modelUploadResDto.getClsModelPath() + modelUploadResDto.getClsModelFileName(); String filePath = modelUploadResDto.getJsonPath() + modelUploadResDto.getJsonFileName();
String dataJson = null; String dataJson = null;
try { try {
dataJson = Files.readString(Path.of(filePath)); dataJson = Files.readString(Path.of(filePath));
@@ -231,7 +234,8 @@ public class ModelMngService {
int endPos = 20; int endPos = 20;
List<Basic> files = List<Basic> files =
FIleChecker.getFilesFromAllDepth(dirPath, "*", "pth,py,pt", 10, "name", startPos, endPos); FIleChecker.getFilesFromAllDepth(
dirPath, "*", "pth,py,pt,json", 10, "name", startPos, endPos);
for (Basic dto : files) { for (Basic dto : files) {
// 예: 파일명 출력 및 추가 작업 // 예: 파일명 출력 및 추가 작업
@@ -246,6 +250,9 @@ public class ModelMngService {
} else if (dto.getExtension().equals("pt")) { } else if (dto.getExtension().equals("pt")) {
modelUploadResDto.setClsModelPath(foldNm); modelUploadResDto.setClsModelPath(foldNm);
modelUploadResDto.setClsModelFileName(dto.getFileNm()); modelUploadResDto.setClsModelFileName(dto.getFileNm());
} else if (dto.getExtension().equals("json")) {
modelUploadResDto.setJsonPath(foldNm);
modelUploadResDto.setJsonFileName(dto.getFileNm());
} }
} }