MVPTeam/test
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feat/infer_dev_260107' into feat/infer_dev_260107

Browse Source
This commit is contained in:
Moon
2026-01-12 12:18:02 +09:00
parent 06ae705e3a 7337c4dd39
commit 0aa87354e8
6 changed files with 84 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java
View File

@@ -16,6 +16,8 @@ import com.kamco.cd.kamcoback.postgres.repository.Inference.MapSheetAnalDataInfe
import com.kamco.cd.kamcoback.postgres.repository.Inference.MapSheetLearn5kRepository;
import com.kamco.cd.kamcoback.postgres.repository.Inference.MapSheetLearnRepository;
import com.kamco.cd.kamcoback.postgres.repository.scene.MapInkx5kRepository;
import com.kamco.cd.kamcoback.scene.dto.MapInkxMngDto;
import com.kamco.cd.kamcoback.scene.dto.MapInkxMngDto.Search5kReq;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityNotFoundException;
import jakarta.validation.constraints.NotNull;
@@ -71,14 +73,6 @@ public class InferenceResultCoreService {
// learn 테이블 저장
MapSheetLearnEntity savedLearn = mapSheetLearnRepository.save(mapSheetLearnEntity);
// if (req.getMapSheetScope().equals(MapSheetScope.ALL)) {
// List<String> mapSheetIds = new ArrayList<>();
// mapInkx5kRepository.findAll().forEach(mapInkx5kEntity -> {
// mapSheetIds.add(mapInkx5kEntity.getMapidcdNo());
// });
// req.setMapSheetNum(mapSheetIds);
// }
final int CHUNK = 1000;
List<MapSheetLearn5kEntity> buffer = new ArrayList<>(CHUNK);
List<String> mapSheetNumList = req.getMapSheetNum();
@@ -214,4 +208,8 @@ public class InferenceResultCoreService {
.map(MapInkx5kEntity::toEntity)
.toList();
}
public List<MapInkxMngDto.Basic> findByMapidList(Search5kReq req) {
return mapInkx5kRepository.findByMapidList(req);
}
}

3
src/main/java/com/kamco/cd/kamcoback/postgres/repository/scene/MapInkx5kRepositoryCustom.java
View File

@@ -4,6 +4,7 @@ import com.kamco.cd.kamcoback.common.enums.CommonUseStatus;
import com.kamco.cd.kamcoback.postgres.entity.MapInkx5kEntity;
import com.kamco.cd.kamcoback.scene.dto.MapInkxMngDto;
import com.kamco.cd.kamcoback.scene.dto.MapInkxMngDto.MapList;
import com.kamco.cd.kamcoback.scene.dto.MapInkxMngDto.Search5kReq;
import com.kamco.cd.kamcoback.scene.dto.MapInkxMngDto.searchReq;
import java.util.List;
import java.util.Optional;
@@ -26,5 +27,5 @@ public interface MapInkx5kRepositoryCustom {
List<MapInkx5kEntity> findByMapSheetNumInAndUseInference(
List<String> mapSheetNums, CommonUseStatus use);
Optional<MapInkx5kEntity> findByMapidList();
List<MapInkxMngDto.Basic> findByMapidList(Search5kReq search5kReq);
}

30
src/main/java/com/kamco/cd/kamcoback/postgres/repository/scene/MapInkx5kRepositoryImpl.java
View File

@@ -8,7 +8,9 @@ import com.kamco.cd.kamcoback.postgres.entity.MapInkx5kEntity;
import com.kamco.cd.kamcoback.postgres.entity.QMapInkx5kEntity;
import com.kamco.cd.kamcoback.scene.dto.MapInkxMngDto;
import com.kamco.cd.kamcoback.scene.dto.MapInkxMngDto.MapList;
import com.kamco.cd.kamcoback.scene.dto.MapInkxMngDto.Search5kReq;
import com.kamco.cd.kamcoback.scene.dto.MapInkxMngDto.searchReq;
import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Projections;
import com.querydsl.core.types.dsl.BooleanExpression;
import com.querydsl.core.types.dsl.Expressions;
@@ -16,6 +18,7 @@ import com.querydsl.jpa.impl.JPAQueryFactory;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import org.apache.commons.lang3.StringUtils;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
@@ -143,8 +146,31 @@ public class MapInkx5kRepositoryImpl extends QuerydslRepositorySupport
}
@Override
public Optional<MapInkx5kEntity> findByMapidList() {
return Optional.empty();
public List<MapInkxMngDto.Basic> findByMapidList(Search5kReq search5kReq) {
BooleanBuilder builder = new BooleanBuilder();
if (StringUtils.isNotBlank(search5kReq.getMapidcdNo())) {
builder.and(mapInkx5kEntity.mapidcdNo.eq(search5kReq.getMapidcdNo()));
}
if (StringUtils.isNotBlank(search5kReq.getUseInference())) {
builder.and(
mapInkx5kEntity.useInference.eq(
CommonUseStatus.getEnumById(search5kReq.getUseInference())));
}
return queryFactory
.select(
Projections.constructor(
MapInkxMngDto.Basic.class,
mapInkx5kEntity.fid,
mapInkx5kEntity.mapidcdNo,
mapInkx5kEntity.mapidNm,
mapInkx5kEntity.geom,
mapInkx5kEntity.useInference))
.from(mapInkx5kEntity)
.where(builder)
.fetch();
}
private BooleanExpression searchUseInference(CommonUseStatus useInference) {