Instant 타입 파라미터 컨버터 추가, 로그인 정보 조회 시 회원이름 암호화 해제

pav-server/src/main/java/com/palnet/biz/api/acnt/crtfyhp/controller/AcntCrtfyhpController.java

@@ -49,7 +49,6 @@ public class AcntCrtfyhpController {
 	@ApiImplicitParam(name = "hnpo",value = "휴대폰번호", dataTypeClass = String.class)
 	public ResponseEntity<? extends BasicResponse> send(String hpno) {
 
-		
 		Map<String , Object> resultMap = new HashMap<String,Object>();
 		
         try {
@@ -81,7 +80,6 @@ public class AcntCrtfyhpController {
 
 		}
 		return ResponseEntity.ok().body(new SuccessResponse<Map>(resultMap));
-
 	}
 	
 	

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

@@ -209,9 +209,10 @@ public class AcntCrtfyhpService {
 	 }
 	
 		public boolean certifNum(String memberName, String hpno) throws Exception{
-			String name = EncryptUtils.encrypt(memberName);
+//			String name = EncryptUtils.encrypt(memberName);
 			String phone = EncryptUtils.encrypt(hpno);
-			boolean certifNum = cstmrQuery.certifNum(name , phone);
+
+			boolean certifNum = cstmrQuery.certifNum(memberName , phone);
 			if(certifNum) {
 				registerSend(hpno);
 			}
@@ -219,9 +220,9 @@ public class AcntCrtfyhpService {
 		}
 		
 		public String findUserId(String memberName, String hpno) throws Exception{
-			String name = EncryptUtils.encrypt(memberName);
+//			String name = EncryptUtils.encrypt(memberName);
 			String phone = EncryptUtils.encrypt(hpno);
-			String resultFindId = cstmrQuery.findUserId(name,phone);
+			String resultFindId = cstmrQuery.findUserId(memberName,phone);
 			
 			return resultFindId;
 	   }

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

@@ -19,27 +19,20 @@ public class StringToInstantBinding implements Converter<String, Instant> {
         log.error("StringToInstantBinding - convert()");
         log.error("date -> {}", date);
 
-        if(date.length() == 10){
+        DateTimeFormatter formatter;
-            date += "T00:00:00Z";
+
-            try {
+        if(date.length() == 10) formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-                return Instant.parse(date);
+        else formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            } catch (Exception e) {
+
-                e.printStackTrace();
-            }
-        } else {
         try {
-                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
             LocalDateTime localDateTime = LocalDateTime.parse(date, formatter);
 
             return localDateTime.atZone(ZoneId.of("UTC")).toInstant();
         } catch (Exception e){
             e.printStackTrace();
+            return null;
         }
 
-
-        }
-
-        return null;
     }
 
 }

pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyTermsBas.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,14 +22,14 @@ public class PtyTermsBas implements Serializable {
 
 
 	@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
-	private Date createDt;
+	private Instant createDt;
 
 	@Column(name="CREATE_USER_ID")
 	private String createUserId;
 
 
 	@Column(name="ESTBSH_DATE", columnDefinition = "TIMESTAMP")
-	private Date estbshDate;
+	private Instant estbshDate;
 
 	@Column(name="LAST_TXN_YN")
 	private String lastTxnYn;
@@ -41,7 +42,7 @@ public class PtyTermsBas implements Serializable {
 
 
 	@Column(name="UPDATE_DT", columnDefinition = "TIMESTAMP")
-	private Date updateDt;
+	private Instant updateDt;
 
 	@Column(name="UPDATE_USER_ID")
 	private String updateUserId;
@@ -57,11 +58,11 @@ public class PtyTermsBas implements Serializable {
 		this.termsSno = termsSno;
 	}
 
-	public Date getCreateDt() {
+	public Instant getCreateDt() {
 		return this.createDt;
 	}
 
-	public void setCreateDt(Date createDt) {
+	public void setCreateDt(Instant createDt) {
 		this.createDt = createDt;
 	}
 
@@ -73,11 +74,11 @@ public class PtyTermsBas implements Serializable {
 		this.createUserId = createUserId;
 	}
 
-	public Date getEstbshDate() {
+	public Instant getEstbshDate() {
 		return this.estbshDate;
 	}
 
-	public void setEstbshDate(Date estbshDate) {
+	public void setEstbshDate(Instant estbshDate) {
 		this.estbshDate = estbshDate;
 	}
 
@@ -105,11 +106,11 @@ public class PtyTermsBas implements Serializable {
 		this.termsCtgryCd = termsCtgryCd;
 	}
 
-	public Date getUpdateDt() {
+	public Instant getUpdateDt() {
 		return this.updateDt;
 	}
 
-	public void setUpdateDt(Date updateDt) {
+	public void setUpdateDt(Instant updateDt) {
 		this.updateDt = updateDt;
 	}