From b3d4e34a91066c8a1182abfd2323cdb1a84bcf3e Mon Sep 17 00:00:00 2001 From: dogyeom Date: Tue, 18 Nov 2025 16:27:28 +0900 Subject: [PATCH] =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/jsp/bap/admin/work/messageProcMan.jsp | 2 +- .../jsp/bap/admin/work/messageProcManDetail.jsp | 2 +- .../comm/property/BapAdapterPropertyController.java | 6 +++--- .../bap/manage/comm/sysinfo/BapSysinfoService.java | 13 ++++++++++++- .../manage/work/inst/BapSystemInstController.java | 6 +++--- .../work/message/BapMessageProcController.java | 11 ++++++----- .../BapTransactionStatusController.java | 5 +++-- .../BapTransactionTraceController.java | 5 +++-- .../eai/rms/common/combo/IbatisComboService.java | 1 + .../eai/rms/common/combo/ibatis/ComboDao.java | 6 +++++- .../common/combo/ibatis/IbatisComboServiceImpl.java | 9 +++++++++ .../eai/rms/bap/manage/common/Combo-oracle.xml | 10 +++++++++- .../eai/rms/bap/manage/common/SysinfoMan-oracle.xml | 12 ++++++------ 13 files changed, 62 insertions(+), 26 deletions(-) diff --git a/WebContent/jsp/bap/admin/work/messageProcMan.jsp b/WebContent/jsp/bap/admin/work/messageProcMan.jsp index aba6598..4e89b60 100644 --- a/WebContent/jsp/bap/admin/work/messageProcMan.jsp +++ b/WebContent/jsp/bap/admin/work/messageProcMan.jsp @@ -37,7 +37,7 @@ { name: "BJOBBZWKNAME", align: "left" }, { name: "BJOBTRANDSTCDNAME", align: "left" }, { name: "BJOBMSGDSTICNAME", align: "left" }, - { name: "UAPPLCD", align: "center", hidden: true }, + { name: "UAPPLCD", align: "center" }, { name: "THISMSGCHRGIDS", align: "left" }, { name: "BJOBTELGMRECSIZE", align: "center" }, { diff --git a/WebContent/jsp/bap/admin/work/messageProcManDetail.jsp b/WebContent/jsp/bap/admin/work/messageProcManDetail.jsp index 1bc6419..39ca00b 100644 --- a/WebContent/jsp/bap/admin/work/messageProcManDetail.jsp +++ b/WebContent/jsp/bap/admin/work/messageProcManDetail.jsp @@ -85,7 +85,7 @@ function init(url,key){ new makeOptions("CODE","NAME").setObj($("select[name=bjobBzwkDstcd]")).setData(json.bjobBzwkDstcd).rendering(); new makeOptions("CODE","NAME").setObj($("select[name=sysCd]")).setNoValueInclude(true).setNoValue(' ','없음').setData(json.sysCd).rendering(); new makeOptions("CODE","NAME").setObj($("select[name=sysCd2]")).setNoValueInclude(true).setNoValue('','없음').setData(json.sysCd).rendering(); - /* new makeOptions("CODE","NAME").setObj($("select[name=uapplCd]")).setNoValueInclude(true).setNoValue(' ','없음').setData(json.uapplCd).rendering(); */ + new makeOptions("CODE","NAME").setObj($("select[name=uapplCd]")).setNoValueInclude(true).setNoValue(' ','없음').setData(json.uapplCd).rendering(); //new makeOptions("CODE","NAME").setObj($("select[name=bizlevel1]")).setNoValueInclude(true).setNoValue(' ','없음').setData(json.bizlevel1).rendering(); //new makeOptions("CODE","NAME").setObj($("select[name=bizlevel2]")).setNoValueInclude(true).setNoValue(' ','없음').setData(json.bizlevel2).rendering(); //setSearchable('bjobBzwkDstcd'); diff --git a/src/main/java/com/eactive/eai/rms/bap/manage/comm/property/BapAdapterPropertyController.java b/src/main/java/com/eactive/eai/rms/bap/manage/comm/property/BapAdapterPropertyController.java index c82b7ee..bca84ef 100644 --- a/src/main/java/com/eactive/eai/rms/bap/manage/comm/property/BapAdapterPropertyController.java +++ b/src/main/java/com/eactive/eai/rms/bap/manage/comm/property/BapAdapterPropertyController.java @@ -80,7 +80,7 @@ public class BapAdapterPropertyController extends BapBaseAnnotationController { HashMap[] list = gson.fromJson(gridData, HashMap[].class); service.insert(map,list); - CommonCommand command = new CommonCommand("com.eactive.eai.agent.adptproperty.UpdatePropertyCommand",(String)map.get("prptyGroupName")); + CommonCommand command = new CommonCommand("com.eactive.eai.agent.property.UpdatePropertyCommand",(String)map.get("prptyGroupName")); agentUtilService.broadcast(command); return null; @@ -94,7 +94,7 @@ public class BapAdapterPropertyController extends BapBaseAnnotationController { HashMap[] list = gson.fromJson(gridData, HashMap[].class); service.update(map,list); - CommonCommand command = new CommonCommand("com.eactive.eai.agent.adptproperty.UpdatePropertyCommand",(String)map.get("prptyGroupName")); + CommonCommand command = new CommonCommand("com.eactive.eai.agent.property.UpdatePropertyCommand",(String)map.get("prptyGroupName")); agentUtilService.broadcast(command); return null; @@ -107,7 +107,7 @@ public class BapAdapterPropertyController extends BapBaseAnnotationController { paramMap.put("prptyGroupName", prptyGroupName); service.delete(paramMap); - CommonCommand command = new CommonCommand("com.eactive.eai.agent.teleproperty.RemovePropertyCommand",prptyGroupName); + CommonCommand command = new CommonCommand("com.eactive.eai.agent.property.RemovePropertyCommand",prptyGroupName); agentUtilService.broadcast(command); return null; diff --git a/src/main/java/com/eactive/eai/rms/bap/manage/comm/sysinfo/BapSysinfoService.java b/src/main/java/com/eactive/eai/rms/bap/manage/comm/sysinfo/BapSysinfoService.java index d728c59..69ae81d 100644 --- a/src/main/java/com/eactive/eai/rms/bap/manage/comm/sysinfo/BapSysinfoService.java +++ b/src/main/java/com/eactive/eai/rms/bap/manage/comm/sysinfo/BapSysinfoService.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import com.eactive.eai.common.seed.Seed; +import com.eactive.eai.common.util.StringUtil; import com.eactive.eai.rms.bap.common.base.BapBaseService; @Service("bapSysinfoService") @@ -44,18 +45,28 @@ public class BapSysinfoService extends BapBaseService { String password = (String)map.get("USERPASSWORD"); map.put("USERPASSWORD", Seed.decrypt(password)); + return map; } public void update(HashMap paramMap) throws Exception { - String password = (String)paramMap.get("userPassword"); + + if(password == null ) { + password = " "; + } + paramMap.put("userPassword", Seed.encrypt(password)); dao.update(paramMap); } public void insert(HashMap paramMap) throws Exception { String password = (String)paramMap.get("userPassword"); + + if(password == null ) { + password = " "; + } + paramMap.put("userPassword", Seed.encrypt(password)); dao.insert(paramMap); } diff --git a/src/main/java/com/eactive/eai/rms/bap/manage/work/inst/BapSystemInstController.java b/src/main/java/com/eactive/eai/rms/bap/manage/work/inst/BapSystemInstController.java index 41e3ed9..159eafc 100644 --- a/src/main/java/com/eactive/eai/rms/bap/manage/work/inst/BapSystemInstController.java +++ b/src/main/java/com/eactive/eai/rms/bap/manage/work/inst/BapSystemInstController.java @@ -121,7 +121,7 @@ public class BapSystemInstController extends BapBaseAnnotationController { command = new CommonCommand("com.eactive.eai.agent.flowController.AddBatchTargetCommand",arg); agentUtilService.broadcast(command); - command = new CommonCommand("com.eactive.eai.agent.teleproperty.UpdatePropertyCommand",(String)map.get("prptyGroupName")); + command = new CommonCommand("com.eactive.eai.agent.property.UpdatePropertyCommand",(String)map.get("prptyGroupName")); agentUtilService.broadcast(command); return null; @@ -163,7 +163,7 @@ public class BapSystemInstController extends BapBaseAnnotationController { command = new CommonCommand("com.eactive.eai.agent.flowController.AddBatchTargetCommand",arg); agentUtilService.broadcast(command); - command = new CommonCommand("com.eactive.eai.agent.teleproperty.UpdatePropertyCommand",(String)map.get("prptyGroupName")); + command = new CommonCommand("com.eactive.eai.agent.property.UpdatePropertyCommand",(String)map.get("prptyGroupName")); agentUtilService.broadcast(command); return null; @@ -356,7 +356,7 @@ public class BapSystemInstController extends BapBaseAnnotationController { command = new CommonCommand("com.eactive.eai.agent.flowController.AddBatchTargetCommand",arg); agentUtilService.broadcast(command); - command = new CommonCommand("com.eactive.eai.agent.teleproperty.UpdatePropertyCommand",(String)map.get("prptyGroupName")); + command = new CommonCommand("com.eactive.eai.agent.property.UpdatePropertyCommand",(String)map.get("prptyGroupName")); agentUtilService.broadcast(command); ModelAndView modelAndView = new ModelAndView("jsonView", map); diff --git a/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcController.java b/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcController.java index f20b6eb..be2ac88 100644 --- a/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcController.java +++ b/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcController.java @@ -91,7 +91,7 @@ public class BapMessageProcController extends BapBaseAnnotationController { service.insert(map,list, connList); CommonCommand command = new CommonCommand("com.eactive.eai.agent.rule.dirInfo.RefreshAllJobCommand"); agentUtilService.broadcast(command); - command = new CommonCommand("com.eactive.eai.agent.teleproperty.UpdatePropertyCommand",(String)map.get("prptyGroupName")); + command = new CommonCommand("com.eactive.eai.agent.property.UpdatePropertyCommand",(String)map.get("prptyGroupName")); agentUtilService.broadcast(command); return null; @@ -111,7 +111,7 @@ public class BapMessageProcController extends BapBaseAnnotationController { service.update(map, list, connList); CommonCommand command = new CommonCommand("com.eactive.eai.agent.rule.dirInfo.RefreshAllJobCommand"); agentUtilService.broadcast(command); - command = new CommonCommand("com.eactive.eai.agent.teleproperty.UpdatePropertyCommand",(String)map.get("prptyGroupName")); + command = new CommonCommand("com.eactive.eai.agent.property.UpdatePropertyCommand",(String)map.get("prptyGroupName")); agentUtilService.broadcast(command); return null; @@ -123,7 +123,7 @@ public class BapMessageProcController extends BapBaseAnnotationController { service.delete(paramMap); CommonCommand command = new CommonCommand("com.eactive.eai.agent.rule.dirInfo.RefreshAllJobCommand"); agentUtilService.broadcast(command); - command = new CommonCommand("com.eactive.eai.agent.teleproperty.RemovePropertyCommand",(String)paramMap.get("prptyGroupName")); + command = new CommonCommand("com.eactive.eai.agent.property.RemovePropertyCommand",(String)paramMap.get("prptyGroupName")); agentUtilService.broadcast(command); return null; @@ -141,7 +141,8 @@ public class BapMessageProcController extends BapBaseAnnotationController { // List> uapplCd = //comboService.selectListComboForTableWithCode("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME"); // comboService.selectListComboForTable("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME","systeminoutdstcd = 'I' "); // List> bJobCycleGb = //comboService.selectListCombo("BAP_CYCLE_GB"); // BATCH작업주기구분 -// comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'BAP_CYCLE_GB' "); +// comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'BAP_CYCLE_GB' "); + List> uapplCd = comboService.selectCM01ComboList("TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME"); Map resultMap = new HashMap(); @@ -149,7 +150,7 @@ public class BapMessageProcController extends BapBaseAnnotationController { resultMap.put("bjobInstiDstcd", bjobInstiDstcd); // resultMap.put("groupCoCd" , groupCoCd); resultMap.put("sysCd" , sysCd); -// resultMap.put("uapplCd" , uapplCd); + resultMap.put("uapplCd" , uapplCd); // resultMap.put("bJobCycleGb" , bJobCycleGb); ModelAndView modelAndView = new ModelAndView("jsonView",resultMap); diff --git a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusController.java b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusController.java index a211a1a..e0a8ead 100644 --- a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusController.java +++ b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusController.java @@ -157,13 +157,14 @@ public class BapTransactionStatusController extends BapBaseAnnotationController List> bjobBzwkDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ02", "BJOBBZWKDSTCD", "BJOBBZWKNAME"); List> osidInstiDstcd = service.selectOsidInstiDstcd(""); -// List> uapplCd = comboService.selectListComboForTableWithCode("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME"); +// List> uapplCd = comboService.selectListComboForTableWithCode("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME"); + List> uapplCd = comboService.selectCM01ComboList("TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME"); Map resultMap = new HashMap(); resultMap.put("bjobBzwkDstcd" , bjobBzwkDstcd); resultMap.put("osidInstiDstcd" , osidInstiDstcd); -// resultMap.put("uapplCd" , uapplCd); + resultMap.put("uapplCd" , uapplCd); ModelAndView modelAndView = new ModelAndView("jsonView",resultMap); return modelAndView; diff --git a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceController.java b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceController.java index 1610347..7f8a9bc 100644 --- a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceController.java +++ b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceController.java @@ -73,13 +73,14 @@ public class BapTransactionTraceController extends BapBaseAnnotationController // List> groupCoCd = comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'EAIGROUPCOCD' "); List> bjobBzwkDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ02", "BJOBBZWKDSTCD", "BJOBBZWKNAME"); -// List> uapplCd = comboService.selectListComboForTableWithCode("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME"); +// List> uapplCd = comboService.selectListComboForTableWithCode("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME"); + List> uapplCd = comboService.selectCM01ComboList("TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME"); Map resultMap = new HashMap(); resultMap.put("bjobBzwkDstcd" , bjobBzwkDstcd); // resultMap.put("groupCoCd" , groupCoCd); -// resultMap.put("uapplCd" , uapplCd); + resultMap.put("uapplCd" , uapplCd); ModelAndView modelAndView = new ModelAndView("jsonView",resultMap); return modelAndView; diff --git a/src/main/java/com/eactive/eai/rms/common/combo/IbatisComboService.java b/src/main/java/com/eactive/eai/rms/common/combo/IbatisComboService.java index 86452c7..5592a92 100644 --- a/src/main/java/com/eactive/eai/rms/common/combo/IbatisComboService.java +++ b/src/main/java/com/eactive/eai/rms/common/combo/IbatisComboService.java @@ -16,4 +16,5 @@ public interface IbatisComboService { List> selectListComboForTableWithCode(String tableName, String codeColumn, String nameColumn); + List> selectCM01ComboList(String codeColumn, String nameColumn); } diff --git a/src/main/java/com/eactive/eai/rms/common/combo/ibatis/ComboDao.java b/src/main/java/com/eactive/eai/rms/common/combo/ibatis/ComboDao.java index 3698dc6..965183b 100644 --- a/src/main/java/com/eactive/eai/rms/common/combo/ibatis/ComboDao.java +++ b/src/main/java/com/eactive/eai/rms/common/combo/ibatis/ComboDao.java @@ -24,5 +24,9 @@ class ComboDao extends SqlMapClientTemplateDao { public List> selectListComboForTableWithCode(HashMap paramMap) { return this.template.queryForList("Combo.selectListComboForTableWithCode", paramMap); } - + + public List> selectCM01ComboList(HashMap paramMap) { + return this.template.queryForList("Combo.selectCM01ComboList", paramMap); + } + } \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/common/combo/ibatis/IbatisComboServiceImpl.java b/src/main/java/com/eactive/eai/rms/common/combo/ibatis/IbatisComboServiceImpl.java index cd02790..16c230e 100644 --- a/src/main/java/com/eactive/eai/rms/common/combo/ibatis/IbatisComboServiceImpl.java +++ b/src/main/java/com/eactive/eai/rms/common/combo/ibatis/IbatisComboServiceImpl.java @@ -64,5 +64,14 @@ public class IbatisComboServiceImpl implements IbatisComboService { paramMap.put("nameColumn", nameColumn); return ibatisComboDao.selectListComboForTableWithCode(paramMap); } + + @Override + @Deprecated + public List> selectCM01ComboList(String codeColumn, String nameColumn) { + HashMap paramMap = new HashMap<>(); + paramMap.put("codeColumn", codeColumn); + paramMap.put("nameColumn", nameColumn); + return ibatisComboDao.selectCM01ComboList(paramMap); + } } diff --git a/src/main/resources/com/eactive/eai/rms/bap/manage/common/Combo-oracle.xml b/src/main/resources/com/eactive/eai/rms/bap/manage/common/Combo-oracle.xml index ba9ccf1..3b7c20a 100644 --- a/src/main/resources/com/eactive/eai/rms/bap/manage/common/Combo-oracle.xml +++ b/src/main/resources/com/eactive/eai/rms/bap/manage/common/Combo-oracle.xml @@ -47,7 +47,15 @@ AND $searchType$ = #param# ORDER BY 1 + + + + SELECT distinct $codeColumn$ CODE, '[' || $codeColumn$ || ']' || $nameColumn$ NAME + FROM EMSADM.TSEAICM20 + + $where$ + + ORDER BY NAME ASC - diff --git a/src/main/resources/com/eactive/eai/rms/bap/manage/common/SysinfoMan-oracle.xml b/src/main/resources/com/eactive/eai/rms/bap/manage/common/SysinfoMan-oracle.xml index 4b041c0..a485847 100644 --- a/src/main/resources/com/eactive/eai/rms/bap/manage/common/SysinfoMan-oracle.xml +++ b/src/main/resources/com/eactive/eai/rms/bap/manage/common/SysinfoMan-oracle.xml @@ -46,10 +46,10 @@ SysName = #sysName#, SysIp = #sysIp#, SysPort = #sysPort#, - UserId = #userId#, + UserId = NVL(#userId#,' '), UserPassword = #userPassword#, - SendDir = #sendDir#, - RecvDir = #recvDir#, + SendDir = NVL(#sendDir#, ' '), + RecvDir = NVL(#sendDir#, ' '), SftpYn = #sftpYn#, ThisMsgUseYn = #thisMsgUseYn#, ThisMsgAmndrID = #userid# , @@ -79,10 +79,10 @@ #sysName# , #sysIp# , #sysPort# , - #userId# , + NVL(#userId#,' ') , #userPassword#, - #sendDir# , - #recvDir# , + NVL(#sendDir#, ' ') , + NVL(#recvDir# , ' ') , #sftpYn# , #thisMsgUseYn#, #userid#,