api관리 해재일 추가

src/main/java/com/lemon/lifecenter/controller/ApiManagerController.java

@@ -150,7 +150,7 @@ public class ApiManagerController extends LifeCenterController {
             @ModelAttribute("dto") final ApiManagerDTO dto,
             HttpServletRequest request,HttpServletResponse response) {
         
-        if (dto.getApiKey().isEmpty()) {
+        if (dto.getUseYn().equals("C")) {
             int pwdLength = 32;
             final char[] passwordTable =  { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 
                                                     'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',

src/main/java/com/lemon/lifecenter/dto/ApiManagerDTO.java

@@ -24,6 +24,7 @@ public class ApiManagerDTO {
     private String centerCode = "";
     private String centerName = "";
     private String cooperativeName = "";
+    private String expireDate = "";
     
     private int limit = 0;
     private int limitMax = 0;
@@ -147,5 +148,11 @@ public class ApiManagerDTO {
     public void setCooperativeName(String cooperativeName) {
         this.cooperativeName = cooperativeName;
     }
+    public String getExpireDate() {
+        return expireDate;
+    }
+    public void setExpireDate(String expireDate) {
+        this.expireDate = expireDate;
+    }
     
 }

src/main/resources/mybatis/mapper/api/apiManager.xml

@@ -50,7 +50,8 @@
                 (SELECT CH.COOPERATIVE_NAME 
                     FROM COOPERATIVE_HOSPITAL CH
                     WHERE M.COOPERATIVE_CODE = CH.COOPERATIVE_CODE
-                ) AS cooperativeName
+                ) AS cooperativeName,
+                M.EXPIRE_DATE AS expireDate
             FROM
                 API_MANAGER M
             WHERE 1 = 1
@@ -101,7 +102,8 @@
                 (SELECT CH.COOPERATIVE_NAME 
                     FROM COOPERATIVE_HOSPITAL CH
                     WHERE M.COOPERATIVE_CODE = CH.COOPERATIVE_CODE
-                ) AS cooperativeName
+                ) AS cooperativeName,
+                M.EXPIRE_DATE AS expireDate
             FROM
                 API_MANAGER M
             WHERE 1 = 1
@@ -150,15 +152,20 @@
             UPDATE
                 API_MANAGER
             SET
-                USE_YN = #{useYn},
+                USE_YN = #{useYn}
         ]]>
-        <if test='apiKey != null and apiKey != ""'>
+        <if test='useYn == "C"'>
         <![CDATA[
-                API_KEY = #{apiKey},
+                ,API_KEY = #{apiKey}
+                ,ACCEPT_DATE = NOW()
+        ]]>
+        </if>
+        <if test='useYn == "D"'>
+        <![CDATA[
+                ,EXPIRE_DATE = NOW()
         ]]>
         </if>
         <![CDATA[    
-                ACCEPT_DATE = NOW()
             WHERE
                 IDX = #{idx}
         ]]>

src/main/webapp/WEB-INF/jsp/api/info.jsp

@@ -105,7 +105,7 @@ $( function(){
                                                     <c:out value="${info.managerPhone}" />
                                                 </td>
                                             </tr>
-                                            <c:if test="${info.useYn ne 'D'}">
+                                            <c:if test="${info.useYn eq 'C'}">
                                             <tr>
                                                 <th>api key</th>
                                                 <td colspan="3">
@@ -125,12 +125,22 @@ $( function(){
                                                     <c:out value="${info.requestDate}" />
                                                 </td>
                                             </tr>
+                                            <c:if test="${info.useYn eq 'C'}">
                                             <tr>
                                                 <th>승인일</th>
                                                 <td colspan="3">
                                                     <c:out value="${info.acceptDate}" />
                                                 </td>
                                             </tr>
+                                            </c:if>
+                                            <c:if test="${info.useYn eq 'D'}">
+                                            <tr>
+                                                <th>해제일</th>
+                                                <td colspan="3">
+                                                    <c:out value="${info.expireDate}" />
+                                                </td>
+                                            </tr>
+                                            </c:if>
                                             <tr>
                                                 <th>생성일</th>
                                                 <td colspan="3">