From 932128bab428d2427c273e74c246e1e7fcfd9509 Mon Sep 17 00:00:00 2001
From: mjkhan21 <mjkhan21@xit.co.kr>
Date: Wed, 12 Jun 2024 15:34:56 +0900
Subject: [PATCH 1/5] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=83=81?=
 =?UTF-8?q?=ED=83=9C=20=EB=B3=80=EA=B2=BD=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/sql/mapper/base/user-mapper.xml  | 1 +
 src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/sql/mapper/base/user-mapper.xml b/src/main/resources/sql/mapper/base/user-mapper.xml
index ba8cc20..e111209 100644
--- a/src/main/resources/sql/mapper/base/user-mapper.xml
+++ b/src/main/resources/sql/mapper/base/user-mapper.xml
@@ -181,6 +181,7 @@ UPDATE TB_USER SET
      , ORG_ID = #{orgID}
      , NSTT_CD = #{institute}
      , CRTFC_DN = #{certificateDn}
+     , STTS = #{status}
      , MDFCN_DT =<include refid="utility.now" />
      , MDFR = #{modifiedBy}
  WHERE USER_ID = #{id}</update>
diff --git a/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp b/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp
index 86c4246..d21ac20 100644
--- a/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp
@@ -121,7 +121,14 @@
                     <div class="row">
                       <label class="col-sm-3 col-form-label text-sm-end" for="status">상태</label>
                       <div class="col-sm-9">
-                        <input name="status" type="text" data-map="STTS" class="form-control" placeholder="상태"/>
+						<div class="form-check form-check-inline mt-3">
+						  <input name="status" value="P" type="radio" data-map="STTS" class="form-check-input"/>
+						  <label class="form-check-label" for="approved">승인</label>
+						</div>
+						<div class="form-check form-check-inline">
+						  <input name="status" value="A" type="radio" data-map="STTS" class="form-check-input"/>
+						  <label class="form-check-label" for="applied">신청</label>
+						</div>
                       </div>
                     </div>
                   </div>

From 9cae629cd6ba2b3a624b9550ec69dba19aec26c5 Mon Sep 17 00:00:00 2001
From: mjkhan21 <mjkhan21@xit.co.kr>
Date: Wed, 12 Jun 2024 15:42:31 +0900
Subject: [PATCH 2/5] =?UTF-8?q?jstree=20=EA=B2=BD=EB=A1=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/base/menu/menu-main.jsp | 2 +-
 src/main/webapp/WEB-INF/jsp/select-url.jsp          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/base/menu/menu-main.jsp b/src/main/webapp/WEB-INF/jsp/base/menu/menu-main.jsp
index 70d17fa..e8dbf58 100644
--- a/src/main/webapp/WEB-INF/jsp/base/menu/menu-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/base/menu/menu-main.jsp
@@ -1,6 +1,6 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%>
 <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%>
-<link rel="stylesheet" href="<c:url value="/resources/3rd-party/sneat/libs/jstree/jstree.css"/>" /--%>
+<link rel="stylesheet" href="<c:url value="/webjars/3rd-party/sneat/libs/jstree/jstree.css"/>" /--%>
 <c:set var="prefixName" scope="request">메뉴</c:set>
               <!-- Page Body -->
     <div class="d-flex flex-column flex-grow-1">
diff --git a/src/main/webapp/WEB-INF/jsp/select-url.jsp b/src/main/webapp/WEB-INF/jsp/select-url.jsp
index 4e1f826..7f285b7 100644
--- a/src/main/webapp/WEB-INF/jsp/select-url.jsp
+++ b/src/main/webapp/WEB-INF/jsp/select-url.jsp
@@ -1,6 +1,6 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%>
 <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%>
-<link rel="stylesheet" href="<c:url value="/resources/3rd-party/sneat/libs/jstree/jstree.css"/>" /--%>
+<link rel="stylesheet" href="<c:url value="/webjars/3rd-party/sneat/libs/jstree/jstree.css"/>" /--%>
 <div id="_url-tree" class="main-left d-flex flex-column flex-grow-1">
 	<div class="d-flex justify-content-between" style="padding-top:.5em; padding-bottom:.5em; border-top:1px solid #dfdfdf; border-bottom:1px solid #dfdfdf;">
 		<span>
