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

Merge pull request 'feat/dean/test2_temp' (#102) from feat/dean/test2_temp into develop

Browse Source 
Reviewed-on: #102
This commit was merged in pull request #102.
This commit is contained in:
dean
2026-02-26 11:58:48 +09:00
parent 2309357c0d 30f0e1a885
commit 97565c5369
6 changed files with 314 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/kamco/cd/kamcoback/common/utils/FIleChecker.java
View File

@@ -279,8 +279,9 @@ public class FIleChecker {
return true; return true;
} }
//kamco-nfs를 확인하는곳이 있어서 파라미터 추가 사용용도확인후 처리 // kamco-nfs를 확인하는곳이 있어서 파라미터 추가 사용용도확인후 처리
public static List<Folder> getFolderAll(String dirPath, String sortType, int maxDepth,String nfsRootDir) { public static List<Folder> getFolderAll(
String dirPath, String sortType, int maxDepth, String nfsRootDir) {
Path startPath = Paths.get(dirPath); Path startPath = Paths.get(dirPath);
@@ -309,9 +310,10 @@ public class FIleChecker {
String parentPath = path.getParent().toString(); String parentPath = path.getParent().toString();
String fullPath = path.toAbsolutePath().toString(); String fullPath = path.toAbsolutePath().toString();
//이것이 필요한건가? // 이것이 필요한건가?
// boolean isShowHide = // boolean isShowHide =
// !parentFolderNm.equals("kamco-nfs"); // 폴더 리스트에 kamco-nfs 하위만 나오도록 처리 // !parentFolderNm.equals("kamco-nfs"); // 폴더 리스트에
// kamco-nfs 하위만 나오도록 처리
boolean isShowHide = boolean isShowHide =
!parentFolderNm.equals(nfsRootDir); // 폴더 리스트에 nfsRootDir 하위만 나오도록 처리 !parentFolderNm.equals(nfsRootDir); // 폴더 리스트에 nfsRootDir 하위만 나오도록 처리
File file = new File(fullPath); File file = new File(fullPath);
@@ -361,8 +363,8 @@ public class FIleChecker {
return folderList; return folderList;
} }
public static List<Folder> getFolderAll(String dirPath,String nfsRootDir) { public static List<Folder> getFolderAll(String dirPath, String nfsRootDir) {
return getFolderAll(dirPath, "name", 1,nfsRootDir); return getFolderAll(dirPath, "name", 1, nfsRootDir);
} }
public static int getChildFolderCount(File directory) { public static int getChildFolderCount(File directory) {

10
src/main/java/com/kamco/cd/kamcoback/gukyuin/service/GukYuinApiService.java
View File

@@ -69,9 +69,8 @@ public class GukYuinApiService {
@Value("${file.nfs}") @Value("${file.nfs}")
private String nfs; private String nfs;
// @Value("${file.dataset-dir}") // @Value("${file.dataset-dir}")
// private String datasetDir; // private String datasetDir;
@Transactional @Transactional
public ChngDetectMastDto.RegistResDto regist( public ChngDetectMastDto.RegistResDto regist(
@@ -457,8 +456,9 @@ public class GukYuinApiService {
return new ResponseObj(ApiResponseCode.DUPLICATE_DATA, "이미 국유인 연동을 한 회차입니다."); return new ResponseObj(ApiResponseCode.DUPLICATE_DATA, "이미 국유인 연동을 한 회차입니다.");
} }
// String kamconfsDatasetExportPathfsDatasetExportPath = "/kamco-nfs/dataset/export/"; // String kamconfsDatasetExportPathfsDatasetExportPath = "/kamco-nfs/dataset/export/";
String kamconfsDatasetExportPathfsDatasetExportPath = String.format("%s%s", nfs, "/dataset/export/"); String kamconfsDatasetExportPathfsDatasetExportPath =
String.format("%s%s", nfs, "/dataset/export/");
if (!Files.isDirectory(Path.of(kamconfsDatasetExportPathfsDatasetExportPath + info.getUid()))) { if (!Files.isDirectory(Path.of(kamconfsDatasetExportPathfsDatasetExportPath + info.getUid()))) {
return new ResponseObj( return new ResponseObj(
ApiResponseCode.NOT_FOUND_DATA, "파일 경로에 회차 실행 파일이 생성되지 않았습니다. 확인 부탁드립니다."); ApiResponseCode.NOT_FOUND_DATA, "파일 경로에 회차 실행 파일이 생성되지 않았습니다. 확인 부탁드립니다.");

7
src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceSendDto.java
View File

@@ -7,9 +7,7 @@ import lombok.Setter;
import lombok.ToString; import lombok.ToString;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
/** /** AI API 추론 실행 DTO */
* AI API 추론 실행 DTO
*/
@Slf4j @Slf4j
@Getter @Getter
@Setter @Setter
@@ -27,7 +25,6 @@ public class InferenceSendDto {
private String cd_model_type; private String cd_model_type;
private Double priority; private Double priority;
@Getter @Getter
@Setter @Setter
@AllArgsConstructor @AllArgsConstructor
@@ -39,7 +36,5 @@ public class InferenceSendDto {
private Integer input2_year; private Integer input2_year;
private String input1_scene_path; private String input1_scene_path;
private String input2_scene_path; private String input2_scene_path;
} }
} }

16
src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java
View File

@@ -470,13 +470,15 @@ public class InferenceResultService {
} }
// 2) local 환경 임시 처리 // 2) local 환경 임시 처리
// if ("local".equals(profile)) { // if ("local".equals(profile)) {
// if (dto.getPred_requests_areas() == null) { // if (dto.getPred_requests_areas() == null) {
// throw new IllegalStateException("pred_requests_areas is null"); // throw new IllegalStateException("pred_requests_areas is null");
// } // }
// dto.getPred_requests_areas().setInput1_scene_path("/kamco-nfs/requests/2023_local.geojson"); //
// dto.getPred_requests_areas().setInput2_scene_path("/kamco-nfs/requests/2024_local.geojson"); // dto.getPred_requests_areas().setInput1_scene_path("/kamco-nfs/requests/2023_local.geojson");
// } //
// dto.getPred_requests_areas().setInput2_scene_path("/kamco-nfs/requests/2024_local.geojson");
// }
// 3) HTTP 호출 // 3) HTTP 호출
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();

3
src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java
View File

@@ -47,7 +47,6 @@ public class MapSheetMngService {
private final UploadService uploadService; private final UploadService uploadService;
private final UserUtil userUtil = new UserUtil(); private final UserUtil userUtil = new UserUtil();
@Value("${file.root}") @Value("${file.root}")
private String nfsRootDir; private String nfsRootDir;
@@ -136,7 +135,7 @@ public class MapSheetMngService {
return dmlReturn; return dmlReturn;
} }
//TODO 삭제? // TODO 삭제?
MngDto mngDto = mapSheetMngCoreService.findMapSheetMng(errDto.getMngYyyy()); MngDto mngDto = mapSheetMngCoreService.findMapSheetMng(errDto.getMngYyyy());
// 중복체크 -> 도엽50k/uuid 경로에 업로드 할 거라 overwrite 되지 않음 // 중복체크 -> 도엽50k/uuid 경로에 업로드 할 거라 overwrite 되지 않음

16
src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetInferenceJobService.java
View File

@@ -389,13 +389,15 @@ public class MapSheetInferenceJobService {
log.info("========================================================"); log.info("========================================================");
log.info(""); log.info("");
// 2) local 환경 임시 처리 // 2) local 환경 임시 처리
// if ("local".equals(profile)) { // if ("local".equals(profile)) {
// if (dto.getPred_requests_areas() == null) { // if (dto.getPred_requests_areas() == null) {
// throw new IllegalStateException("pred_requests_areas is null"); // throw new IllegalStateException("pred_requests_areas is null");
// } // }
// dto.getPred_requests_areas().setInput1_scene_path("/kamco-nfs/requests/2023_local.geojson"); //
// dto.getPred_requests_areas().setInput2_scene_path("/kamco-nfs/requests/2024_local.geojson"); // dto.getPred_requests_areas().setInput1_scene_path("/kamco-nfs/requests/2023_local.geojson");
// } //
// dto.getPred_requests_areas().setInput2_scene_path("/kamco-nfs/requests/2024_local.geojson");
// }
// 3) HTTP 호출 // 3) HTTP 호출
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();