JPA 관련 Instant타입 어노테이션 변경, 컨버터 작업 준비

pav-server/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java

@@ -6,6 +6,8 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -18,21 +20,15 @@ import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.proj4j.CRSFactory;
 import org.locationtech.proj4j.CoordinateReferenceSystem;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.*;
 
 import com.palnet.biz.api.bas.flight.model.BasFlightAprovRq;
 import com.palnet.biz.api.bas.flight.model.BasFlightPlanArcrftModel;
@@ -106,6 +102,7 @@ public class BasFlightController {
     public ResponseEntity<? extends BasicResponse> findPlanList(BasFlightPlanListRq rq) {
     	ComnPagingRs<BasFlightPlanModel> result = null;
         // System.out.println(rq);
+        log.error(">>> rq : {}", rq);
         try {
             result = basFlightService.listPlan(rq);
         } catch (Exception e) {
@@ -142,7 +139,7 @@ public class BasFlightController {
     public ResponseEntity<? extends BasicResponse> createPlan(@RequestBody BasFlightPlanModel rq) {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         try {
-            log.info(">>> rq : {}", rq);
+            log.error(">>> rq : {}", rq);
             boolean result = basFlightService.createPlan(rq);
             resultMap.put("result", result);
             log.info(">>> resultMap : " , resultMap);
@@ -397,4 +394,5 @@ public class BasFlightController {
     		System.out.println("["+a.getX() + ", " + a.getY()+"],");
     	}
     }
+
 }

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

@@ -3,7 +3,6 @@ package com.palnet.biz.api.bas.flight.model;
 import lombok.Data;
 
 import java.time.Instant;
-import java.util.Date;
 
 @Data
 public class BasFlightPlanArcrftModel {

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

@@ -3,7 +3,6 @@ package com.palnet.biz.api.bas.flight.model;
 import lombok.Data;
 
 import java.time.Instant;
-import java.util.Date;
 import java.util.List;
 
 @Data

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

@@ -7,6 +7,7 @@ import java.util.Date;
 
 import com.palnet.biz.api.comn.model.ComnPagingModel;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 @Data
 @EqualsAndHashCode(callSuper=false)

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

@@ -3,7 +3,6 @@ package com.palnet.biz.api.bas.flight.model;
 import lombok.Data;
 
 import java.time.Instant;
-import java.util.Date;
 import java.util.List;
 
 @Data

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

@@ -3,7 +3,6 @@ package com.palnet.biz.api.bas.flight.model;
 import lombok.Data;
 
 import java.time.Instant;
-import java.util.Date;
 
 @Data
 public class BasFlightPlanPilotModel {

pav-server/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupAprvService.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.bas.group.service;
 
+import java.time.Instant;
 import java.util.Optional;
 
 import org.slf4j.Logger;
@@ -76,7 +77,7 @@ public class BasGroupAprvService {
 		
 		PtyCstmrGroup entity = optional.get();
 		if(rq.getAprvlYn().equals("Y")){
-			entity.setAprvlDt(DateUtils.nowDate());
+			entity.setAprvlDt(Instant.now());
 			entity.setAprvlUserId(rq.getAprvlUserId());
 			
 			entity.setGroupAuthCd(rq.getGroupAuthCd());

pav-server/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupJoinService.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.bas.group.service;
 
+import java.time.Instant;
 import java.util.List;
 import java.util.Optional;
 
@@ -70,14 +71,14 @@ public class BasGroupJoinService {
 		entity2.setGroupAuthCd(rq.getGroupAuthCd()); //생성한 사람은 최고 권한 부여 (MASTER , LEADER, NORMAL) 로 구분 하여 사용
 		entity2.setCstmrSno(rq.getCstmrSno());
 		entity2.setJoinYn("Y");
-		entity2.setJoinDt(DateUtils.nowDate());
+		entity2.setJoinDt(Instant.now());
 		entity2.setAprvlYn("N");	
 		if(ptyCstmrGroupRepository.save(entity2) == null)
 			throw new CustomException(ErrorCode.FAIL);
 		}else {
 			PtyCstmrGroup entity = ptyCstmrGroupRepository.findRejoinUser(rq.getGroupId(), rq.getCstmrSno());
 			entity.setJoinYn("Y");
-			entity.setJoinDt(DateUtils.nowDate());
+			entity.setJoinDt(Instant.now());
 			ptyCstmrGroupRepository.updateWithdrwDt(rq.getGroupId(), rq.getCstmrSno());
 			if(ptyCstmrGroupRepository.save(entity) == null)
 				throw new CustomException(ErrorCode.FAIL);
@@ -107,7 +108,7 @@ public class BasGroupJoinService {
 			entity.setAprvlYn("N");
 			entity.setAprvlUserId("");
 			entity.setGroupAuthCd("");
-			entity.setWthdrwDt(DateUtils.nowDate());
+			entity.setWthdrwDt(Instant.now());
 		}
 		
 		entity.setJoinYn(rq.getJoinYn());

pav-server/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.bas.group.service;
 
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -159,9 +160,9 @@ public class BasGroupService {
 		
 		PtyGroupBas entity = new PtyGroupBas();
 		BeanUtils.copyProperties(rq , entity);
-		entity.setUpdateDt(DateUtils.nowDate());
+		entity.setUpdateDt(Instant.now());
 		entity.setUseYn("Y");
-		entity.setCreateDt(DateUtils.nowDate());
+		entity.setCreateDt(Instant.now());
 		entity.setTrmnlId(rq.getTrmnlId());
 
 		//참여 정보 입력 하기
@@ -170,10 +171,10 @@ public class BasGroupService {
 //		entity2.setGroupAuthCd("CREATER"); //생성한 사람은 최고 권한 부여 (CREATER , ADMIN , USER) 로 구분 하여 사용
 		entity2.setGroupAuthCd("MASTER"); //생성한 사람은 최고 권한 부여 (MASTER , LEADER, NORMAL) 로 구분 하여 사용
 		entity2.setAprvlYn("Y"); //자동 승인 처리 함
-		entity2.setAprvlDt(DateUtils.nowDate());
+		entity2.setAprvlDt(Instant.now());
 		entity2.setCstmrSno(rq.getCstmrSno());
 		entity2.setJoinYn("Y");
-		entity2.setJoinDt(DateUtils.nowDate());
+		entity2.setJoinDt(Instant.now());
 		entity2.setTrmnlId(rq.getTrmnlId());
 		
 		if( ptyGroupBasRepository.save(entity) == null)
@@ -209,7 +210,7 @@ public class BasGroupService {
 		PtyGroupBas entity = optional.get();
 		entity.setGroupNm(rq.getGroupNm());
 		entity.setGroupTypeCd(rq.getGroupTypeCd());
-		entity.setUpdateDt(DateUtils.nowDate());
+		entity.setUpdateDt(Instant.now());
 		
 		if(ptyGroupBasRepository.save(entity) == null)
 			throw new CustomException(ErrorCode.FAIL);
@@ -236,7 +237,7 @@ public class BasGroupService {
 		
 		PtyGroupBas entity = optional.get();
 		entity.setUseYn("N");
-		entity.setUpdateDt(DateUtils.nowDate());
+		entity.setUpdateDt(Instant.now());
 		
 		if(ptyGroupBasRepository.save(entity) == null)
 			throw new CustomException(ErrorCode.FAIL);

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

@@ -0,0 +1,32 @@
+package com.palnet.biz.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+
+import java.time.Instant;
+
+@Component
+@Slf4j
+public class StringToInstantBinding implements Converter<String, Instant> {
+
+
+    @Override
+    public Instant convert(String date) {
+
+
+        if(date.length() == 10) date += "T00:00:00Z";
+
+        log.warn("date -> {}", date);
+
+        try {
+
+            return Instant.parse(date);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+
+        return null;
+    }
+}

pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanArea.java

@@ -7,7 +7,6 @@ import org.hibernate.annotations.UpdateTimestamp;
 
 import javax.persistence.*;
 import java.time.Instant;
-import java.util.Date;
 
 @Table(name = "FLT_PLAN_AREA")
 @Entity

pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanBas.java

@@ -7,8 +7,6 @@ import org.hibernate.annotations.UpdateTimestamp;
 
 import javax.persistence.*;
 import java.time.Instant;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 @Table(name = "FLT_PLAN_BAS")
 @Entity

pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrGroup.java

@@ -2,6 +2,7 @@ package com.palnet.biz.jpa.entity;
 
 import java.io.Serializable;
 import javax.persistence.*;
+import java.time.Instant;
 import java.util.Date;
 
 
@@ -21,7 +22,7 @@ public class PtyCstmrGroup implements Serializable {
 
 //	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="APRVL_DT", columnDefinition = "TIMESTAMP")
-	private Date aprvlDt;
+	private Instant aprvlDt;
 
 	@Column(name="APRVL_USER_ID")
 	private String aprvlUserId;
@@ -40,14 +41,14 @@ public class PtyCstmrGroup implements Serializable {
 
 //	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="JOIN_DT", columnDefinition = "TIMESTAMP")
-	private Date joinDt;
+	private Instant joinDt;
 
 	@Column(name="JOIN_YN")
 	private String joinYn;
 
 //	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="WTHDRW_DT", columnDefinition = "TIMESTAMP")
-	private Date wthdrwDt;
+	private Instant wthdrwDt;
 
 	@Column(name="TRMNL_ID")
 	private String trmnlId;
@@ -63,11 +64,11 @@ public class PtyCstmrGroup implements Serializable {
 		this.cstmrGroupSno = cstmrGroupSno;
 	}
 
-	public Date getAprvlDt() {
+	public Instant getAprvlDt() {
 		return this.aprvlDt;
 	}
 
-	public void setAprvlDt(Date aprvlDt) {
+	public void setAprvlDt(Instant aprvlDt) {
 		this.aprvlDt = aprvlDt;
 	}
 
@@ -111,11 +112,11 @@ public class PtyCstmrGroup implements Serializable {
 		this.groupId = groupId;
 	}
 
-	public Date getJoinDt() {
+	public Instant getJoinDt() {
 		return this.joinDt;
 	}
 
-	public void setJoinDt(Date joinDt) {
+	public void setJoinDt(Instant joinDt) {
 		this.joinDt = joinDt;
 	}
 
@@ -127,11 +128,11 @@ public class PtyCstmrGroup implements Serializable {
 		this.joinYn = joinYn;
 	}
 
-	public Date getWthdrwDt() {
+	public Instant getWthdrwDt() {
 		return this.wthdrwDt;
 	}
 
-	public void setWthdrwDt(Date wthdrwDt) {
+	public void setWthdrwDt(Instant wthdrwDt) {
 		this.wthdrwDt = wthdrwDt;
 	}
 

pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyGroupBas.java

@@ -2,6 +2,7 @@ package com.palnet.biz.jpa.entity;
 
 import java.io.Serializable;
 import javax.persistence.*;
+import java.time.Instant;
 import java.util.Date;
 
 
@@ -15,10 +16,10 @@ import java.util.Date;
 public class PtyGroupBas implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private String groupId;
-	private Date createDt;
+	private Instant createDt;
 	private String groupNm;
 	private String groupTypeCd;
-	private Date updateDt;
+	private Instant updateDt;
 	private String useYn;
 	private String trmnlId;
 
@@ -39,11 +40,11 @@ public class PtyGroupBas implements Serializable {
 
 //	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
-	public Date getCreateDt() {
+	public Instant getCreateDt() {
 		return this.createDt;
 	}
 
-	public void setCreateDt(Date createDt) {
+	public void setCreateDt(Instant createDt) {
 		this.createDt = createDt;
 	}
 
@@ -70,11 +71,11 @@ public class PtyGroupBas implements Serializable {
 
 //	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="UPDATE_DT", columnDefinition = "TIMESTAMP")
-	public Date getUpdateDt() {
+	public Instant getUpdateDt() {
 		return this.updateDt;
 	}
 
-	public void setUpdateDt(Date updateDt) {
+	public void setUpdateDt(Instant updateDt) {
 		this.updateDt = updateDt;
 	}
 

pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java

@@ -72,8 +72,8 @@ public class FltPlanQueryRepository {
         	}
         }
 
-		builder.and(bas.schFltStDt.goe(rq.getSchFltStDt()));
-		builder.and(bas.schFltStDt.before(rq.getSchFltEndDt()));
+//		builder.and(bas.schFltStDt.goe(rq.getSchFltStDt()));
+//		builder.and(bas.schFltStDt.before(rq.getSchFltEndDt()));
 
 //        if ("Y".equals(rq.getAprvlYn()) || "N".equals(rq.getAprvlYn())) {
 //            builder.and(bas.aprvlYn.eq(rq.getAprvlYn()));
@@ -149,8 +149,8 @@ public class FltPlanQueryRepository {
         	}
         }
 
-		builder.and(bas.schFltStDt.goe(rq.getSchFltStDt()));
-		builder.and(bas.schFltStDt.before(rq.getSchFltEndDt()));
+//		builder.and(bas.schFltStDt.goe(rq.getSchFltStDt()));
+//		builder.and(bas.schFltStDt.before(rq.getSchFltEndDt()));
 
 //        if ("Y".equals(rq.getAprvlYn()) || "N".equals(rq.getAprvlYn())) {
 //            builder.and(bas.aprvlYn.eq(rq.getAprvlYn()));
@@ -426,8 +426,8 @@ public class FltPlanQueryRepository {
                 builder.and(bas.cstmrSno.eq(rq.getCstmrSno()));
             }
         }
-        builder.and(bas.schFltStDt.goe(rq.getSchFltStDt()));
-		builder.and(bas.schFltStDt.before(rq.getSchFltEndDt()));
+//        builder.and(bas.schFltStDt.goe(rq.getSchFltStDt()));
+//		builder.and(bas.schFltStDt.before(rq.getSchFltEndDt()));
 
         if (rq.getAprvlYn() != null && !"A".equals(rq.getAprvlYn())) {
             builder.and(bas.aprvlYn.eq(rq.getAprvlYn()));
@@ -496,8 +496,8 @@ public class FltPlanQueryRepository {
                 builder.and(bas.cstmrSno.eq(rq.getCstmrSno()));
             }
         }
-        builder.and(bas.schFltStDt.goe(rq.getSchFltStDt()));
-		builder.and(bas.schFltStDt.before(rq.getSchFltEndDt()));
+//        builder.and(bas.schFltStDt.goe(rq.getSchFltStDt()));
+//		builder.and(bas.schFltStDt.before(rq.getSchFltEndDt()));
 
         if (rq.getAprvlYn() != null && !"A".equals(rq.getAprvlYn())) {
             builder.and(bas.aprvlYn.eq(rq.getAprvlYn()));