CORE KC 관련 수정

style24.core/src/main/java/com/style24/core/biz/thirdparty/SafetyKoreaApi.java

@@ -15,6 +15,7 @@ import org.springframework.web.client.RestTemplate;
 
 import com.google.gson.Gson;
 import com.style24.persistence.domain.KCertifyNo;
+import com.style24.persistence.domain.KCertifyNoOnly;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -60,11 +61,24 @@ public class SafetyKoreaApi {
 	 */
 	public GagaMap getKoreaCertifyNo(String goodsCd) throws Exception {
 
+		GagaMap result = new GagaMap();
+
 		String requestUrl = apiUrl + "?conditionKey=all&conditionValue=" + goodsCd;
 		log.info("requestUrl: {}", requestUrl);
 		URI url = URI.create(requestUrl);
 
-		return getExtracted( url);
+		String responseJson = getExtracted( url);
+
+		Gson gson = new Gson();
+		KCertifyNo kcNo = gson.fromJson(responseJson, KCertifyNo.class);
+
+		if (kcNo.getResultCode() != null && "2000".equals(kcNo.getResultCode())) { // 성공
+			result.set("certNum", kcNo.getResultData().iterator().next().getCertNum());
+			result.set("certDt", kcNo.getResultData().iterator().next().getCertDate() );
+			return result;
+		}
+
+		return result;
 	}
 
 
@@ -78,11 +92,23 @@ public class SafetyKoreaApi {
 	 */
 	public GagaMap getKoreaCertifyDetail(String certNum) throws Exception {
 
+		GagaMap result = new GagaMap();
+
 		String requestUrl = apiDetailUrl + "?certNum=" + certNum;
-		log.info("requestUrl: {}", requestUrl);
 		URI url = URI.create(requestUrl);
 
-		return getExtracted( url);
+		String responseJson = getExtracted( url);
+
+		Gson gson = new Gson();
+		KCertifyNoOnly kcNo = gson.fromJson(responseJson, KCertifyNoOnly.class);
+
+		if (kcNo.getResultCode() != null && "2000".equals(kcNo.getResultCode())) { // 성공
+			result.set("certNum", kcNo.getResultData().getCertNum());
+			result.set("certDt", kcNo.getResultData().getCertDate() );
+			return result;
+		}
+
+		return result;
 
 	}
 
@@ -94,10 +120,9 @@ public class SafetyKoreaApi {
 	 * @author eskim
 	 * @since 2020. 12. 07
 	 */
-	private GagaMap getExtracted( URI url) {
-
-		GagaMap result = new GagaMap();
+	private String getExtracted( URI url) {
 
+		String responseJson = "";
 		// Header
 		HttpHeaders headers = new HttpHeaders();
 		headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
@@ -108,7 +133,7 @@ public class SafetyKoreaApi {
 		ResponseEntity<String> responseEntity = restTemplate.exchange(url, HttpMethod.GET, request, String.class);
 		log.info("responseEntity.getStatusCode(): {} ", responseEntity.getStatusCode());
 
-		String responseJson = responseEntity.getBody();
+		responseJson = responseEntity.getBody();
 		log.info("responseEntity.getBody(): {}", responseJson);
 
 //		{
@@ -143,16 +168,7 @@ public class SafetyKoreaApi {
 //		    ]
 //		}
 
-		Gson gson = new Gson();
-		KCertifyNo kcNo = gson.fromJson(responseJson, KCertifyNo.class);
-
-		if (kcNo.getResultCode() != null && kcNo.getResultCode().equals("2000")) { // 성공
-			result.set("certNum", kcNo.getResultData().iterator().next().getCertNum());
-			result.set("certDt", kcNo.getResultData().iterator().next().getCertDate() );
-			return result;
-		}
-
-		return result;
+		return responseJson;
 	}
 
 }

style24.core/src/main/java/com/style24/persistence/domain/KCResultData.java

@@ -0,0 +1,37 @@
+package com.style24.persistence.domain;
+
+import com.style24.persistence.TscBaseDomain;
+
+import lombok.Data;
+
+/**
+ * KC인증번호
+ *
+ * @author gagamel
+ * @since 2020. 12. 2
+ */
+@SuppressWarnings("serial")
+@Data
+public class KCResultData extends TscBaseDomain {
+
+		private String certUid;
+		private String certOrganName;
+		private String certNum;
+		private String certState;
+		private String certDiv;
+		private String certDate;
+		private String certChgDate;
+		private String certChgReason;
+		private String firstCertNum;
+		private String productName;
+		private String brandName;
+		private String modelName;
+		private String categoryName;
+		private String importDiv;
+		private String makerName;
+		private String makerCntryName;
+		private String importerName;
+		private String remark;
+		private String signDate;
+
+}

style24.core/src/main/java/com/style24/persistence/domain/KCertifyNo.java

@@ -8,7 +8,7 @@ import lombok.Data;
 
 /**
  * KC인증번호
- * 
+ *
  * @author gagamel
  * @since 2020. 12. 2
  */
@@ -18,33 +18,6 @@ public class KCertifyNo extends TscBaseDomain {
 
 	private String resultCode;
 	private String resultMsg;
-	private Collection<ResultData> resultData;
-
-	@Data
-	public class ResultData {
-		private String certUid;
-		private String certOrganName;
-		private String certNum;
-		private String certState;
-		private String certDiv;
-		private String certDate;
-		private String certChgDate;
-		private String certChgReason;
-		private String firstCertNum;
-		private String productName;
-		private String brandName;
-		private String modelName;
-		private String categoryName;
-		private String importDiv;
-		private String makerName;
-		private String makerCntryName;
-		private String importerName;
-		private String remark;
-		private String signDate;
-		private String derivationModels;
-		private String certificationImageUrls;
-		private String factories;
-		private String similarCertifications;
-	}
+	private Collection<KCResultData> resultData;
 
 }

style24.core/src/main/java/com/style24/persistence/domain/KCertifyNoOnly.java

@@ -0,0 +1,21 @@
+package com.style24.persistence.domain;
+
+import com.style24.persistence.TscBaseDomain;
+
+import lombok.Data;
+
+/**
+ * KC인증번호
+ *
+ * @author gagamel
+ * @since 2020. 12. 2
+ */
+@SuppressWarnings("serial")
+@Data
+public class KCertifyNoOnly extends TscBaseDomain {
+
+	private String resultCode;
+	private String resultMsg;
+	private KCResultData resultData;
+
+}