@@ -10,8 +10,8 @@
 	<div id="_urlTree" style="padding-top:1em; height:37em; overflow:auto;">
 	</div>
 </div>
-<script src="<c:url value="/resources/3rd-party/sneat/libs/jstree/jstree.js"/>"></script>
-<script src="<c:url value="/resources/3rd-party/jstree/jstree-support.js"/>"></script>
+<script src="<c:url value="/webjars/3rd-party/sneat/libs/jstree/jstree.js"/>"></script>
+<script src="<c:url value="/webjars/3rd-party/jstree/jstree-support.js"/>"></script>
 <script type="text/javascript">
 var _multiple = ${multiple},
 	_urlSupport = treeSupport({

From b0e968a84d48f30babc7b4209f2b2ca2b0354491 Mon Sep 17 00:00:00 2001
From: "Jonguk. Lim" <minuk926@gmail.com>
Date: Wed, 12 Jun 2024 16:05:49 +0900
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20ADDS-API=20=ED=98=B8=EC=B6=9C=20?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xit/adds/cmm/model/ApiBaseResponse.java   | 127 ++++++++++
 .../java/cokr/xit/adds/cmm/model/ApiUtil.java | 236 ++++++++++++++++++
 .../cokr/xit/adds/cmm/model/ResultCode.java   |  46 ++++
 .../xit/adds/nims/web/ProductController.java  |  71 +++---
 .../WEB-INF/jsp/adds/nims/product-main.jsp    |   1 +
 5 files changed, 440 insertions(+), 41 deletions(-)
 create mode 100644 src/main/java/cokr/xit/adds/cmm/model/ApiBaseResponse.java
 create mode 100644 src/main/java/cokr/xit/adds/cmm/model/ApiUtil.java
 create mode 100644 src/main/java/cokr/xit/adds/cmm/model/ResultCode.java

diff --git a/src/main/java/cokr/xit/adds/cmm/model/ApiBaseResponse.java b/src/main/java/cokr/xit/adds/cmm/model/ApiBaseResponse.java
new file mode 100644
index 0000000..887e422
--- /dev/null
+++ b/src/main/java/cokr/xit/adds/cmm/model/ApiBaseResponse.java
@@ -0,0 +1,127 @@
+package cokr.xit.adds.cmm.model;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Collection;
+import java.util.Objects;
+
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <pre>
+ * description :
+ *
+ * packageName : kr.xit.core.model
+ * fileName    : ApiBaseResponse
+ * author      : limju
+ * date        : 2024-03-15
+ * ======================================================================
+ * 변경일         변경자        변경 내용
+ * ----------------------------------------------------------------------
+ * 2024-03-15    limju       최초 생성
+ *
+ * </pre>
+ */
+@Data
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+@Builder
+@JsonRootName("result")
+//@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ApiBaseResponse<T> {
+    /**
+     * 결과 코드 - 필수
+     */
+    private Integer code = ResultCode.SUCCESS.getStatusCode();
+
+    /**
+     * 결과 메세지 - 필수
+     */
+    private String message = ResultCode.SUCCESS.getMessage();
+
+    /**
+     * 결과 데이터
+     */
+    private T data;
+
+    /**
+     * 결과 데이터 건수
+     */
+    private int totalCount;
+
+    /**
+     * API 실행 성공 or 실패
+     */
+    private Boolean success = Objects.equals(code, ResultCode.SUCCESS.getStatusCode());
+
+    /**
+     * API 실행 시간
+     */
+    @Builder.Default
+    private String responseTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+
+    // public static <T> ApiBaseResponse<T> of() {
+    //     return new ApiBaseResponse<>();
+    // }
+    //
+    // public static <T> ApiBaseResponse<T> of(T data) {
+    //     return new ApiBaseResponse<>(data);
+    // }
+    //
+    // public static <T> ApiBaseResponse<T> empty() {
+    //     return new ApiBaseResponse<>(null, ResultCode.NO_CONTENT);
+    // }
+    //
+    // private ApiBaseResponse(T data) {
+    //
+    //     if(ObjectUtils.isEmpty(data)) {
+    //         this.code = ResultCode.NO_CONTENT.getStatusCode();
+    //         this.message = ResultCode.NO_CONTENT.getMessage();
+    //         this.data = null;
+    //     }else{
+    //         this.code = ResultCode.SUCCESS.getStatusCode();
+    //         this.message = ResultCode.findByStatusCode(code).getMessage();
+    //         this.data = data;
+    //     }
+    // }
+    //
+    // private ApiBaseResponse(T data, ResultCode resultCode) {
+    //     this.success = true;
+    //     this.code = resultCode.getStatusCode();
+    //     this.message = resultCode.getMessage();
+    //     this.data = null;
+    // }
+    //
+    // public ApiBaseResponse(Integer code, String message) {
+    //     this.code = code;
+    //     this.message = message;
+    // }
+    //
+    // public ApiBaseResponse(Integer code, String message, T data) {
+    //     this.code = code;
+    //     this.message = message;
+    //     this.data = data;
+    // }
+
+    public int getTotalCount() {
+        if(data == null){
+            this.totalCount = 0;
+
+        }else {
+
+            if (Collection.class.isAssignableFrom(data.getClass())) {
+                this.totalCount = ((Collection<?>) data).size();
+
+            } else {
+                this.totalCount =  1;
+            }
+        }
+        return totalCount;
+    }
+}
diff --git a/src/main/java/cokr/xit/adds/cmm/model/ApiUtil.java b/src/main/java/cokr/xit/adds/cmm/model/ApiUtil.java
new file mode 100644
index 0000000..c524135
--- /dev/null
+++ b/src/main/java/cokr/xit/adds/cmm/model/ApiUtil.java
@@ -0,0 +1,236 @@
+// package cokr.xit.adds.cmm.model;
+//
+// import java.io.FileInputStream;
+// import java.io.IOException;
+// import java.io.StringReader;
+// import java.net.http.HttpResponse;
+// import java.time.LocalDate;
+// import java.time.format.DateTimeFormatter;
+// import java.time.format.DateTimeParseException;
+// import java.util.List;
+// import java.util.Set;
+//
+// import javax.validation.ConstraintViolation;
+// import javax.validation.Validator;
+// import javax.xml.XMLConstants;
+// import javax.xml.transform.stream.StreamSource;
+// import javax.xml.validation.Schema;
+// import javax.xml.validation.SchemaFactory;
+//
+// import org.apache.commons.lang3.ObjectUtils;
+// import org.apache.commons.lang3.StringUtils;
+// import org.json.simple.JSONObject;
+// import org.springframework.http.HttpHeaders;
+// import org.xml.sax.SAXException;
+//
+// import com.fasterxml.jackson.core.type.TypeReference;
+//
+// import cokr.xit.adds.core.spring.exception.ApiCustomException;
+// import cokr.xit.foundation.data.JSON;
+// import cokr.xit.foundation.web.WebClient;
+//
+// /**
+//  * <pre>
+//  * description :
+//  *
+//  * author      : limju
+//  * date        : 2024-04-04
+//  * ======================================================================
+//  * 변경일         변경자        변경 내용
+//  * ----------------------------------------------------------------------
+//  * 2024-04-04    limju       최초 생성
+//  *
+//  * </pre>
+//  */
+// public class ApiUtil {
+//
+// 	/**
+// 	 * 유효성 검증
+// 	 * errList가 null인 경우 유효성 검증 실패 시 예외 throw ApiCustomException
+// 	 *
+// 	 * @param t         validatable object
+// 	 * @param errList   error list
+// 	 * @param validator validator
+// 	 */
+// 	public static <T> void validate(final T t, final List<String> errList, final Validator validator) {
+// 		final Set<ConstraintViolation<T>> list = validator.validate(t);
+//
+// 		if(!list.isEmpty()) {
+// 			final List<String> errors = list.stream()
+// 				.map(row -> String.format("%s=%s", row.getPropertyPath(), row.getMessageTemplate()))
+// 				.toList();
+//
+// 			// 추가적인 유효성 검증이 필요 없는 경우
+// 			if(errList == null){
+// 				if(!errors.isEmpty())   throw ApiCustomException.create(errors.toString());
+// 				return;
+// 			}
+// 			errList.addAll(errors);
+// 		}
+// 	}
+//
+// 	public static void checkYmdError(String dt, String fieldName) {
+// 		String msg = "유효한 일자가 아닙니다.";
+// 		if(ObjectUtils.isEmpty(fieldName)){
+// 			msg = "ymd=" + msg;
+// 		}else{
+// 			msg = fieldName + "=" + msg;
+// 		}
+// 		try {
+// 			final LocalDate rdt = LocalDate.parse(dt, DateTimeFormatter.ofPattern("yyyyMMdd"));
+// 			if(!dt.equals(DateTimeFormatter.ofPattern("yyyyMMdd").format(rdt))){
+// 				throw ApiCustomException.create(msg);
+// 			}
+// 		} catch (DateTimeParseException e) {
+// 			throw ApiCustomException.create(msg);
+// 		}
+// 	}
+//
+// 	public static void checkDatetimeError(String dt, String fieldName) {
+// 		String msg = "유효한 일시가 아닙니다.";
+// 		if(ObjectUtils.isEmpty(fieldName)){
+// 			msg = "ymd=" + msg;
+// 		}else{
+// 			msg = fieldName + "=" + msg;
+// 		}
+// 		try {
+// 			final LocalDate rdt = LocalDate.parse(dt, DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
+// 			if(!dt.equals(DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(rdt))){
+// 				throw ApiCustomException.create(msg);
+// 			}
+// 		} catch (DateTimeParseException e) {
+// 			throw ApiCustomException.create(msg);
+// 		}
+// 	}
+//
+// 	/**
+// 	 * NimsApi 호출 - x-www-form-urlencoded 방식
+// 	 * @param uri String
+// 	 * @param cls T
+// 	 * @return String
+// 	 */
+// 	public static <T> String callNimsApi(String uri, T cls) {
+// 		HttpResponse<String> rslt = new WebClient().post(request -> {
+// 			request.contentType(WebClient.Request.ContentType.FORM);
+// 			request.uri(uri);
+// 			toData(request, cls);
+// 		});
+// 		return rslt.body();
+// 	}
+//
+// 	/**
+// 	 * irosApi 호출 - x-www-form-urlencoded 방식
+// 	 * @param uri String
+// 	 * @param param String
+// 	 * @return String
+// 	 */
+// 	public static String callIrosApi(String uri, String param) {
+// 		HttpResponse<String> rslt = new WebClient().get(request -> {
+// 			request.header(HttpHeaders.CONTENT_TYPE, "application/json");
+// 			request.contentType(WebClient.Request.ContentType.FORM);
+// 			request.uri(uri + param);
+// 		});
+// 		return rslt.body();
+// 	}
+//
+// 	/**
+// 	 * Object -> data로 변환
+// 	 * @param request WebClient.Request
+// 	 * @param obj Object
+// 	 */
+// 	public static void toData(final WebClient.Request request, final Object obj){
+// 		if(ObjectUtils.isEmpty(obj))	return;
+//
+// 		JSONObject jsonObj = toObjByObj(obj, JSONObject.class);
+// 		for (Object key : jsonObj.keySet()) {
+// 			// API 호출 시 필요없는 파라메터 제외
+// 			if("userId".equals(key) || "dbSkipYn".equals(key)) continue;
+// 			request.data((String) key, ObjectUtils.isEmpty(jsonObj.get(key))? StringUtils.EMPTY: jsonObj.get(key));
+// 		}
+// 	}
+//
+// 	/**
+// 	 * Object -> class로 변환
+// 	 * @param obj Object
+// 	 * @param cls Class
+// 	 * @return T
+// 	 */
+// 	public static <T> T toObjByObj(final Object obj, final Class<T> cls) {
+// 		try {
+// 			return ObjectUtils.isNotEmpty(obj)? new JSON().getObjectMapper().convertValue(obj, cls) : null;
+// 		} catch (IllegalArgumentException e) {
+// 			throw ApiCustomException.create(e.getLocalizedMessage());
+// 		}
+// 	}
+//
+// 	/**
+// 	 * Object -> TypeReference로 변환
+// 	 * @param obj Object
+// 	 * @param typeRef TypeReference
+// 	 * @return T
+// 	 */
+// 	public static <T> T toObjByObj(final Object obj, final TypeReference<T> typeRef) {
+// 		try {
+// 			return ObjectUtils.isNotEmpty(obj)? new JSON().getObjectMapper().convertValue(obj, typeRef) : null;
+// 		} catch (IllegalArgumentException e) {
+// 			throw ApiCustomException.create(e.getLocalizedMessage());
+// 		}
+// 	}
+//
+// 	/**
+// 	 * XML 유효성 검증
+// 	 * @param xmlStr String
+// 	 * @param xsdFilePathName String
+// 	 * @return boolean
+// 	 */
+// 	public static boolean validateXml(final String xmlStr, final String xsdFilePathName)  {
+// 		try {
+// 			FileInputStream fis = new FileInputStream(xsdFilePathName);
+// 			SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+// 			Schema schema = sf.newSchema(new StreamSource(fis));
+//
+// 			javax.xml.validation.Validator validator = schema.newValidator();
+// 			validator.validate(new StreamSource(new StringReader(xmlStr)));
+// 			return true;
+//
+// 		} catch (SAXException | IOException e) {
+// 			throw ApiCustomException.create(e.getMessage());
+// 		}
+// 	}
+//
+// 	/**
+// 	 * XML 유효성 검증
+// 	 * @param xmlStr String
+// 	 * @param xsdFilePath String
+// 	 * @return boolean
+// 	 */
+// 	public static boolean validateXmlFromXmlStr(final String xmlStr, final String xsdFilePath)  {
+// 		try {
+// 			FileInputStream fis = new FileInputStream(xsdFilePath);
+// 			SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+// 			Schema schema = sf.newSchema(new StreamSource(fis));
+//
+// 			javax.xml.validation.Validator validator = schema.newValidator();
+// 			validator.validate(new StreamSource(new StringReader(xmlStr)));
+// 			return true;
+//
+// 		} catch (SAXException | IOException e) {
+// 			throw ApiCustomException.create(e.getMessage());
+// 		}
+// 	}
+//
+// 	/**
+// 	 * XML 유효성 검증
+// 	 * @param xmlFilePath String
+// 	 * @param xsdFilePath String
+// 	 * @return boolean
+// 	 */
+// 	public static boolean validateXmlFromFile(String xmlFilePath, final String xsdFilePath)  {
+// 		try (FileInputStream fileInputStream = new FileInputStream(xmlFilePath)) {
+// 			byte[] bytes = fileInputStream.readAllBytes();
+// 			return validateXmlFromXmlStr(new String(bytes), xsdFilePath);
+// 		}catch (IOException e) {
+// 			throw ApiCustomException.create(e.getMessage());
+// 		}
+// 	}
+// }
diff --git a/src/main/java/cokr/xit/adds/cmm/model/ResultCode.java b/src/main/java/cokr/xit/adds/cmm/model/ResultCode.java
new file mode 100644
index 0000000..d2a3aca
--- /dev/null
+++ b/src/main/java/cokr/xit/adds/cmm/model/ResultCode.java
@@ -0,0 +1,46 @@
+package cokr.xit.adds.cmm.model;
+
+import java.util.Arrays;
+
+import org.springframework.http.HttpStatus;
+
+import lombok.Getter;
+
+@Getter
+public enum ResultCode {
+
+    // 2xx
+    SUCCESS(HttpStatus.OK.value(), "성공"), // 200
+    NO_CONTENT(HttpStatus.NO_CONTENT.value(), "데이터가 없습니다"), // 204
+
+    // 4xx
+    BAD_REQUEST(HttpStatus.BAD_REQUEST.value(), "항목이 올바르지 않습니다"), // 400
+    INVALID_DATA(HttpStatus.BAD_REQUEST.value(), "데이터 처리 오류 발생"), // 400
+    LOGIN_ERROR(HttpStatus.BAD_REQUEST.value(), "아이디 혹은 비밀번호를 다시 확인하세요."), // 400
+    INVALID_PARAMETER(HttpStatus.BAD_REQUEST.value(), "필수 파라미터가 누락되었습니다"), // 500
+    UNAUTHORIZED(HttpStatus.UNAUTHORIZED.value(), "인증이 필요합니다"), // 401
+    FORBIDDEN(HttpStatus.FORBIDDEN.value(), "권한이 없습니다"), // 403
+    TOKEN_EXPIRED(HttpStatus.FORBIDDEN.value(), "토큰이 만료되었습니다"), // 403
+    INVALID_ACCESS_TOKEN(HttpStatus.FORBIDDEN.value(), "토큰이 유효하지 않습니다"), // 403
+    NOT_FOUND(HttpStatus.NOT_FOUND.value(), "요청한 api를 찾을 수 없습니다."), // 404
+
+    // 5xx
+    INVALID_JSON(HttpStatus.INTERNAL_SERVER_ERROR.value(), "전달된 JSON 형식이 올바르지 않습니다"), // 500
+    INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR.value(), "서버 에러가 발생했습니다"), // 500
+    ;
+
+    private final Integer statusCode;
+    private final String message;
+
+    ResultCode(Integer statusCode, String message){
+        this.statusCode = statusCode;
+        this.message = message;
+    }
+
+    public static ResultCode findByStatusCode(int statusCode){
+        return Arrays.stream(ResultCode.values())
+            .filter(ssc -> ssc.getStatusCode() == statusCode)
+            .findFirst()
+            .orElse(INVALID_DATA);
+    }
+}
diff --git a/src/main/java/cokr/xit/adds/nims/web/ProductController.java b/src/main/java/cokr/xit/adds/nims/web/ProductController.java
index ff6ab9a..2e1bad0 100644
--- a/src/main/java/cokr/xit/adds/nims/web/ProductController.java
+++ b/src/main/java/cokr/xit/adds/nims/web/ProductController.java
@@ -1,34 +1,27 @@
 package cokr.xit.adds.nims.web;
 
