diff --git a/WebContent/jsp/onl/admin/adapter/adapterManDetail.jsp b/WebContent/jsp/onl/admin/adapter/adapterManDetail.jsp index 6650bf6..08df751 100644 --- a/WebContent/jsp/onl/admin/adapter/adapterManDetail.jsp +++ b/WebContent/jsp/onl/admin/adapter/adapterManDetail.jsp @@ -168,7 +168,7 @@ function validateName(){ return checkError; } -function localSave(){ +function localSave(isSilent){ var key =$("input[name=ADPTRBZWKNAME]").val(); //객체 생성 var save ={}; @@ -217,8 +217,12 @@ function localSave(){ save["adapterPropGroup"]= adapterPropGroup; save["adapterProps"] = fullData; submitData[key]=save; - - alert("<%=localeMessage.getString("adapterDetail.saveAlertMsg1")%>"); + + if (!isSilent) { + alert("<%=localeMessage.getString("adapterDetail.saveAlertMsg1")%>"); + } else { + alert("어댑터 정보 저장 성공!"); + } } @@ -280,6 +284,8 @@ function init(key,callback){ callback(key); } + $('select[name=EAIBZWKDSTCD]').select2(); + }, error:function(e){ alert(e.responseText); @@ -328,6 +334,8 @@ function detail(key){ } }); + + $('select[name=EAIBZWKDSTCD]').trigger('change'); //adapter @@ -632,7 +640,15 @@ $(document).ready(function() { var r = confirm("<%=localeMessage.getString("adapterDetail.checkMsg4")%>"); if (r == false) return; } - + + // 25.12.16 수정시 어댑터 리스트 자동저장 + alert("어댑터의 정보를 저장을 먼저 진행합니다.") + var isSubSaveSuccess = ModifyPopCheckAndSave(true); + + if (!isSubSaveSuccess) { + alert("어댑터 정보 저장이 실패했습니다. 어댑터 정보를 확인해주세요."); + return; + } //공통부만 form으로 구성 var postData = $('#ajaxForm').serializeArray(); @@ -819,24 +835,33 @@ $(document).ready(function() { localSave(); chkAdapterCnt('add'); - }); - $("#btn_pop_modify").click(function(){ - // + }); + $("#btn_pop_modify").click(function(){ // 검색용 + ModifyPopCheckAndSave(false); + }); + + function ModifyPopCheckAndSave(isSilent) { var isDuplication = false; + $("select[name=ADAPTERLIST] option").each(function(){ if ($(this).val() == $("input[name=ADPTRBZWKNAME]").val()){ isDuplication = true; } }); - if (!isDuplication){ - alert("<%=localeMessage.getString("adapterDetail.checkMsg2")%>"); - return; - } - localSave(); - }); + if (!isDuplication){ + // 화면 저장시 기존 alert 표시, INSERT/UPDATE 시 메시지 표시하지 않음 + if (!isSilent) { + alert("<%=localeMessage.getString("adapterDetail.checkMsg2")%>"); + } + return false; + } + + localSave(isSilent); + return true; + } + $("#btn_pop_delete").click(function(){ - // var isDuplication = false; $("select[name=ADAPTERLIST] option").each(function(){ if ($(this).val() == $("input[name=ADPTRBZWKNAME]").val()){ diff --git a/WebContent/jsp/onl/admin/authserver/clientManDetail.jsp b/WebContent/jsp/onl/admin/authserver/clientManDetail.jsp index 2eddc9a..18e652f 100644 --- a/WebContent/jsp/onl/admin/authserver/clientManDetail.jsp +++ b/WebContent/jsp/onl/admin/authserver/clientManDetail.jsp @@ -479,17 +479,17 @@ REDIRECT URI - + <%= localeMessage.getString("clntManDtl.athrt") %> (<%= localeMessage.getString("clntManDtl.sprt") %> ,) - + - + <%= localeMessage.getString("clntManDtl.rsrc") %> (<%= localeMessage.getString("clntManDtl.sprt") %> ,) - + <%= localeMessage.getString("clntManDtl.tknExprtnDt") %> @@ -501,11 +501,11 @@ - + <%= localeMessage.getString("clntManDtl.atmtcApprvlScp") %> (<%= localeMessage.getString("clntManDtl.sprt") %> ,) - + <%= localeMessage.getString("clntManDtl.allwIp") %> diff --git a/WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp b/WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp index 62ee6e2..df04283 100644 --- a/WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp +++ b/WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp @@ -1,4 +1,4 @@ -<%@ page language="java" contentType="text/html; charset=utf-8"%> + <%@ page language="java" contentType="text/html; charset=utf-8"%> <%@ page import="java.io.*"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ include file="/jsp/common/include/localemessage.jsp" %> @@ -512,6 +512,9 @@ $("#toResponseAdapter").change(); $("#apiFullPath").val(data["apiFullPath"]); // 스펙 전달용 값 + + $('#inboundHttpMethod').trigger('change'); + $('#outboundHttpMethod').trigger('change'); }, error:function(e){ alert(e.responseText); @@ -831,10 +834,19 @@ $("input[name=bzwkSvcKeyName]").val($("input[name=eaiTranName]").val()); } - // 사용자 편의를 위해 inboundRestPath 앞에 "/" 는 제외함. + // 사용자 편의를 위해 Path 앞에 "/" 는 제외, 복제도 포함. $("input[name=inboundRestPath]").val(function(index, value) { return value.replace(/^\/+/, ""); }); + $("input[name=inboundResponseRestPath]").val(function(index, value) { + return value.replace(/^\/+/, ""); + }); + $("input[name=outboundRestPath]").val(function(index, value) { + return value.replace(/^\/+/, ""); + }); + $("input[name=outboundResponseRestPath]").val(function(index, value) { + return value.replace(/^\/+/, ""); + }); var postData = $('#ajaxForm').serializeArray(); if (isDetail){ @@ -1232,7 +1244,15 @@ $('#stdCommonValueModal').modal('hide'); }); - function setupCloneInterfaceModal() { + function setupCloneInterfaceModal(event) { + const eaiBzwkDstcd = $('#eaiBzwkDstcd').val(); + const eaiSvcDesc = $('#eaiSvcDesc').val(); + const inboundHttpMethod = $('#inboundHttpMethod').val(); + + $('#newBizCode').val(eaiBzwkDstcd).trigger('change'); + $('#newSvcDesc').val(eaiSvcDesc); + $('#newInboundHttpMethod').val(inboundHttpMethod).trigger('change'); + $('#newSvcName').val(''); if($('#inboundRestPath').prop('disabled')){ $('#newRoutingOptionGroup').css('display','none'); @@ -1245,11 +1265,19 @@ const orgApiInterfaceId = getFullSvcName(); const newBizCode = $('#newBizCode').val(); const newSvcName = $('#newSvcName').val(); + const newSvcDesc = $('#newSvcDesc').val(); const newSendRecvType = $('#newSendRecvType').val(); const newInOutType = $('#newInOutType').val(); const newApiInterfaceId = newSvcName+newSendRecvType+newInOutType; const newInboundHttpMethod = $('#newInboundHttpMethod').val(); + + $("input[name=newInboundRestPath]").val(function(index, value) { + return value.replace(/^\/+/, ""); + }); + const newInboundRestPath = $('#newInboundRestPath').val(); + + $.ajax({ type: "POST", url: jsonUrl, @@ -1257,12 +1285,13 @@ cmd: 'CLONE', orgApiInterfaceId, newBizCode, + newSvcDesc, newApiInterfaceId, newInboundHttpMethod, newInboundRestPath, }, beforeSend: function() { - $("[id^='btn_']").prop("disabled", true); + $("[id=doCloneInterfaceButton]").prop("disabled", true); $("#doCloneInterfaceButton").text("처리중 . . . . ."); }, success: function () { @@ -1986,7 +2015,7 @@ + + + \ No newline at end of file diff --git a/WebContent/jsp/onl/transaction/apim/apiSpecManPopup.jsp b/WebContent/jsp/onl/transaction/apim/apiSpecManPopup.jsp index f4f6154..138c64f 100644 --- a/WebContent/jsp/onl/transaction/apim/apiSpecManPopup.jsp +++ b/WebContent/jsp/onl/transaction/apim/apiSpecManPopup.jsp @@ -98,7 +98,6 @@ function detail(key) { // console.log('Before AJAX call, key:', key); // Log the key before the AJAX call - debugger; $.ajax({ type: "POST", url: url, diff --git a/WebContent/jsp/onl/transaction/tracking/trackingMan.jsp b/WebContent/jsp/onl/transaction/tracking/trackingMan.jsp index 4adb311..61456be 100644 --- a/WebContent/jsp/onl/transaction/tracking/trackingMan.jsp +++ b/WebContent/jsp/onl/transaction/tracking/trackingMan.jsp @@ -292,13 +292,13 @@ } function orgNameFormatter(cellvalue, options, rowObject) { - if (cellValue == null) return ""; + if (cellvalue == null) return ""; - if (cellValue === "null" || cellValue === "NULL") return ""; + if (cellvalue === "null" || cellValue === "NULL") return ""; - if (String(cellValue).trim() === "") return ""; + if (String(cellvalue).trim() === "") return ""; - if (cellValue === "미분류") return ""; + if (cellvalue === "미분류") return ""; return cellvalue; } diff --git a/src/main/java/com/eactive/eai/rms/onl/transaction/apim/ApiInterfaceController.java b/src/main/java/com/eactive/eai/rms/onl/transaction/apim/ApiInterfaceController.java index 0cfa70f..0f21a97 100644 --- a/src/main/java/com/eactive/eai/rms/onl/transaction/apim/ApiInterfaceController.java +++ b/src/main/java/com/eactive/eai/rms/onl/transaction/apim/ApiInterfaceController.java @@ -271,10 +271,12 @@ public class ApiInterfaceController extends OnlBaseAnnotationController { } @PostMapping(value = "/onl/transaction/apim/apiInterfaceMan.json", params = "cmd=CLONE") - public ResponseEntity cloneApiInterface(String orgApiInterfaceId, String newBizCode, String newApiInterfaceId, String newInboundHttpMethod, String newInboundRestPath, boolean importDupliCheck) throws BizException { + public ResponseEntity cloneApiInterface(String orgApiInterfaceId, String newBizCode, + String newApiInterfaceId, String newInboundHttpMethod, + String newInboundRestPath, String newSvcDesc, boolean importDupliCheck) throws BizException { try { ApiInterfaceUI orgApiInterfaceUI = service.selectDetail(orgApiInterfaceId); - ApiInterfaceUI apiInterfaceUI = service.cloneApiInterface(orgApiInterfaceUI, newBizCode, newApiInterfaceId, newInboundHttpMethod, newInboundRestPath, importDupliCheck); + ApiInterfaceUI apiInterfaceUI = service.cloneApiInterface(orgApiInterfaceUI, newBizCode, newApiInterfaceId, newInboundHttpMethod, newInboundRestPath, newSvcDesc, importDupliCheck); Map resultMap = reloadSync(apiInterfaceUI); return ResponseEntity.ok(resultMap); } catch(Exception e) { diff --git a/src/main/java/com/eactive/eai/rms/onl/transaction/apim/ApiInterfaceService.java b/src/main/java/com/eactive/eai/rms/onl/transaction/apim/ApiInterfaceService.java index f2ac1ee..b45bcec 100644 --- a/src/main/java/com/eactive/eai/rms/onl/transaction/apim/ApiInterfaceService.java +++ b/src/main/java/com/eactive/eai/rms/onl/transaction/apim/ApiInterfaceService.java @@ -1159,7 +1159,7 @@ public class ApiInterfaceService extends OnlBaseService { public ApiInterfaceUI cloneApiInterface(ApiInterfaceUI orgApiInterfaceUI, String newBizCd, String newApiInterfaceId, String newInboundHttpMethod, - String newInboundRestPath, boolean importDupliCheck) throws Exception { + String newInboundRestPath, String newSvcDesc, boolean importDupliCheck) throws Exception { Optional optional = eaiMessageQueryService.findById(newApiInterfaceId); if (optional.isPresent()) { @@ -1173,6 +1173,7 @@ public class ApiInterfaceService extends OnlBaseService { apiInterfaceUI.setEaiBzwkDstcd(newBizCd); settingInterfaceId(apiInterfaceUI, newApiInterfaceId); apiInterfaceUI.setEaiSvcName(newApiInterfaceId); + apiInterfaceUI.setEaiSvcDesc(newSvcDesc); apiInterfaceUI.setInboundHttpMethod(newInboundHttpMethod); apiInterfaceUI.setInboundRestPath(newInboundRestPath);