From 85c7c53660026f0a133e5969dc237a956378afb9 Mon Sep 17 00:00:00 2001 From: Moon Date: Fri, 9 Jan 2026 12:03:42 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=AA=A8=EB=8D=B8=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapsheet/MapSheetMngApiController.java | 20 ++++++++ .../mapsheet/service/MapSheetMngService.java | 12 +++++ .../cd/kamcoback/model/dto/ModelMngDto.java | 41 ++++++++++++++++ .../model/service/ModelMngService.java | 15 +++++- .../postgres/core/ModelMngCoreService.java | 49 +++++++++++++++++-- .../postgres/entity/ModelMngEntity.java | 27 ++++++++++ .../entity/ModelResultMetricEntity.java | 10 ++-- .../model/ModelMngRepositoryCustom.java | 4 ++ .../model/ModelMngRepositoryImpl.java | 27 ++++++++++ 9 files changed, 195 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java b/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java index 95fcb6ec..07f98727 100644 --- a/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java @@ -280,4 +280,24 @@ public class MapSheetMngApiController { return ApiResponseDto.createOK(mapSheetMngService.getFilesAll(srchDto)); } + + + @Operation(summary = "영상 데이터 관리 완료 년도 목록 조회", description = "영상 데이터 관리 완료 년도 목록 조회") + @ApiResponses( + value = { + @ApiResponse( + responseCode = "200", + description = "조회 성공", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = CommonCodeDto.Basic.class))), + @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content), + @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content) + }) + @PostMapping("/mng-done-yyyy-list") + public ApiResponseDto> findMapSheetMngDoneYyyyList() { + + return ApiResponseDto.ok(mapSheetMngService.findMapSheetMngDoneYyyyList()); + } } diff --git a/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java b/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java index 07a1c1f1..88822ee5 100644 --- a/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java +++ b/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java @@ -23,6 +23,7 @@ import java.nio.file.Paths; import java.nio.file.StandardCopyOption; import java.util.Comparator; import java.util.List; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Page; @@ -338,4 +339,15 @@ public class MapSheetMngService { public void getSceneInference(String yyyy) { mapSheetMngCoreService.getSceneInference(yyyy); } + + public List findMapSheetMngDoneYyyyList() { + + List mngList = mapSheetMngCoreService.findMapSheetMngList(); + List yearList = mngList.stream() + .filter(dto -> "DONE".equals(dto.getMngState())) + .map(dto -> dto.getMngYyyy()) // 날짜 객체에서 연도(int)만 추출 + .toList(); + + return yearList; + } } diff --git a/src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java b/src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java index 96e1ba56..7bf91d69 100644 --- a/src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java @@ -59,6 +59,12 @@ public class ModelMngDto { private String modelType; private String filePath; private String fileName; + private String cdModelPath; + private String cdModelFileName; + private String cdModelConfig; + private String cdModelConfigFileName; + private String clsModelPath; + private String clsModelFileName; private String memo; public Basic( @@ -74,6 +80,12 @@ public class ModelMngDto { String modelType, String filePath, String fileName, + String cdModelPath, + String cdModelFileName, + String cdModelConfig, + String cdModelConfigFileName, + String clsModelPath, + String clsModelFileName, String memo) { this.modelUid = modelUid; this.modelVer = modelVer; @@ -87,6 +99,12 @@ public class ModelMngDto { this.modelType = modelType; this.filePath = filePath; this.fileName = fileName; + this.cdModelPath = cdModelPath; + this.cdModelFileName = cdModelFileName; + this.cdModelConfig = cdModelConfig; + this.cdModelConfigFileName = cdModelConfigFileName; + this.clsModelPath = clsModelPath; + this.clsModelFileName = clsModelFileName; this.memo = memo; } } @@ -123,6 +141,12 @@ public class ModelMngDto { private String modelVer; private String filePath; private String fileName; + private String cdModelPath; + private String cdModelFileName; + private String cdModelConfigPath; + private String cdModelConfigFileName; + private String clsModelPath; + private String clsModelFileName; private String memo; @JsonIgnore private UUID uuid; @@ -151,4 +175,21 @@ public class ModelMngDto { return PageRequest.of(page, size); } } + + + @Schema(name = "ModelMetricAddReq", description = "모델 등록 req") + @Getter + @Setter + @NoArgsConstructor + @AllArgsConstructor + public static class ModelMetricAddReq { + private Long modelUid; + private Long modelVerUid; + private double f1Score; + private double precision; + private double recall; + private double loss; + private double iou; + } + } diff --git a/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java b/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java index 87534f62..22113545 100644 --- a/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java +++ b/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java @@ -2,6 +2,7 @@ package com.kamco.cd.kamcoback.model.service; import com.kamco.cd.kamcoback.config.api.ApiResponseDto; import com.kamco.cd.kamcoback.model.dto.ModelMngDto; +import com.kamco.cd.kamcoback.model.dto.ModelMngDto.ModelMetricAddReq; import com.kamco.cd.kamcoback.postgres.core.ModelMngCoreService; import com.kamco.cd.kamcoback.upload.dto.UploadDto; import com.kamco.cd.kamcoback.upload.service.UploadService; @@ -62,7 +63,19 @@ public class ModelMngService { public ApiResponseDto.ResponseObj insertModel(ModelMngDto.AddReq addReq) { UUID uuid = UUID.randomUUID(); addReq.setUuid(uuid); - modelMngCoreService.insertModel(addReq); + Long modelUid = modelMngCoreService.insertModel(addReq); + + ModelMetricAddReq modelMetricAddReq = new ModelMetricAddReq(); + modelMetricAddReq.setModelUid(modelUid); + modelMetricAddReq.setModelVerUid(modelUid); + modelMetricAddReq.setF1Score(0); + modelMetricAddReq.setPrecision(0); + modelMetricAddReq.setRecall(0); + modelMetricAddReq.setLoss(0); + modelMetricAddReq.setIou(0); + + modelMngCoreService.insertModelResultMetric(modelMetricAddReq); + return new ApiResponseDto.ResponseObj(ApiResponseDto.ApiResponseCode.OK, "등록되었습니다."); } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/ModelMngCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/ModelMngCoreService.java index d803a756..88484a0c 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/ModelMngCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/ModelMngCoreService.java @@ -1,6 +1,11 @@ package com.kamco.cd.kamcoback.postgres.core; +import static com.kamco.cd.kamcoback.postgres.entity.QModelMngEntity.modelMngEntity; + import com.kamco.cd.kamcoback.model.dto.ModelMngDto; +import com.kamco.cd.kamcoback.model.dto.ModelMngDto.ModelMetricAddReq; +import com.kamco.cd.kamcoback.postgres.entity.ModelMngEntity; +import com.kamco.cd.kamcoback.postgres.entity.ModelResultMetricEntity; import com.kamco.cd.kamcoback.postgres.repository.model.ModelMngRepository; import java.time.LocalDate; import java.util.UUID; @@ -37,11 +42,47 @@ public class ModelMngCoreService { modelMngRepository.deleteByModelUuid(uuid); } - public void insertModel(ModelMngDto.AddReq addReq) { + public Long insertModel(ModelMngDto.AddReq addReq) { - // ModelMngEntity addEntity = new ModelMngEntity(); - // addEntity.setModelType(addReq.getModelType()); + ModelMngEntity addEntity = new ModelMngEntity(); + addEntity.setModelVer(addReq.getModelVer()); + addEntity.setModelType(addReq.getModelType()); + addEntity.setFilePath(addReq.getFilePath()); + addEntity.setFileName(addReq.getFileName()); + addEntity.setMemo(addReq.getMemo()); + addEntity.setUuid(addReq.getUuid()); - modelMngRepository.insertModel(addReq); + addEntity.setCdModelPath(addReq.getCdModelPath()); + addEntity.setCdModelFileName(addReq.getCdModelFileName()); + addEntity.setCdModelConfigPath(addReq.getCdModelConfigPath()); + addEntity.setCdModelConfigFileName(addReq.getCdModelConfigFileName()); + addEntity.setClsModelPath(addReq.getClsModelPath()); + addEntity.setClsModelFileName(addReq.getClsModelFileName()); + addEntity.setDeleted(false); + + //modelMngRepository.insertModel(addReq); + ModelMngEntity entity = modelMngRepository.save(addEntity); + return entity.getModelUid(); } + + public void insertModelResultMetric(ModelMngDto.ModelMetricAddReq addReq) { + + /* + ModelResultMetricEntity addEntity = new ModelResultMetricEntity(); + addEntity.setModelUid(addReq.getModelUid()); + addEntity.setModelVerUid(addReq.getModelVerUid()); + addEntity.setF1Score(addReq.getF1Score()); + addEntity.setPrecision(addReq.getPrecision()); + addEntity.setRecall(addReq.getRecall()); + addEntity.setLoss(addReq.getLoss()); + addEntity.setIou(addReq.getIou()); + */ + + + modelMngRepository.insertModelResultMetric(addReq); + //ModelMngEntity entity = modelMngRepository.save(addEntity); + //return entity.getMetricUid(); + } + + } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelMngEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelMngEntity.java index d97ecf40..279cd73e 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelMngEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelMngEntity.java @@ -7,6 +7,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Table; +import jakarta.validation.constraints.Size; import java.time.ZonedDateTime; import java.util.UUID; import lombok.Getter; @@ -56,6 +57,32 @@ public class ModelMngEntity extends CommonDateEntity { @Column(name = "uuid") private UUID uuid; + @Size(max = 155) + @Column(name = "cd_model_path", length = 155) + private String cdModelPath; + + @Size(max = 155) + @Column(name = "cd_model_file_name", length = 155) + private String cdModelFileName; + + @Size(max = 155) + @Column(name = "cd_model_config_path", length = 155) + private String cdModelConfigPath; + + @Size(max = 155) + @Column(name = "cd_model_config_file_name", length = 155) + private String cdModelConfigFileName; + + @Size(max = 155) + @Column(name = "cls_model_path", length = 155) + private String clsModelPath; + + @Size(max = 155) + @Column(name = "cls_model_file_name", length = 155) + private String clsModelFileName; + + + public void deleted() { this.deleted = true; } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelResultMetricEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelResultMetricEntity.java index 37defe6d..7d92e3a2 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelResultMetricEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelResultMetricEntity.java @@ -7,21 +7,21 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import org.hibernate.annotations.JdbcTypeCode; import org.hibernate.type.SqlTypes; -@Entity + @Table(name = "tb_model_result_metric") @Getter -@Builder -@NoArgsConstructor -@AllArgsConstructor +@Setter +@Entity public class ModelResultMetricEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "metric_uid") - private Long id; + private Long metricUid; @Column(name = "model_uid") private Long modelUid; diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryCustom.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryCustom.java index b84ea5d3..c09e5f9f 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryCustom.java @@ -23,4 +23,8 @@ public interface ModelMngRepositoryCustom { void insertModel(ModelMngDto.AddReq addReq); void deleteByModelUuid(UUID uuid); + + void insertModelResultMetric(ModelMngDto.ModelMetricAddReq addReq); + + } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryImpl.java index db15f3e4..5e07f293 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryImpl.java @@ -197,4 +197,31 @@ public class ModelMngRepositoryImpl extends QuerydslRepositorySupport .where(modelMngEntity.uuid.eq(uuid)) .execute(); } + + + @Override + public void insertModelResultMetric(@Valid ModelMngDto.ModelMetricAddReq addReq) { + long execCount = + queryFactory + .insert(modelResultMetricEntity) + .columns( + modelResultMetricEntity.modelUid, + modelResultMetricEntity.modelVerUid, + modelResultMetricEntity.f1Score, + modelResultMetricEntity.precision, + modelResultMetricEntity.recall, + modelResultMetricEntity.loss, + modelResultMetricEntity.iou) + .values( + addReq.getModelUid(), + addReq.getModelVerUid(), + addReq.getF1Score(), + addReq.getPrecision(), + addReq.getRecall(), + addReq.getLoss(), + addReq.getIou()) + .execute(); + } + + } From e0ca2e7038a771e453825efbc21c53a54f1b57b8 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Fri, 9 Jan 2026 12:06:11 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[KC-109]=20=EB=AA=A8=EB=8D=B8=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapsheet/MapSheetMngApiController.java | 23 +++++------ .../mapsheet/service/MapSheetMngService.java | 10 ++--- .../cd/kamcoback/model/dto/ModelMngDto.java | 2 - .../model/service/ModelMngService.java | 2 +- .../postgres/core/ModelMngCoreService.java | 15 ++----- .../postgres/entity/ModelMngEntity.java | 2 - .../entity/ModelResultMetricEntity.java | 4 -- .../model/ModelMngRepositoryCustom.java | 2 - .../model/ModelMngRepositoryImpl.java | 41 +++++++++---------- 9 files changed, 40 insertions(+), 61 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java b/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java index 07f98727..e09a4788 100644 --- a/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java @@ -281,20 +281,19 @@ public class MapSheetMngApiController { return ApiResponseDto.createOK(mapSheetMngService.getFilesAll(srchDto)); } - @Operation(summary = "영상 데이터 관리 완료 년도 목록 조회", description = "영상 데이터 관리 완료 년도 목록 조회") @ApiResponses( - value = { - @ApiResponse( - responseCode = "200", - description = "조회 성공", - content = - @Content( - mediaType = "application/json", - schema = @Schema(implementation = CommonCodeDto.Basic.class))), - @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content), - @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content) - }) + value = { + @ApiResponse( + responseCode = "200", + description = "조회 성공", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = CommonCodeDto.Basic.class))), + @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content), + @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content) + }) @PostMapping("/mng-done-yyyy-list") public ApiResponseDto> findMapSheetMngDoneYyyyList() { diff --git a/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java b/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java index 88822ee5..b99be40c 100644 --- a/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java +++ b/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java @@ -23,7 +23,6 @@ import java.nio.file.Paths; import java.nio.file.StandardCopyOption; import java.util.Comparator; import java.util.List; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Page; @@ -343,10 +342,11 @@ public class MapSheetMngService { public List findMapSheetMngDoneYyyyList() { List mngList = mapSheetMngCoreService.findMapSheetMngList(); - List yearList = mngList.stream() - .filter(dto -> "DONE".equals(dto.getMngState())) - .map(dto -> dto.getMngYyyy()) // 날짜 객체에서 연도(int)만 추출 - .toList(); + List yearList = + mngList.stream() + .filter(dto -> "DONE".equals(dto.getMngState())) + .map(dto -> dto.getMngYyyy()) // 날짜 객체에서 연도(int)만 추출 + .toList(); return yearList; } diff --git a/src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java b/src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java index 7bf91d69..28008c68 100644 --- a/src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java @@ -176,7 +176,6 @@ public class ModelMngDto { } } - @Schema(name = "ModelMetricAddReq", description = "모델 등록 req") @Getter @Setter @@ -191,5 +190,4 @@ public class ModelMngDto { private double loss; private double iou; } - } diff --git a/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java b/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java index 22113545..b0d6b3f0 100644 --- a/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java +++ b/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java @@ -65,7 +65,7 @@ public class ModelMngService { addReq.setUuid(uuid); Long modelUid = modelMngCoreService.insertModel(addReq); - ModelMetricAddReq modelMetricAddReq = new ModelMetricAddReq(); + ModelMetricAddReq modelMetricAddReq = new ModelMetricAddReq(); modelMetricAddReq.setModelUid(modelUid); modelMetricAddReq.setModelVerUid(modelUid); modelMetricAddReq.setF1Score(0); diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/ModelMngCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/ModelMngCoreService.java index 88484a0c..411197d6 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/ModelMngCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/ModelMngCoreService.java @@ -1,11 +1,7 @@ package com.kamco.cd.kamcoback.postgres.core; -import static com.kamco.cd.kamcoback.postgres.entity.QModelMngEntity.modelMngEntity; - import com.kamco.cd.kamcoback.model.dto.ModelMngDto; -import com.kamco.cd.kamcoback.model.dto.ModelMngDto.ModelMetricAddReq; import com.kamco.cd.kamcoback.postgres.entity.ModelMngEntity; -import com.kamco.cd.kamcoback.postgres.entity.ModelResultMetricEntity; import com.kamco.cd.kamcoback.postgres.repository.model.ModelMngRepository; import java.time.LocalDate; import java.util.UUID; @@ -44,7 +40,7 @@ public class ModelMngCoreService { public Long insertModel(ModelMngDto.AddReq addReq) { - ModelMngEntity addEntity = new ModelMngEntity(); + ModelMngEntity addEntity = new ModelMngEntity(); addEntity.setModelVer(addReq.getModelVer()); addEntity.setModelType(addReq.getModelType()); addEntity.setFilePath(addReq.getFilePath()); @@ -60,7 +56,7 @@ public class ModelMngCoreService { addEntity.setClsModelFileName(addReq.getClsModelFileName()); addEntity.setDeleted(false); - //modelMngRepository.insertModel(addReq); + // modelMngRepository.insertModel(addReq); ModelMngEntity entity = modelMngRepository.save(addEntity); return entity.getModelUid(); } @@ -78,11 +74,8 @@ public class ModelMngCoreService { addEntity.setIou(addReq.getIou()); */ - modelMngRepository.insertModelResultMetric(addReq); - //ModelMngEntity entity = modelMngRepository.save(addEntity); - //return entity.getMetricUid(); + // ModelMngEntity entity = modelMngRepository.save(addEntity); + // return entity.getMetricUid(); } - - } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelMngEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelMngEntity.java index 279cd73e..b790ad1f 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelMngEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelMngEntity.java @@ -81,8 +81,6 @@ public class ModelMngEntity extends CommonDateEntity { @Column(name = "cls_model_file_name", length = 155) private String clsModelFileName; - - public void deleted() { this.deleted = true; } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelResultMetricEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelResultMetricEntity.java index 7d92e3a2..2a6341c3 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelResultMetricEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelResultMetricEntity.java @@ -3,15 +3,11 @@ package com.kamco.cd.kamcoback.postgres.entity; import jakarta.persistence.*; import java.time.ZonedDateTime; import java.util.Map; -import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Getter; -import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.annotations.JdbcTypeCode; import org.hibernate.type.SqlTypes; - @Table(name = "tb_model_result_metric") @Getter @Setter diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryCustom.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryCustom.java index c09e5f9f..a48675e5 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryCustom.java @@ -25,6 +25,4 @@ public interface ModelMngRepositoryCustom { void deleteByModelUuid(UUID uuid); void insertModelResultMetric(ModelMngDto.ModelMetricAddReq addReq); - - } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryImpl.java index 5e07f293..83e2bf28 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryImpl.java @@ -198,30 +198,27 @@ public class ModelMngRepositoryImpl extends QuerydslRepositorySupport .execute(); } - @Override public void insertModelResultMetric(@Valid ModelMngDto.ModelMetricAddReq addReq) { long execCount = - queryFactory - .insert(modelResultMetricEntity) - .columns( - modelResultMetricEntity.modelUid, - modelResultMetricEntity.modelVerUid, - modelResultMetricEntity.f1Score, - modelResultMetricEntity.precision, - modelResultMetricEntity.recall, - modelResultMetricEntity.loss, - modelResultMetricEntity.iou) - .values( - addReq.getModelUid(), - addReq.getModelVerUid(), - addReq.getF1Score(), - addReq.getPrecision(), - addReq.getRecall(), - addReq.getLoss(), - addReq.getIou()) - .execute(); + queryFactory + .insert(modelResultMetricEntity) + .columns( + modelResultMetricEntity.modelUid, + modelResultMetricEntity.modelVerUid, + modelResultMetricEntity.f1Score, + modelResultMetricEntity.precision, + modelResultMetricEntity.recall, + modelResultMetricEntity.loss, + modelResultMetricEntity.iou) + .values( + addReq.getModelUid(), + addReq.getModelVerUid(), + addReq.getF1Score(), + addReq.getPrecision(), + addReq.getRecall(), + addReq.getLoss(), + addReq.getIou()) + .execute(); } - - }