djb-eapim/eapim-admin
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Merge branch 'devs/bap-monitoring' into 'jenkins_with_weblogic'

Browse Source 
화면 오류 수정 사항 반영

See merge request eapim/eapim-admin!9
This commit is contained in:
dogyeom kim
2025-11-18 16:28:36 +09:00
parent 11d277fdff b3d4e34a91
commit 31ae763ad6
13 changed files with 62 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebContent/jsp/bap/admin/work/messageProcMan.jsp
+1 -1
View File
@@ -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" },
{
WebContent/jsp/bap/admin/work/messageProcManDetail.jsp
+1 -1
View File
@@ -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');
src/main/java/com/eactive/eai/rms/bap/manage/comm/property/BapAdapterPropertyController.java
+3 -3
View File
@@ -80,7 +80,7 @@ public class BapAdapterPropertyController extends BapBaseAnnotationController {
HashMap<String, Object>[] 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<String, Object>[] 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;
src/main/java/com/eactive/eai/rms/bap/manage/comm/sysinfo/BapSysinfoService.java
+12 -1
View File
@@ -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<String, Object> 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<String, Object> paramMap) throws Exception {
String password = (String)paramMap.get("userPassword");
if(password == null ) {
password = " ";
}
paramMap.put("userPassword", Seed.encrypt(password));
dao.insert(paramMap);
}
src/main/java/com/eactive/eai/rms/bap/manage/work/inst/BapSystemInstController.java
+3 -3
View File
@@ -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);
src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcController.java
+6 -5
View File
@@ -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<Map<String, Object>> uapplCd = //comboService.selectListComboForTableWithCode("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME");
// comboService.selectListComboForTable("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME","systeminoutdstcd = 'I' ");
// List<Map<String, Object>> 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<Map<String, Object>> uapplCd = comboService.selectCM01ComboList("TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME");
Map<String, Object> resultMap = new HashMap<String, Object>();
@@ -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);
src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusController.java
+3 -2
View File
@@ -157,13 +157,14 @@ public class BapTransactionStatusController extends BapBaseAnnotationController
List<Map<String, Object>> bjobBzwkDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ02", "BJOBBZWKDSTCD", "BJOBBZWKNAME");
List<Map<String, Object>> osidInstiDstcd = service.selectOsidInstiDstcd("");
// List<Map<String, Object>> uapplCd = comboService.selectListComboForTableWithCode("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME");
// List<Map<String, Object>> uapplCd = comboService.selectListComboForTableWithCode("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME");
List<Map<String, Object>> uapplCd = comboService.selectCM01ComboList("TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME");
Map<String, Object> resultMap = new HashMap<String, Object>();
resultMap.put("bjobBzwkDstcd" , bjobBzwkDstcd);
resultMap.put("osidInstiDstcd" , osidInstiDstcd);
// resultMap.put("uapplCd" , uapplCd);
resultMap.put("uapplCd" , uapplCd);
ModelAndView modelAndView = new ModelAndView("jsonView",resultMap);
return modelAndView;
src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceController.java
+3 -2
View File
@@ -73,13 +73,14 @@ public class BapTransactionTraceController extends BapBaseAnnotationController
// List<Map<String, Object>> groupCoCd = comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'EAIGROUPCOCD' ");
List<Map<String, Object>> bjobBzwkDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ02", "BJOBBZWKDSTCD", "BJOBBZWKNAME");
// List<Map<String, Object>> uapplCd = comboService.selectListComboForTableWithCode("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME");
// List<Map<String, Object>> uapplCd = comboService.selectListComboForTableWithCode("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME");
List<Map<String, Object>> uapplCd = comboService.selectCM01ComboList("TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME");
Map<String, Object> resultMap = new HashMap<String, Object>();
resultMap.put("bjobBzwkDstcd" , bjobBzwkDstcd);
// resultMap.put("groupCoCd" , groupCoCd);
// resultMap.put("uapplCd" , uapplCd);
resultMap.put("uapplCd" , uapplCd);
ModelAndView modelAndView = new ModelAndView("jsonView",resultMap);
return modelAndView;
src/main/java/com/eactive/eai/rms/common/combo/IbatisComboService.java
+1
View File
@@ -16,4 +16,5 @@ public interface IbatisComboService {
List<Map<String, Object>> selectListComboForTableWithCode(String tableName, String codeColumn, String nameColumn);
List<Map<String, Object>> selectCM01ComboList(String codeColumn, String nameColumn);
}
src/main/java/com/eactive/eai/rms/common/combo/ibatis/ComboDao.java
+5 -1
View File
@@ -24,5 +24,9 @@ class ComboDao extends SqlMapClientTemplateDao {
public List<Map<String, Object>> selectListComboForTableWithCode(HashMap<String, Object> paramMap) {
return this.template.queryForList("Combo.selectListComboForTableWithCode", paramMap);
}
public List<Map<String, Object>> selectCM01ComboList(HashMap<String, Object> paramMap) {
return this.template.queryForList("Combo.selectCM01ComboList", paramMap);
}
}
src/main/java/com/eactive/eai/rms/common/combo/ibatis/IbatisComboServiceImpl.java
+9
View File
@@ -64,5 +64,14 @@ public class IbatisComboServiceImpl implements IbatisComboService {
paramMap.put("nameColumn", nameColumn);
return ibatisComboDao.selectListComboForTableWithCode(paramMap);
}
@Override
@Deprecated
public List<Map<String, Object>> selectCM01ComboList(String codeColumn, String nameColumn) {
HashMap<String, Object> paramMap = new HashMap<>();
paramMap.put("codeColumn", codeColumn);
paramMap.put("nameColumn", nameColumn);
return ibatisComboDao.selectCM01ComboList(paramMap);
}
}
src/main/resources/com/eactive/eai/rms/bap/manage/common/Combo-oracle.xml
+9 -1
View File
@@ -47,7 +47,15 @@
</isNotEmpty>
AND $searchType$ = #param#
ORDER BY 1
</statement>
<statement id="selectCM01ComboList" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
SELECT distinct $codeColumn$ CODE, '[' || $codeColumn$ || ']' || $nameColumn$ NAME
FROM EMSADM.TSEAICM20
<isNotEmpty prepend="WHERE" property="where">
$where$
</isNotEmpty>
ORDER BY NAME ASC
</statement>
</sqlMap>
src/main/resources/com/eactive/eai/rms/bap/manage/common/SysinfoMan-oracle.xml
+6 -6
View File
@@ -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#,