-import java.util.Collection;
-import java.util.function.Consumer;
 import java.net.http.HttpResponse;
-import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Consumer;
 
-import javax.annotation.Resource;
-import javax.json.JsonObject;
-
-import org.springframework.boot.configurationprocessor.json.JSONException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 
-import net.minidev.json.JSONArray;
 import net.minidev.json.JSONObject;
-import net.minidev.json.parser.JSONParser;
 import net.minidev.json.parser.ParseException;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.core.type.TypeReference;
 
-import cokr.xit.adds.nims.service.DsuseMgtReceiptService;
-import cokr.xit.adds.nims.BsshQuery;
+import cokr.xit.adds.cmm.model.ApiBaseResponse;
 import cokr.xit.adds.nims.ProductQuery;
+import cokr.xit.foundation.data.DataObject;
+import cokr.xit.foundation.data.JSON;
 import cokr.xit.foundation.web.AbstractController;
 import cokr.xit.foundation.web.WebClient;
-import cokr.xit.foundation.web.WebClient.Request.ContentType;
 import cokr.xit.foundation.web.WebClient.Request;
-import cokr.xit.foundation.data.DataObject;
+import cokr.xit.foundation.web.WebClient.Request.ContentType;
 
 
 
@@ -40,6 +33,7 @@ import cokr.xit.foundation.data.DataObject;
 public class ProductController extends AbstractController {
 
 	public static final String CLASS_URL = "/adds/nims";
+	JSON json = new JSON();
 
 	public class METHOD_URL {
 		public static final String
@@ -76,53 +70,48 @@ public class ProductController extends AbstractController {
 		String sMethod = "POST";
 
 		DataObject dataObject = new DataObject();
-		dataObject.put("k","");
+		//dataObject.put("k","");
 		dataObject.put("fg","1");
 		dataObject.put("pg","1");
 		dataObject.put("ymd","");
 		dataObject.put("fg2","");
-		dataObject.put("p",query.getSchProductCd());
-		dataObject.put("pn",query.getSchProductNm());
+		//query.setSchProductCd("8806578045922");
+		if(!isEmpty(query.getSchProductCd())) dataObject.put("p",query.getSchProductCd());
+		if(!isEmpty(query.getSchProductNm())) dataObject.put("pn",query.getSchProductNm());
 		dataObject.put("dbSkipYn","N");
 		dataObject.put("userId","suji");
 
-		ObjectMapper mapper = new ObjectMapper();
-
-		String sJsonData = mapper.writeValueAsString(dataObject);
-
 		Consumer<Request> configurer = (request) -> {
-		request.uri("http://localhost:9076/api/biz/nims/v1/getNimsProductInfoKd")
-		.contentType(ContentType.JSON)
-		.bodyData(sJsonData);
+			request.uri("http://localhost:9076/api/biz/nims/v1/getNimsProductInfoKd")
+				.contentType(ContentType.JSON)
+				.bodyData(json.stringify(dataObject));
 		};
 
 		HttpResponse<String> hresp = null;
 		if(sMethod.equals("POST")) {
-		hresp = new WebClient()
-		.post(configurer);
+			hresp = new WebClient()
+				.post(configurer);
 		} else if(sMethod.equals("GET")) {
-		hresp = new WebClient()
-		.get(configurer);
+			hresp = new WebClient()
+				.get(configurer);
 		}
 		String resBody = hresp.body();
-		
+		ApiBaseResponse<List<JSONObject>> jsonData = json.parse(resBody, new TypeReference<>() {});
+
+
+		// ApiBaseResponse(code=400, message=상품번호 또는 상품명은 필수 입니다, data=null, totalCount=0, success=false, responseTime=2024-06-12 15:35:24)
+		if(!jsonData.getSuccess()){
+			// error 처리
+			// throw new Exception(data.getMessage());
+		}
+		List<JSONObject> data = jsonData.getData();
 		System.out.println(resBody);
-		
-		JSONParser parser = new JSONParser();
 
-		Object obj = parser.parse( resBody );
-		JSONObject jsonObj = (JSONObject) obj;
-		JSONArray jsonData = (JSONArray) jsonObj.get("data");
-		
-		System.out.println(jsonData.get(0).toString());
-		
-		ModelAndView result = new ModelAndView("jsonView");
 
-		result.addObject("productMainList", jsonData)   // 발송 정보
-		         ;
+		ModelAndView result = new ModelAndView("jsonView");
+		result.addObject("productMainList", data);
 		   
         return result;
-
     }
 	
 }
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/product-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/product-main.jsp
index 341e72c..eeabdb1 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/product-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/product-main.jsp
@@ -94,6 +94,7 @@
 		$P.control = new DatasetControl({
 		    urls : {
 		    	load : wctx.url("/adds/nims/product-list.do")
+		    	//load : '<c:url value="http://localhost:9076/api/biz/nims/v1/getProductInfoByQrcodeImg" />',
 		    }
 			, prefix: "productMain"
 			, prefixName: "마약류 제품 조회"

From 569a63cc7ea35fe93a6e1993bbddda2116364ae4 Mon Sep 17 00:00:00 2001
From: mjkhan21 <mjkhan21@xit.co.kr>
Date: Wed, 12 Jun 2024 16:22:19 +0900
Subject: [PATCH 4/5] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=ED=99=94=EB=A9=B4=20=EC=88=98=EC=A0=95=20-=20?=
 =?UTF-8?q?=EC=83=81=ED=83=9C=20=EA=B4=80=EB=A0=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp b/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp
index d21ac20..33284e0 100644
--- a/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp
@@ -121,6 +121,7 @@
                     <div class="row">
                       <label class="col-sm-3 col-form-label text-sm-end" for="status">상태</label>
                       <div class="col-sm-9">
+                      <c:if test='${currentUser.hasAuthorities("ROLE_ADMIN")}'>
 						<div class="form-check form-check-inline mt-3">
 						  <input name="status" value="P" type="radio" data-map="STTS" class="form-check-input"/>
 						  <label class="form-check-label" for="approved">승인</label>
@@ -129,6 +130,11 @@
 						  <input name="status" value="A" type="radio" data-map="STTS" class="form-check-input"/>
 						  <label class="form-check-label" for="applied">신청</label>
 						</div>
+					  </c:if>
+                      <c:if test='${!currentUser.hasAuthorities("ROLE_ADMIN")}'>
+                        <input name="status" type="hidden" data-map="STTS" class="form-control" placeholder="상태"/>
+                        <label class="col-form-label" for=STTS></label>
+                      </c:if>
                       </div>
                     </div>
                   </div>
@@ -160,6 +166,7 @@ infoPrefixControl.setInfo = obj => {
 		} else
 			div.hide();
 	});
+	$("label[for='STTS']").html(obj.data.STTS == "P" ? "승인" : "신청");
 	
 	$("#infoPrefix-form input").onEnterPress(saveinfoPrefix);
 	

From 7b9c0d0766afff2580c77d94b9381ffe17c7ebaf Mon Sep 17 00:00:00 2001
From: "Jonguk. Lim" <minuk926@gmail.com>
Date: Wed, 12 Jun 2024 16:30:31 +0900
Subject: [PATCH 5/5] =?UTF-8?q?fix:=20API=20=ED=98=B8=EC=B6=9C=20-=20?=
 =?UTF-8?q?=EC=A7=81=EC=A0=91=ED=98=B8=EC=B6=9C,=20=EC=84=9C=EB=B2=84?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=ED=98=B8=EC=B6=9C=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cokr/xit/adds/nims/web/ProductController.java | 2 +-
 src/main/resources/application.yml                          | 4 ++--
 src/main/webapp/WEB-INF/jsp/adds/nims/product-main.jsp      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cokr/xit/adds/nims/web/ProductController.java b/src/main/java/cokr/xit/adds/nims/web/ProductController.java
index 2e1bad0..3a66191 100644
--- a/src/main/java/cokr/xit/adds/nims/web/ProductController.java
+++ b/src/main/java/cokr/xit/adds/nims/web/ProductController.java
@@ -75,7 +75,7 @@ public class ProductController extends AbstractController {
 		dataObject.put("pg","1");
 		dataObject.put("ymd","");
 		dataObject.put("fg2","");
-		//query.setSchProductCd("8806578045922");
+		query.setSchProductNm("아네폴주사");
 		if(!isEmpty(query.getSchProductCd())) dataObject.put("p",query.getSchProductCd());
 		if(!isEmpty(query.getSchProductNm())) dataObject.put("pn",query.getSchProductNm());
 		dataObject.put("dbSkipYn","N");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index aba6043..d0cb7fc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -79,8 +79,8 @@ propertyService:
 
 app:
   api:
-    host: http://211.119.124.9:9076
-    #host: http://localhost:9076
+    #host: http://211.119.124.9:9076
+    host: http://localhost:9076
   file:
     root:
       path: d:/data/adds/files/
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/product-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/product-main.jsp
index eeabdb1..57038f0 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/product-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/product-main.jsp
@@ -93,8 +93,8 @@
 		 **************************************************************************/
 		$P.control = new DatasetControl({
 		    urls : {
-		    	load : wctx.url("/adds/nims/product-list.do")
-		    	//load : '<c:url value="http://localhost:9076/api/biz/nims/v1/getProductInfoByQrcodeImg" />',
+		    	//load : wctx.url("/adds/nims/product-list.do")
+		    	load : '<c:url value="http://localhost:9076/api/biz/nims/v1/getNimsProductInfoKd" />',
 		    }
 			, prefix: "productMain"
 			, prefixName: "마약류 제품 조회"