비행계획서 관련 부분 Instnat 오류 수정

pav-server/src/main/java/com/palnet/biz/api/acnt/crtfyhp/service/AcntCrtfyhpService.java

@@ -1,47 +1,24 @@
 package com.palnet.biz.api.acnt.crtfyhp.service;
 
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import com.palnet.biz.api.acnt.crtfyhp.model.AcntCrtfyhpRsModel;
-import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRqModel;
-import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRsModel;
-import com.palnet.biz.api.acnt.cstmr.model.AnctCstmrTermsModel;
-import com.palnet.biz.api.acnt.terms.model.AcntTermsRqModel;
-import com.palnet.biz.api.acnt.terms.model.AcntTermsRsModel;
+
 import com.palnet.biz.jpa.entity.PtyCrtfyhpBas;
 import com.palnet.biz.jpa.entity.PtyCstmrBas;
-import com.palnet.biz.jpa.entity.PtyCstmrDtl;
-import com.palnet.biz.jpa.entity.PtyTermsAgreeTxn;
 import com.palnet.biz.jpa.entity.SuredataEntity;
 import com.palnet.biz.jpa.repository.pty.PtyCrtfyhpBasQueryRepository;
 import com.palnet.biz.jpa.repository.pty.PtyCrtfyhpBasRepository;
 import com.palnet.biz.jpa.repository.pty.PtyCstmrBasRepository;
-import com.palnet.biz.jpa.repository.pty.PtyCstmrDtlRepository;
 import com.palnet.biz.jpa.repository.pty.PtyCstmrQueryRepository;
-import com.palnet.biz.jpa.repository.pty.PtyTermsAgreeTxnRepository;
-import com.palnet.biz.jpa.repository.pty.PtyTermsQueryRepository;
 import com.palnet.biz.jpa.repository.pty.SuredataRepository;
-import com.palnet.comn.code.ErrorCode;
-import com.palnet.comn.exception.CustomException;
-import com.palnet.comn.utils.DateUtils;
 import com.palnet.comn.utils.EncryptUtils;
-import com.palnet.comn.utils.HttpUtils;
 
 @Service
 public class AcntCrtfyhpService {

pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanModel.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.bas.flight.model;
 
+import com.palnet.comn.utils.DateUtils;
 import lombok.Data;
 
 import java.time.Instant;
@@ -31,4 +32,20 @@ public class BasFlightPlanModel {
     private List<BasFlightPlanAreaModel> areaList;
     private List<BasFlightPlanPilotModel> pilotList;
     private List<BasFlightPlanArcrftModel> arcrftList;
+
+    public void setSchFltStDt(String schFltStDt){
+        this.schFltStDt = DateUtils.stringToInstant(schFltStDt);
+    }
+
+    public void setSchFltEndDt(String schFltEndDt){
+        this.schFltEndDt = DateUtils.stringToInstant(schFltEndDt);
+    }
+
+    public void setCreateDt(String createDt){
+        this.createDt = DateUtils.stringToInstant(createDt);
+    }
+
+    public void setUpdateDt(String updateDt){
+        this.updateDt = DateUtils.stringToInstant(updateDt);
+    }
 }

pav-server/src/main/java/com/palnet/biz/config/StringToInstantBinding.java

@@ -1,14 +1,10 @@
 package com.palnet.biz.config;
 
+import com.palnet.comn.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.converter.Converter;
-import org.springframework.stereotype.Component;
 
 import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 
 @Slf4j
 public class StringToInstantBinding implements Converter<String, Instant> {
@@ -19,19 +15,7 @@ public class StringToInstantBinding implements Converter<String, Instant> {
         log.error("StringToInstantBinding - convert()");
         log.error("date -> {}", date);
 
-        DateTimeFormatter formatter;
-
-        if(date.length() == 10) formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        else formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-
-        try {
-            LocalDateTime localDateTime = LocalDateTime.parse(date, formatter);
-
-            return localDateTime.atZone(ZoneId.of("UTC")).toInstant();
-        } catch (Exception e){
-            e.printStackTrace();
-            return null;
-        }
+        return DateUtils.stringToInstant(date);
 
     }
 

pav-server/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCrtfyhpBasQueryRepository.java

@@ -13,10 +13,12 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
+
 @Log4j2
 @Repository
 @RequiredArgsConstructor
 public class PtyCrtfyhpBasQueryRepository {
+
     private final JPAQueryFactory query;
 
     public List<PtyCrtfyhpBas> confirmSms(String hpno, String crtfyNo) {
@@ -34,7 +36,7 @@ public class PtyCrtfyhpBasQueryRepository {
 //        builder.and(qEntity.createDt.between(LocalDateTime.now().minusMinutes(5), LocalDateTime.now()));
         builder.and(qEntity.createDt.goe(prevTime.toInstant()));
         builder.and(qEntity.createDt.loe(now.toInstant()));
-
+        
 
         List<PtyCrtfyhpBas> entity =
                 query.select(qEntity).from(qEntity)
@@ -42,6 +44,9 @@ public class PtyCrtfyhpBasQueryRepository {
                         .orderBy(qEntity.createDt.desc())
                         .fetch();
 
+        
+        
+
         return entity;
 
     }

pav-server/src/main/java/com/palnet/comn/utils/DateUtils.java

@@ -1,5 +1,7 @@
 package com.palnet.comn.utils;
 
+import lombok.extern.slf4j.Slf4j;
+
 import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.LocalDate;
@@ -15,6 +17,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+@Slf4j
 public class DateUtils {
 
 	public static String getCurrentTime(){
@@ -65,11 +68,22 @@ public class DateUtils {
 	}
 	
 	public static Instant stringToInstant(String date) {
-		
-		DateTimeFormatter transFormat = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
-		LocalDateTime localDateTime = LocalDateTime.parse(date , transFormat);
 
-		return localDateTime.atZone(ZoneId.of("UTC")).toInstant();
+		log.error("date -> {}", date);
+
+		DateTimeFormatter formatter;
+
+		if(date.length() == 10) formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+		else formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+		try {
+			LocalDateTime localDateTime = LocalDateTime.parse(date, formatter);
+
+			return localDateTime.atZone(ZoneId.of("UTC")).toInstant();
+		} catch (Exception e){
+			e.printStackTrace();
+			return null;
+		}
 		
 	}
 	
@@ -111,6 +125,8 @@ public class DateUtils {
 		return diffTime;
 		
 	}
+
+