diff --git a/app/kac-app/build.gradle b/app/kac-app/build.gradle index 59af035..ed77343 100644 --- a/app/kac-app/build.gradle +++ b/app/kac-app/build.gradle @@ -40,6 +40,7 @@ dependencies { implementation project(":web:security") implementation project(":web:api-common") implementation project(":web:api-user") + implementation project(":web:api-flight") } ext { diff --git a/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComFileBasRepository.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComFileBasRepository.java index 5fa21ef..aac1931 100644 --- a/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComFileBasRepository.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComFileBasRepository.java @@ -3,6 +3,10 @@ package kr.co.palnet.kac.data.com.repository; import kr.co.palnet.kac.data.com.domain.ComFileBas; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.Optional; + public interface ComFileBasRepository extends JpaRepository { + Optional findFirstByOrderByFileGroupNoDesc(); + } diff --git a/data/com/src/main/java/kr/co/palnet/kac/data/com/service/ComFileDomainService.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/service/ComFileDomainService.java index 8ce729f..982dbd0 100644 --- a/data/com/src/main/java/kr/co/palnet/kac/data/com/service/ComFileDomainService.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/service/ComFileDomainService.java @@ -6,6 +6,8 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @Slf4j @RequiredArgsConstructor @@ -16,4 +18,16 @@ public class ComFileDomainService { public ComFileBas saveComFileBas(ComFileBas entity){ return comFileBasRepository.save(entity); } + + public Long findFirstByOrderByFileGroupNoDesc(){ + Optional entityData = comFileBasRepository.findFirstByOrderByFileGroupNoDesc(); + + if(entityData.isPresent()){ + ComFileBas lastComFileBas = entityData.get(); + + return lastComFileBas.getFileGroupNo() + 1; + } else { + return 1L; + } + } } diff --git a/web/api-flight/build.gradle b/web/api-flight/build.gradle index 9a6e25e..37fd150 100644 --- a/web/api-flight/build.gradle +++ b/web/api-flight/build.gradle @@ -6,6 +6,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'org.apache.httpcomponents.client5:httpclient5:5.3' implementation 'org.apache.commons:commons-io:1.3.2' implementation 'com.itextpdf:html2pdf:5.0.3' diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/external/model/ComnSmsLaancAprovModel.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/external/model/ComnSmsLaancAprovModel.java similarity index 94% rename from web/api-flight/src/main/java/kr/co/palnet/kac/external/model/ComnSmsLaancAprovModel.java rename to web/api-flight/src/main/java/kr/co/palnet/kac/api/external/model/ComnSmsLaancAprovModel.java index aab6dfc..92ea0a3 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/external/model/ComnSmsLaancAprovModel.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/external/model/ComnSmsLaancAprovModel.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.external.model; +package kr.co.palnet.kac.api.external.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/external/model/CtrTrnsLctnModel.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/external/model/CtrTrnsLctnModel.java similarity index 87% rename from web/api-flight/src/main/java/kr/co/palnet/kac/external/model/CtrTrnsLctnModel.java rename to web/api-flight/src/main/java/kr/co/palnet/kac/api/external/model/CtrTrnsLctnModel.java index e25e7be..f9457cd 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/external/model/CtrTrnsLctnModel.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/external/model/CtrTrnsLctnModel.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.external.model; +package kr.co.palnet.kac.api.external.model; import lombok.Data; diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/external/service/ComnSmsService.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/external/service/ComnSmsService.java similarity index 73% rename from web/api-flight/src/main/java/kr/co/palnet/kac/external/service/ComnSmsService.java rename to web/api-flight/src/main/java/kr/co/palnet/kac/api/external/service/ComnSmsService.java index 47e842b..f92ab79 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/external/service/ComnSmsService.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/external/service/ComnSmsService.java @@ -1,8 +1,8 @@ -package kr.co.palnet.kac.external.service; +package kr.co.palnet.kac.api.external.service; +import kr.co.palnet.kac.api.external.model.ComnSmsLaancAprovModel; import kr.co.palnet.kac.api.v1.flight.laanc.model.SuredataEntityDTO; -import kr.co.palnet.kac.external.model.ComnSmsLaancAprovModel; -import kr.co.palnet.kac.util.DateUtils; +import kr.co.palnet.kac.api.util.DateUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.core.io.ClassPathResource; @@ -12,7 +12,6 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; -import java.time.Instant; import java.time.LocalDateTime; @Slf4j @@ -53,22 +52,21 @@ public class ComnSmsService { template = template.replace("${address}", model.getAddress()); template = template.replace("${elev}", model.getElev()); - SuredataEntityDTO entity = getInitialEntity(); - entity.setSubject("[비행승인 완료]"); - entity.setMsg(template); - entity.setCallname(model.getPilotName()); - entity.setCallphone(model.getCallphone()); - entity.setKind("M"); + SuredataEntityDTO dto = getInitialEntity(); + dto.setSubject("[비행승인 완료]"); + dto.setMsg(template); + dto.setCallname(model.getPilotName()); + dto.setCallphone(model.getCallphone()); + dto.setKind("M"); - log.info("entity : {}", entity); + log.info("entity : {}", dto); log.info("========================================"); log.info("message : {}", template); log.info("========================================"); - log.info("message : {}", entity.getMsg()); + log.info("message : {}", dto.getMsg()); -// suredataRepository.save(entity); - - return entity; + if(dto.getBatchflag() == null) dto.setBatchflag(0); + return dto; } /** @@ -77,18 +75,18 @@ public class ComnSmsService { */ public SuredataEntityDTO getInitialEntity() { String nowStr = DateUtils.toDateTimeStringByFormat(LocalDateTime.now(), "yyyyMMddHHmmss"); - SuredataEntityDTO entity = new SuredataEntityDTO(); - entity.setUsercode("palnet"); - entity.setIntime(nowStr); - entity.setReqname("한국공항공사"); - entity.setReqphone("0262003912"); // 1661-2626 + SuredataEntityDTO dto = new SuredataEntityDTO(); + dto.setUsercode("palnet"); + dto.setIntime(nowStr); + dto.setReqname("한국공항공사"); + dto.setReqphone("0262003912"); // 1661-2626 // entity.setCallname("지대한"); // entity.setCallphone("010-0000-0000"); // entity.setSubject("주제"); // entity.setMsg(""); - entity.setReqtime("00000000000000"); - entity.setResult("0"); - entity.setKind("S"); - return entity; + dto.setReqtime("00000000000000"); + dto.setResult("0"); + dto.setKind("S"); + return dto; } } diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/external/service/CtrTrnsLctnService.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/external/service/CtrTrnsLctnService.java similarity index 97% rename from web/api-flight/src/main/java/kr/co/palnet/kac/external/service/CtrTrnsLctnService.java rename to web/api-flight/src/main/java/kr/co/palnet/kac/api/external/service/CtrTrnsLctnService.java index c35ce5b..98208f5 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/external/service/CtrTrnsLctnService.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/external/service/CtrTrnsLctnService.java @@ -1,6 +1,6 @@ -package kr.co.palnet.kac.external.service; +package kr.co.palnet.kac.api.external.service; -import kr.co.palnet.kac.external.model.CtrTrnsLctnModel; +import kr.co.palnet.kac.api.external.model.CtrTrnsLctnModel; import kr.co.palnet.kac.core.exception.BaseErrorCode; import kr.co.palnet.kac.util.ObjectMapperUtils; import org.slf4j.Logger; @@ -38,6 +38,7 @@ public class CtrTrnsLctnService { */ public CtrTrnsLctnModel convertLatlonToAddress(double lat , double lon) { HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory(); + factory.setConnectTimeout(5000); //타임아웃 설정 5초 factory.setConnectionRequestTimeout(5000);//타임아웃 설정 5초 RestTemplate restTemplate = new RestTemplate(factory); diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/util/DateUtils.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/util/DateUtils.java similarity index 93% rename from web/api-flight/src/main/java/kr/co/palnet/kac/util/DateUtils.java rename to web/api-flight/src/main/java/kr/co/palnet/kac/api/util/DateUtils.java index 2d0ac42..f50e02a 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/util/DateUtils.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/util/DateUtils.java @@ -1,9 +1,8 @@ -package kr.co.palnet.kac.util; +package kr.co.palnet.kac.api.util; import java.time.LocalDate; import java.time.LocalDateTime; -import java.time.LocalTime; import java.time.format.DateTimeFormatter; public class DateUtils { diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/util/FileUtils.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/util/FileUtils.java similarity index 91% rename from web/api-flight/src/main/java/kr/co/palnet/kac/util/FileUtils.java rename to web/api-flight/src/main/java/kr/co/palnet/kac/api/util/FileUtils.java index efb02f1..e53f02f 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/util/FileUtils.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/util/FileUtils.java @@ -1,21 +1,20 @@ -package kr.co.palnet.kac.util; +package kr.co.palnet.kac.api.util; import kr.co.palnet.kac.api.v1.flight.laanc.model.ComFileBasDTO; import kr.co.palnet.kac.config.security.util.SessionHelper; -import kr.co.palnet.kac.util.constant.ExtensionConstant; -import kr.co.palnet.kac.util.model.LaancPdfModel; +import kr.co.palnet.kac.api.util.constant.ExtensionConstant; +import kr.co.palnet.kac.api.util.model.LaancPdfModel; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.springframework.core.io.ClassPathResource; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; import java.io.IOException; import java.io.InputStream; -import java.time.Instant; import java.time.LocalDateTime; -@Component +@Service @RequiredArgsConstructor @Slf4j public class FileUtils { @@ -85,7 +84,7 @@ public class FileUtils { ext = path.substring(lastIndex + 1); } - try (InputStream is = resource.getInputStream();) { + try (InputStream is = resource.getInputStream()) { byte[] imageBytes = IOUtils.toByteArray(is); String encodedString = java.util.Base64.getEncoder().encodeToString(imageBytes); str diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/util/HttpUtils.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/util/HttpUtils.java similarity index 97% rename from web/api-flight/src/main/java/kr/co/palnet/kac/util/HttpUtils.java rename to web/api-flight/src/main/java/kr/co/palnet/kac/api/util/HttpUtils.java index 96fa12d..c99f2e9 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/util/HttpUtils.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/util/HttpUtils.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.util; +package kr.co.palnet.kac.api.util; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/util/PdfUtils.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/util/PdfUtils.java similarity index 95% rename from web/api-flight/src/main/java/kr/co/palnet/kac/util/PdfUtils.java rename to web/api-flight/src/main/java/kr/co/palnet/kac/api/util/PdfUtils.java index 755a779..f0ad0f6 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/util/PdfUtils.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/util/PdfUtils.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.util; +package kr.co.palnet.kac.api.util; import com.itextpdf.html2pdf.ConverterProperties; import com.itextpdf.html2pdf.HtmlConverter; @@ -7,8 +7,8 @@ import com.itextpdf.kernel.pdf.PdfDocument; import com.itextpdf.kernel.pdf.PdfWriter; import com.itextpdf.layout.font.FontProvider; import kr.co.palnet.kac.api.v1.flight.laanc.model.ComFileBasDTO; -import kr.co.palnet.kac.util.constant.ExtensionConstant; -import kr.co.palnet.kac.util.model.PdfBaseModel; +import kr.co.palnet.kac.api.util.constant.ExtensionConstant; +import kr.co.palnet.kac.api.util.model.PdfBaseModel; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -21,8 +21,8 @@ import java.io.FileOutputStream; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; -import java.time.Instant; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.Map; @Slf4j @@ -78,7 +78,7 @@ public class PdfUtils { String pdfPath = new StringBuilder() .append(this.BASE_PATH) .append(this.PDF_FORDER_PATH) - .append(LocalDate.now().toString()) + .append(LocalDate.now()) .append("/") .toString(); @@ -147,7 +147,7 @@ public class PdfUtils { result.setFileGroupNo(0L); result.setFilePath(pdfPath); result.setFileExt(ExtensionConstant.PDF.extension); - result.setCreateDt(Instant.now()); + result.setCreateDt(LocalDateTime.now()); result.setFileSaveNm(fileName); result.setFileOriNm(fileName); diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/util/constant/ExtensionConstant.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/util/constant/ExtensionConstant.java similarity index 94% rename from web/api-flight/src/main/java/kr/co/palnet/kac/util/constant/ExtensionConstant.java rename to web/api-flight/src/main/java/kr/co/palnet/kac/api/util/constant/ExtensionConstant.java index 81bdfee..e21fbd5 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/util/constant/ExtensionConstant.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/util/constant/ExtensionConstant.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.util.constant; +package kr.co.palnet.kac.api.util.constant; import java.util.HashSet; diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/util/model/LaancPdfModel.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/util/model/LaancPdfModel.java similarity index 87% rename from web/api-flight/src/main/java/kr/co/palnet/kac/util/model/LaancPdfModel.java rename to web/api-flight/src/main/java/kr/co/palnet/kac/api/util/model/LaancPdfModel.java index 2feee44..7fa6910 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/util/model/LaancPdfModel.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/util/model/LaancPdfModel.java @@ -1,13 +1,15 @@ -package kr.co.palnet.kac.util.model; +package kr.co.palnet.kac.api.util.model; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Field; import java.util.HashMap; @Data +@Slf4j @EqualsAndHashCode(callSuper = true) public class LaancPdfModel extends PdfBaseModel { @@ -44,10 +46,8 @@ public class LaancPdfModel extends PdfBaseModel { result.put(key, value); } - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e){ - e.printStackTrace(); + } catch (IllegalArgumentException | IllegalAccessException e) { + log.error("", e); } return result; diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/util/model/PdfBaseModel.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/util/model/PdfBaseModel.java similarity index 83% rename from web/api-flight/src/main/java/kr/co/palnet/kac/util/model/PdfBaseModel.java rename to web/api-flight/src/main/java/kr/co/palnet/kac/api/util/model/PdfBaseModel.java index b9b7c2e..fe535d5 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/util/model/PdfBaseModel.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/util/model/PdfBaseModel.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.util.model; +package kr.co.palnet.kac.api.util.model; import lombok.Data; diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/controller/FlightLaancController.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/controller/FlightLaancController.java index 4e563d1..f6a29aa 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/controller/FlightLaancController.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/controller/FlightLaancController.java @@ -19,7 +19,7 @@ public class FlightLaancController { private final FlightLaancService flightLaancService; - @PostMapping("/plan/create") + @PostMapping("/create/plan") public ResponseEntity createPlan(@RequestBody CreateLaancPlanRQ rq) { flightLaancService.createPlan(rq); diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanArcrftDTO.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanArcrftDTO.java index 5c61f62..8774301 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanArcrftDTO.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanArcrftDTO.java @@ -1,5 +1,6 @@ package kr.co.palnet.kac.api.v1.flight.laanc.model; +import kr.co.palnet.kac.api.v1.flight.laanc.model.create.BasLaancArcrftModel; import kr.co.palnet.kac.data.flt.model.FltPlanArcrft; import lombok.Data; @@ -80,6 +81,7 @@ public class FltPlanArcrftDTO { .planSno(dto.getPlanSno()) .arcrftSno(dto.getArcrftSno()) .idntfNum(dto.getIdntfNum()) + .groupNm(dto.getGroupNm()) .prdctNum(dto.getPrdctNum()) .arcrftTypeCd(dto.getArcrftTypeCd()) .arcrftModelNm(dto.getArcrftModelNm()) diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanAreaCoordDTO.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanAreaCoordDTO.java index e9265da..c3a77a3 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanAreaCoordDTO.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanAreaCoordDTO.java @@ -1,5 +1,6 @@ package kr.co.palnet.kac.api.v1.flight.laanc.model; +import kr.co.palnet.kac.api.v1.flight.laanc.model.create.BasLaancAreaCoordModel; import kr.co.palnet.kac.data.flt.model.FltPlanAreaCoord; import lombok.Data; diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanAreaDTO.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanAreaDTO.java index d01e9cf..90edbe2 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanAreaDTO.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanAreaDTO.java @@ -1,6 +1,7 @@ package kr.co.palnet.kac.api.v1.flight.laanc.model; import kr.co.palnet.kac.api.v1.flight.laanc.model.constant.FltMethod; +import kr.co.palnet.kac.api.v1.flight.laanc.model.create.BasLaancAreaModel; import kr.co.palnet.kac.data.flt.model.FltPlanArea; import lombok.Data; diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanBasDTO.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanBasDTO.java index fcbf3eb..abb61c6 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanBasDTO.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanBasDTO.java @@ -3,6 +3,7 @@ package kr.co.palnet.kac.api.v1.flight.laanc.model; import kr.co.palnet.kac.api.v1.flight.laanc.model.constant.FltPurpose; import kr.co.palnet.kac.api.v1.flight.laanc.model.constant.FltType; import kr.co.palnet.kac.api.v1.flight.laanc.model.create.CreateLaancPlanRQ; +import kr.co.palnet.kac.api.v1.flight.laanc.model.create.CstmrModel; import kr.co.palnet.kac.data.flt.model.FltPlanBas; import lombok.Data; diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanPilotDTO.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanPilotDTO.java index f452cac..3cea6d6 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanPilotDTO.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanPilotDTO.java @@ -1,13 +1,8 @@ package kr.co.palnet.kac.api.v1.flight.laanc.model; -import jakarta.persistence.Column; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; +import kr.co.palnet.kac.api.v1.flight.laanc.model.create.CstmrModel; import kr.co.palnet.kac.data.flt.model.FltPlanPilot; import lombok.Data; -import org.hibernate.annotations.CreationTimestamp; -import org.hibernate.annotations.UpdateTimestamp; import java.time.LocalDateTime; @@ -36,8 +31,6 @@ public class FltPlanPilotDTO { FltPlanPilotDTO dto = new FltPlanPilotDTO(); dto.setCstmrSno(model.getCstmrSno()); dto.setMemberName(model.getMemberName()); - dto.setEmail(model.getEmail()); - dto.setHpno(model.getHpno()); dto.setClncd(model.getClncd()); dto.setAddr(model.getAddr()); dto.setAddrDtlCn(model.getAddrDtlCn()); diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/constant/ArcrftTypeCd.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/constant/ArcrftTypeCd.java index 8a9506e..f0a5f19 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/constant/ArcrftTypeCd.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/constant/ArcrftTypeCd.java @@ -20,9 +20,9 @@ public enum ArcrftTypeCd { } @JsonCreator - public static ArcrftTypeCd fromCode(String code) { + public static ArcrftTypeCd fromCode(String node) { for (ArcrftTypeCd arcrftTypeCd : ArcrftTypeCd.values()) { - if (arcrftTypeCd.getCode().equals(code)) { + if (arcrftTypeCd.getCode().equals(node)) { return arcrftTypeCd; } } diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/constant/ArcrftWghtCd.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/constant/ArcrftWghtCd.java index 35fc5ab..79768d1 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/constant/ArcrftWghtCd.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/constant/ArcrftWghtCd.java @@ -23,9 +23,9 @@ public enum ArcrftWghtCd { } @JsonCreator - public static ArcrftWghtCd fromCode(String code) { + public static ArcrftWghtCd fromCode(String node) { for (ArcrftWghtCd arcrftWghtCd : ArcrftWghtCd.values()) { - if (arcrftWghtCd.getCode().equals(code)) { + if (arcrftWghtCd.getCode().equals(node)) { return arcrftWghtCd; } } diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/constant/FltMethod.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/constant/FltMethod.java index 7d2c6c4..36afe22 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/constant/FltMethod.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/constant/FltMethod.java @@ -27,9 +27,9 @@ public enum FltMethod { } @JsonCreator - public static FltMethod fromCode(String code) { + public static FltMethod fromCode(String node) { for (FltMethod fltMethod : FltMethod.values()) { - if (fltMethod.getCode().equals(code)) { + if (fltMethod.getCode().equals(node)) { return fltMethod; } } diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/constant/FltPurpose.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/constant/FltPurpose.java index f587749..98890dc 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/constant/FltPurpose.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/constant/FltPurpose.java @@ -33,9 +33,9 @@ public enum FltPurpose { } @JsonCreator - public static FltPurpose fromCode(String code) { + public static FltPurpose fromCode(String node) { for (FltPurpose fltPurpose : FltPurpose.values()) { - if (fltPurpose.getCode().equals(code)) { + if (fltPurpose.getCode().equals(node)) { return fltPurpose; } } diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/constant/FltType.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/constant/FltType.java index bdcdf61..1cacf75 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/constant/FltType.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/constant/FltType.java @@ -19,9 +19,9 @@ public enum FltType { } @JsonCreator - public static FltType fromCode(String code) { + public static FltType fromCode(String node) { for (FltType fltType : FltType.values()) { - if (fltType.getCode().equals(code)) { + if (fltType.getCode().equals(node)) { return fltType; } } diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/AnctCstmrTermsModel.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/create/AnctCstmrTermsModel.java similarity index 83% rename from web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/AnctCstmrTermsModel.java rename to web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/create/AnctCstmrTermsModel.java index 3bda7f1..96ba53a 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/AnctCstmrTermsModel.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/create/AnctCstmrTermsModel.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.api.v1.flight.laanc.model; +package kr.co.palnet.kac.api.v1.flight.laanc.model.create; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/BasLaancArcrftModel.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/create/BasLaancArcrftModel.java similarity index 96% rename from web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/BasLaancArcrftModel.java rename to web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/create/BasLaancArcrftModel.java index de7f12b..c8e62bb 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/BasLaancArcrftModel.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/create/BasLaancArcrftModel.java @@ -1,6 +1,5 @@ -package kr.co.palnet.kac.api.v1.flight.laanc.model; +package kr.co.palnet.kac.api.v1.flight.laanc.model.create; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; import io.swagger.v3.oas.annotations.media.Schema; import kr.co.palnet.kac.api.v1.flight.laanc.model.constant.ArcrftTypeCd; import kr.co.palnet.kac.api.v1.flight.laanc.model.constant.ArcrftWghtCd; diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/BasLaancAreaCoordModel.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/create/BasLaancAreaCoordModel.java similarity index 81% rename from web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/BasLaancAreaCoordModel.java rename to web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/create/BasLaancAreaCoordModel.java index ffbe71c..ecf6409 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/BasLaancAreaCoordModel.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/create/BasLaancAreaCoordModel.java @@ -1,12 +1,9 @@ -package kr.co.palnet.kac.api.v1.flight.laanc.model; +package kr.co.palnet.kac.api.v1.flight.laanc.model.create; import io.swagger.v3.oas.annotations.media.Schema; -import kr.co.palnet.kac.api.v1.flight.laanc.model.constant.FltMethod; import lombok.Data; import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.util.List; @Data public class BasLaancAreaCoordModel { diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/BasLaancAreaModel.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/create/BasLaancAreaModel.java similarity index 96% rename from web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/BasLaancAreaModel.java rename to web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/create/BasLaancAreaModel.java index 9a0caf0..c2d9bec 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/BasLaancAreaModel.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/create/BasLaancAreaModel.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.api.v1.flight.laanc.model; +package kr.co.palnet.kac.api.v1.flight.laanc.model.create; import io.swagger.v3.oas.annotations.media.Schema; import kr.co.palnet.kac.api.v1.flight.laanc.model.constant.FltMethod; diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/create/CreateLaancPlanRQ.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/create/CreateLaancPlanRQ.java index 7714719..15552d5 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/create/CreateLaancPlanRQ.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/create/CreateLaancPlanRQ.java @@ -1,9 +1,6 @@ package kr.co.palnet.kac.api.v1.flight.laanc.model.create; import io.swagger.v3.oas.annotations.media.Schema; -import kr.co.palnet.kac.api.v1.flight.laanc.model.AnctCstmrTermsModel; -import kr.co.palnet.kac.api.v1.flight.laanc.model.BasLaancArcrftModel; -import kr.co.palnet.kac.api.v1.flight.laanc.model.BasLaancAreaModel; import kr.co.palnet.kac.api.v1.flight.laanc.model.constant.FltPurpose; import kr.co.palnet.kac.api.v1.flight.laanc.model.constant.FltType; import kr.co.palnet.kac.api.v1.flight.laanc.model.pliotvalid.PilotValidRs; @@ -16,10 +13,10 @@ import java.util.List; public class CreateLaancPlanRQ { @Schema(description = "비행계획서 일련번호", example = "1", hidden = true) - private Integer planSno; + private Long planSno; @Schema(description = "사용자 일련번호", example = "1", hidden = true) - private Integer cstmrSno; + private Long cstmrSno; @Schema(description = "이름", example = "조종사") private String memberName; diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/CstmrModel.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/create/CstmrModel.java similarity index 97% rename from web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/CstmrModel.java rename to web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/create/CstmrModel.java index 24aa935..85d5f47 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/CstmrModel.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/create/CstmrModel.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.api.v1.flight.laanc.model; +package kr.co.palnet.kac.api.v1.flight.laanc.model.create; import kr.co.palnet.kac.data.pty.model.PtyCstmrBas; import kr.co.palnet.kac.data.pty.model.PtyCstmrDtl; diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/service/FlightLaancService.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/service/FlightLaancService.java index 6ff22b2..ca8575f 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/service/FlightLaancService.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/service/FlightLaancService.java @@ -1,12 +1,12 @@ package kr.co.palnet.kac.api.v1.flight.laanc.service; -import kr.co.palnet.kac.api.v1.flight.laanc.model.CstmrModel; +import kr.co.palnet.kac.api.external.service.CtrTrnsLctnService; +import kr.co.palnet.kac.api.v1.flight.laanc.model.create.CstmrModel; import kr.co.palnet.kac.api.v1.flight.laanc.model.*; -import kr.co.palnet.kac.api.v1.flight.laanc.model.create.CreateLaancPlanRQ; -import kr.co.palnet.kac.api.v1.flight.laanc.model.create.CreateLaancPlanRS; +import kr.co.palnet.kac.api.v1.flight.laanc.model.create.*; import kr.co.palnet.kac.data.other.service.OtherDomainService; -import kr.co.palnet.kac.external.model.ComnSmsLaancAprovModel; -import kr.co.palnet.kac.external.model.CtrTrnsLctnModel; +import kr.co.palnet.kac.api.external.model.ComnSmsLaancAprovModel; +import kr.co.palnet.kac.api.external.model.CtrTrnsLctnModel; import kr.co.palnet.kac.api.v1.flight.laanc.model.pliotvalid.PilotValidRs; import kr.co.palnet.kac.config.security.util.SessionHelper; import kr.co.palnet.kac.core.exception.BaseErrorCode; @@ -21,12 +21,12 @@ import kr.co.palnet.kac.data.pty.model.PtyGroupBas; import kr.co.palnet.kac.data.pty.service.PtyCstmrDomainService; import kr.co.palnet.kac.data.pty.service.PtyGroupDomainService; import kr.co.palnet.kac.data.pty.service.PtyTermsDomainService; -import kr.co.palnet.kac.external.service.ComnSmsService; -import kr.co.palnet.kac.external.service.CtrTrnsLctnService; -import kr.co.palnet.kac.util.DateUtils; -import kr.co.palnet.kac.util.FileUtils; -import kr.co.palnet.kac.util.HttpUtils; -import kr.co.palnet.kac.util.model.LaancPdfModel; +import kr.co.palnet.kac.api.external.service.ComnSmsService; +import kr.co.palnet.kac.api.util.DateUtils; +import kr.co.palnet.kac.api.util.FileUtils; +import kr.co.palnet.kac.api.util.HttpUtils; +import kr.co.palnet.kac.api.util.model.LaancPdfModel; +import kr.co.palnet.kac.util.EncryptUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -57,7 +57,7 @@ public class FlightLaancService { private final CtrTrnsLctnService ctrTrnsLctnService; private final ComnSmsService comnSmsService; - +// private final FileUtils fileUtils; @Transactional @@ -79,7 +79,9 @@ public class FlightLaancService { fltPlanBasDto.setAprvlYn("Y"); fltPlanBasDto.setAprvlDt(LocalDateTime.now()); fltPlanBasDto.setCreateUserId(userId); + fltPlanBasDto.setCreateDt(LocalDateTime.now()); fltPlanBasDto.setUpdateUserId(userId); + fltPlanBasDto.setUpdateDt(LocalDateTime.now()); // KAC 그룹 ID - LAANC에서는 KAC 그룹으로만 보여주도록 함. String groupId = ""; @@ -87,7 +89,7 @@ public class FlightLaancService { Optional> kacData = ptyGroupDomainService.findByGroupNm("KAC"); - if (kacData.isPresent()) { + if (kacData.isPresent() && !kacData.get().isEmpty()) { List kac = kacData.get(); groupId = kac.get(0).getGroupId(); groupNm = kac.get(0).getGroupNm(); @@ -151,6 +153,8 @@ public class FlightLaancService { // 조종사 - 사용자 정보로 저장 FltPlanPilotDTO planPilotDto = FltPlanPilotDTO.toDto(cstmrInfo); + planPilotDto.setEmail(EncryptUtil.decrypt(cstmrInfo.getEmail())); + planPilotDto.setHpno(EncryptUtil.decrypt(cstmrInfo.getHpno())); planPilotDto.setPlanSno(planSno); planPilotDto.setGroupNm(groupNm); planPilotDto.setCreateUserId(userId); @@ -201,10 +205,13 @@ public class FlightLaancService { if (agree.getAgreeYn().equals("Y")) { agreeEntityDto.setAgreeDt(LocalDateTime.now()); } - ptyTermsDomainService.savePtyTermsAgreeTxn(PtyTermsAgreeTxnDTO.toEntity(agreeEntityDto)); + try{ + ptyTermsDomainService.savePtyTermsAgreeTxn(PtyTermsAgreeTxnDTO.toEntity(agreeEntityDto)); + }catch (Exception e){ + // TODO :: 임시로 코드 변경, 추후 약관 있을시 본래 코드인 else문으로 Exception던질것임 + throw new BaseException(BaseErrorCode.FAILED, "약관등록 실패"); + } } - } else { - throw new BaseException(BaseErrorCode.FAILED, "약관등록 실패"); } String address = ""; @@ -213,7 +220,7 @@ public class FlightLaancService { laancPdfModel.setPilotName(cstmrInfo.getMemberName()); if (rq.getAreaList() != null && !rq.getAreaList().isEmpty()) { - address = rq.getAreaList().get(0).getFltAreaAddr(); + address = rq.getAreaList().get(0).getFltAreaAddr() == null ? "" : rq.getAreaList().get(0).getFltAreaAddr(); laancPdfModel.setAddress(address); laancPdfModel.setElev(rq.getAreaList().get(0).getFltElev()); } @@ -233,6 +240,12 @@ public class FlightLaancService { // TODO :: 현시점에는 파일 Util이 없으므로 임시로 FLT 모듈 자체에서 Util을 만들어서 사용, 추후 모든 모듈 완성 되었을 시 Common모듈 코드 사용 ComFileBasDTO comFileBasDto = fileUtils.makePdf(laancPdfModel); + comFileBasDto.setDelYn("N"); + if(comFileBasDto.getFileGroupNo() == null || comFileBasDto.getFileGroupNo() == 0){ + Long fileGroupNo = comFileDomainService.findFirstByOrderByFileGroupNoDesc(); + comFileBasDto.setFileGroupNo(fileGroupNo); + } + comFileDomainService.saveComFileBas(ComFileBasDTO.toEntity(comFileBasDto)); fltPlanBas.setFileGroupNo(comFileBasDto.getFileGroupNo()); @@ -245,7 +258,7 @@ public class FlightLaancService { ComnSmsLaancAprovModel comnSmsLaancAprovModel = new ComnSmsLaancAprovModel(); comnSmsLaancAprovModel.setPilotName(cstmrInfo.getMemberName()); - comnSmsLaancAprovModel.setCallphone(cstmrInfo.getHpno()); + comnSmsLaancAprovModel.setCallphone(EncryptUtil.decrypt(cstmrInfo.getHpno())); comnSmsLaancAprovModel.setSchFltStDt(DateUtils.toDateTimeStringByFormat(rq.getSchFltStDt(), "yyyy년 MM월 dd일 HH시 mm분")); comnSmsLaancAprovModel.setSchFltEndDt(DateUtils.toDateTimeStringByFormat(rq.getSchFltEndDt(), "yyyy년 MM월 dd일 HH시 mm분")); comnSmsLaancAprovModel.setFltPurpose(rq.getFltPurpose().getValue()); diff --git a/web/api-flight/src/main/resources/application.properties b/web/api-flight/src/main/resources/application.properties new file mode 100644 index 0000000..fbf17f3 --- /dev/null +++ b/web/api-flight/src/main/resources/application.properties @@ -0,0 +1,17 @@ + + +###### GP 데이터 데이터 저장 설정 ####### +gp.remove.time = 5 +gp.insert.count = 1000 +gp.end.time= 1 + +####### Naver 주소변화 API 값 ############# +naver.api.id=5md90yszqj +naver.api.key=uCJci6Ixm4DN7hUGtSrjKh6NU6z0SOKq9idpkLat +naver.api.url=https://naveropenapi.apigw.ntruss.com/map-reversegeocode/v2/gc + +### TS ### +external.ts.url=http://121.137.95.45:8170 +external.ts.return.uri=/api/external/laanc/vc/callback + +url.base.file=files/ \ No newline at end of file