diff --git a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java
index 284e936..7fcfb27 100644
--- a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java
+++ b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java
@@ -43,12 +43,14 @@ import cokr.xit.adds.cmm.model.DsuseRsltInfo;
 import cokr.xit.adds.cmm.model.NimsApiRequest;
 import cokr.xit.adds.cmmn.hwp.format.DisposeProcessDetails;
 import cokr.xit.adds.cmmn.hwp.format.DisposeResultReport;
+import cokr.xit.adds.nims.ApiKeyQuery;
 import cokr.xit.adds.nims.DsuseMgtDetailQuery;
 import cokr.xit.adds.nims.DsuseMgtDocQuery;
 import cokr.xit.adds.nims.DsuseMgtReceiptQuery;
 import cokr.xit.adds.nims.DsuseMgtRsltQuery;
 import cokr.xit.adds.nims.DsuseMgtStatisticsQuery;
 import cokr.xit.adds.nims.service.AddsNimsService;
+import cokr.xit.adds.nims.service.ApiKeyService;
 import cokr.xit.adds.nims.service.DsuseMgtDocService;
 import cokr.xit.adds.nims.service.DsuseMgtReceiptService;
 import cokr.xit.applib.Print;
@@ -120,6 +122,9 @@ public class AddsNimsController extends ApplicationController {
 
     @Resource(name="dsuseMgtDocService")
     private DsuseMgtDocService dsuseMgtDocService;
+    
+    @Resource(name="apiKeyService")
+    private ApiKeyService apiKeyService;
 
     @Resource(name="fileService")
     private FileService fileService;
@@ -284,8 +289,11 @@ public class AddsNimsController extends ApplicationController {
     public ModelAndView updatePrgsSttusOfDsuseMgt(DsuseMgtReceiptQuery qry) {
 		boolean saved = false;
 		String rtnMsg = dsuseMgtReceiptService.updatePrgsSttusOfDsuseMgt(qry);
+		String message;
 		if(rtnMsg.contains("[S]")) {
 			saved = true;
+		}else{
+			saved = false;
 		}
 		return new ModelAndView("jsonView")
 			.addObject("saved", saved)
@@ -680,6 +688,62 @@ public class AddsNimsController extends ApplicationController {
     // 마약류폐기보고 팝업
     //-------------------------------------------------------------------------------------------------
 
+    //-------------------------------------------------------------------------------------------------
+    // ApiKey 관리
+    //-------------------------------------------------------------------------------------------------
+    @RequestMapping(value = "/apiKeyMain.do", name="apiKey 관리 메인")
+    public ModelAndView apiKeyMain() {
+
+        ModelAndView mav = new ModelAndView("adds/nims/apiKey-main");
+
+        List<DataObject> deptList = sggDeptService.getDepartmentList(new DepartmentQuery());
+    	mav.addObject("DEPTList", deptList);
+
+        return mav.addObject("pageName", "apiKeyMain")						/* View(jsp)에서 사용할 id 뒤에 붙일 suffix */;
+    }
+    
+    @RequestMapping(value = "/apiKey-list.do", name="apiKey 관리 조회")
+    public ModelAndView getApiKeyList(ApiKeyQuery query) {
+        setFetchSize(query);
+
+        return setCollectionInfo(new ModelAndView("jsonView"), apiKeyService.getApiKeyList(query),"","");
+    }
+    
+    @RequestMapping(value = "/apiKey-info.do", name="apiKey 관리 상세")
+    public ModelAndView getApiKeyInfo(ApiKeyQuery query) {
+        ModelAndView mav = new ModelAndView("adds/nims/apiKey-info");
+        List<DataObject> deptList = sggDeptService.getDepartmentList(new DepartmentQuery());
+    	mav.addObject("DEPTList", deptList);
+        mav.addObject("apiKeyInfo", toJson(query));
+
+        return mav.addObject("pageName", "apiKeyInfoPopup");					// View(jsp)에서 사용할 id 뒤에 붙일 suffix
+    }
+    
+    @RequestMapping(value = "/updateApiKey.do", name="apiKey 수정")
+    public ModelAndView updateApiKey(ApiKeyQuery query) {
+		boolean saved = false;
+		String rtnMsg = apiKeyService.updateApiKey(query);
+		if(rtnMsg.contains("[S]")) {
+			saved = true;
+		}
+		return new ModelAndView("jsonView")
+			.addObject("saved", saved)
+			.addObject("rtnMsg", rtnMsg);
+    }
+    
+    @RequestMapping(value = "/inertApiKey.do", name="apiKey 등록")
+    public ModelAndView insertApiKey(ApiKeyQuery query) {
+		boolean saved = false;
+		String rtnMsg = apiKeyService.createApiKey(query);
+		if(rtnMsg.contains("[S]")) {
+			saved = true;
+		}
+		return new ModelAndView("jsonView")
+			.addObject("saved", saved)
+			.addObject("rtnMsg", rtnMsg);
+    }
+    
+    
     //-------------------------------------------------------------------------------------------------
     // API server call
     //-------------------------------------------------------------------------------------------------