Browse Source

비행 계획 좌표 데이터 수정

feature/auth
노승철 2 years ago
parent
commit
158c0ab6e7
  1. 4
      src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java
  2. 2
      src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanAreaCoordRepository.java

4
src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java

@ -51,7 +51,7 @@ public class BasFlightService {
List<BasFlightPlanAreaModel> area = new ArrayList<>(); List<BasFlightPlanAreaModel> area = new ArrayList<>();
for (FltPlanArea areaEntity : areaEntityList) { for (FltPlanArea areaEntity : areaEntityList) {
BasFlightPlanAreaModel areaModel = BasFlightMapper.mapper.entityToModel(areaEntity); BasFlightPlanAreaModel areaModel = BasFlightMapper.mapper.entityToModel(areaEntity);
List<FltPlanAreaCoord> coordEntityList = fltPlanAreaCoordRepository.findFirstByPlanAreaSnoOrderByPlanAreaCoordSnoAsc(areaEntity.getPlanAreaSno()); List<FltPlanAreaCoord> coordEntityList = fltPlanAreaCoordRepository.findByPlanAreaSnoOrderByPlanAreaCoordSnoAsc(areaEntity.getPlanAreaSno());
if (coordEntityList != null && !coordEntityList.isEmpty()) { if (coordEntityList != null && !coordEntityList.isEmpty()) {
areaModel.setCoordList(BasFlightMapper.mapper.entityToModelCoordList(coordEntityList)); areaModel.setCoordList(BasFlightMapper.mapper.entityToModelCoordList(coordEntityList));
} }
@ -165,7 +165,7 @@ public class BasFlightService {
List<BasFlightPlanAreaCoordModel> coordsModelList = areaModel.getCoordList(); List<BasFlightPlanAreaCoordModel> coordsModelList = areaModel.getCoordList();
if (coordsModelList != null && !coordsModelList.isEmpty()) { if (coordsModelList != null && !coordsModelList.isEmpty()) {
Integer areaSno = areaModel.getPlanAreaSno(); Integer areaSno = areaModel.getPlanAreaSno();
List<FltPlanAreaCoord> coordEntityList = fltPlanAreaCoordRepository.findFirstByPlanAreaSnoOrderByPlanAreaCoordSnoAsc(areaSno); List<FltPlanAreaCoord> coordEntityList = fltPlanAreaCoordRepository.findByPlanAreaSnoOrderByPlanAreaCoordSnoAsc(areaSno);
for (BasFlightPlanAreaCoordModel coordModel : coordsModelList) { for (BasFlightPlanAreaCoordModel coordModel : coordsModelList) {
FltPlanAreaCoord coordEntity = coordEntityList.stream().filter(fltPlanAreaCoord -> fltPlanAreaCoord.getPlanAreaCoordSno() == coordModel.getPlanAreaCoordSno()).findFirst().orElse(null); FltPlanAreaCoord coordEntity = coordEntityList.stream().filter(fltPlanAreaCoord -> fltPlanAreaCoord.getPlanAreaCoordSno() == coordModel.getPlanAreaCoordSno()).findFirst().orElse(null);
if (coordEntity == null) { if (coordEntity == null) {

2
src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanAreaCoordRepository.java

@ -8,5 +8,5 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
public interface FltPlanAreaCoordRepository extends JpaRepository<FltPlanAreaCoord, Integer> { public interface FltPlanAreaCoordRepository extends JpaRepository<FltPlanAreaCoord, Integer> {
List<FltPlanAreaCoord> findFirstByPlanAreaSnoOrderByPlanAreaCoordSnoAsc(Integer planAreaSno); List<FltPlanAreaCoord> findByPlanAreaSnoOrderByPlanAreaCoordSnoAsc(Integer planAreaSno);
} }

Loading…
Cancel
Save