diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapInkxMngCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapInkxMngCoreService.java index cdcba289..a3beac7e 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapInkxMngCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapInkxMngCoreService.java @@ -44,7 +44,7 @@ public class MapInkxMngCoreService { MapInkx5kEntity entity = new MapInkx5kEntity( - req.getMapidcdNo(), req.getMapidNm(), map_polygon, fid50k.longValue(), "USE" // 기본은 USE로 + req.getMapidcdNo(), req.getMapidNm(), map_polygon, fid50k, "USE" // 기본은 USE로 ); mapInkx5kRepository.save(entity); diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapInkx5kEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapInkx5kEntity.java index d2d7fdb5..981b0818 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapInkx5kEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapInkx5kEntity.java @@ -40,13 +40,13 @@ public class MapInkx5kEntity extends CommonDateEntity { private Geometry geom; @Column(name = "fid_k50") - private Long fidK50; + private Integer fidK50; @Column(name = "use_inference") private String useInference; public MapInkx5kEntity( - String mapidcdNo, String mapidNm, Geometry geom, Long fidK50, String useInference) { + String mapidcdNo, String mapidNm, Geometry geom, Integer fidK50, String useInference) { this.mapidcdNo = mapidcdNo; this.mapidNm = mapidNm; this.geom = geom; diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java index 1226813b..dd0bcb4c 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java @@ -393,7 +393,7 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport .innerJoin(mapInkx5kEntity) .on(mapSheetMngHstEntity.mapSheetCode.eq(mapInkx5kEntity.fid)) .leftJoin(mapInkx50kEntity) - .on(mapInkx5kEntity.fidK50.eq(mapInkx50kEntity.fid.longValue())) + .on(mapInkx5kEntity.fidK50.eq(mapInkx50kEntity.fid)) .where(whereBuilder) .fetchOne(); diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/scene/MapInkx5kRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/scene/MapInkx5kRepositoryImpl.java index 2f957b8a..88531ad1 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/scene/MapInkx5kRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/scene/MapInkx5kRepositoryImpl.java @@ -66,7 +66,7 @@ public class MapInkx5kRepositoryImpl extends QuerydslRepositorySupport mapInkx5kEntity.useInference)) .from(mapInkx5kEntity) .innerJoin(mapInkx50kEntity) - .on(mapInkx5kEntity.fidK50.intValue().eq(mapInkx50kEntity.fid)) + .on(mapInkx5kEntity.fidK50.eq(mapInkx50kEntity.fid)) .where(searchUseInference(useInference), searchValueMapCdNm(searchVal)) .offset(pageable.getOffset()) .limit(pageable.getPageSize()) diff --git a/src/main/java/com/kamco/cd/kamcoback/scene/dto/MapInkxMngDto.java b/src/main/java/com/kamco/cd/kamcoback/scene/dto/MapInkxMngDto.java index 5c8baf05..635943f1 100644 --- a/src/main/java/com/kamco/cd/kamcoback/scene/dto/MapInkxMngDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/scene/dto/MapInkxMngDto.java @@ -48,7 +48,7 @@ public class MapInkxMngDto { private String mapidcdNo; private String mapidNm; private JsonNode geom; - private Long fidK50; + private Integer fidK50; private String useInference; private ZonedDateTime createdDttm; private ZonedDateTime updatedDttm;