diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/WriteCnt.java b/src/main/java/com/kamco/cd/kamcoback/inference/dto/WriteCnt.java similarity index 88% rename from src/main/java/com/kamco/cd/kamcoback/inference/WriteCnt.java rename to src/main/java/com/kamco/cd/kamcoback/inference/dto/WriteCnt.java index d81c1a32..86fc652f 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/WriteCnt.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/dto/WriteCnt.java @@ -1,4 +1,4 @@ -package com.kamco.cd.kamcoback.inference; +package com.kamco.cd.kamcoback.inference.dto; public record WriteCnt(int shp, int shx, int dbf, int prj, int geojson) { diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/service/GeoToolsShpWriter.java b/src/main/java/com/kamco/cd/kamcoback/inference/service/GeoToolsShpWriter.java index def45ede..4a0492d6 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/service/GeoToolsShpWriter.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/service/GeoToolsShpWriter.java @@ -4,9 +4,8 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.kamco.cd.kamcoback.inference.ShpWriter; -import com.kamco.cd.kamcoback.inference.WriteCnt; import com.kamco.cd.kamcoback.inference.dto.InferenceResultShpDto; +import com.kamco.cd.kamcoback.inference.dto.WriteCnt; import java.io.File; import java.io.FileOutputStream; import java.io.OutputStreamWriter; diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultShpService.java b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultShpService.java index 7a138047..5d795feb 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultShpService.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultShpService.java @@ -1,8 +1,7 @@ package com.kamco.cd.kamcoback.inference.service; -import com.kamco.cd.kamcoback.inference.ShpWriter; -import com.kamco.cd.kamcoback.inference.WriteCnt; import com.kamco.cd.kamcoback.inference.dto.InferenceResultShpDto; +import com.kamco.cd.kamcoback.inference.dto.WriteCnt; import com.kamco.cd.kamcoback.postgres.core.InferenceResultShpCoreService; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/ShpWriter.java b/src/main/java/com/kamco/cd/kamcoback/inference/service/ShpWriter.java similarity index 76% rename from src/main/java/com/kamco/cd/kamcoback/inference/ShpWriter.java rename to src/main/java/com/kamco/cd/kamcoback/inference/service/ShpWriter.java index 850c1188..01f6cf69 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/ShpWriter.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/service/ShpWriter.java @@ -1,6 +1,7 @@ -package com.kamco.cd.kamcoback.inference; +package com.kamco.cd.kamcoback.inference.service; import com.kamco.cd.kamcoback.inference.dto.InferenceResultShpDto; +import com.kamco.cd.kamcoback.inference.dto.WriteCnt; import java.util.List; public interface ShpWriter { 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 c7ff1203..b1ad4255 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 @@ -181,6 +181,7 @@ public class MapSheetMngService { addReq.setMapSheetNum(errDto.getMapSheetNum()); addReq.setRefMapSheetNum(errDto.getRefMapSheetNum()); addReq.setFilePath(uploadPath); + addReq.setFileName(tfwFile.getOriginalFilename()); addReq.setFileExt("tfw"); addReq.setFileSize(tfwFile.getSize()); @@ -189,6 +190,7 @@ public class MapSheetMngService { mapSheetMngCoreService.mngFileSave(addReq); + addReq.setFileName(tifFile.getOriginalFilename()); addReq.setFileExt("tif"); addReq.setFileSize(tifFile.getSize()); mapSheetMngCoreService.mngFileSave(addReq);