diff --git a/src/main/java/com/eactive/eai/rms/bap/manage/comm/server/BapServerController.java b/src/main/java/com/eactive/eai/rms/bap/manage/comm/server/BapServerController.java index 1796bb7..f3257f6 100644 --- a/src/main/java/com/eactive/eai/rms/bap/manage/comm/server/BapServerController.java +++ b/src/main/java/com/eactive/eai/rms/bap/manage/comm/server/BapServerController.java @@ -101,7 +101,7 @@ public class BapServerController extends BapBaseAnnotationController { public ModelAndView initCombo( HttpServletRequest request, HttpServletResponse response,String eaiSvcName) throws Exception { - List> listServer = ibatisComboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'YN' "); + List> listServer = ibatisComboService.selectListComboForTable("TSEAIBP03","EAISEVRINSTNCNAME","EAISEVRINSTNCNAME"); Map resultMap = new HashMap(); resultMap.put("serverRows" , listServer); 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 f674a8d..47c7bee 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 @@ -137,20 +137,20 @@ public class BapMessageProcController extends BapBaseAnnotationController { List> bjobBzwkDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ02", "BJOBBZWKDSTCD", "BJOBBZWKNAME"); List> bjobInstiDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ06", "OSIDINSTIDSTCD", "OSIDINSTINAME"); // -// List> sysCd = comboService.selectListComboForTableWithCode("TSEAIBJ11", "SYSCD", "SYSNAME"); - 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' "); + List> sysCd = comboService.selectListComboForTableWithCode("TSEAIBJ11", "SYSCD", "SYSNAME"); +// 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' "); Map resultMap = new HashMap(); resultMap.put("bjobBzwkDstcd" , bjobBzwkDstcd); resultMap.put("bjobInstiDstcd", bjobInstiDstcd); // resultMap.put("groupCoCd" , groupCoCd); -// resultMap.put("sysCd" , sysCd); - resultMap.put("uapplCd" , uapplCd); - resultMap.put("bJobCycleGb" , bJobCycleGb); + resultMap.put("sysCd" , sysCd); +// resultMap.put("uapplCd" , uapplCd); +// resultMap.put("bJobCycleGb" , bJobCycleGb); ModelAndView modelAndView = new ModelAndView("jsonView",resultMap); return modelAndView; @@ -159,20 +159,23 @@ public class BapMessageProcController extends BapBaseAnnotationController { @RequestMapping(value= "/bap/admin/work/messageProcMan.json",params = "cmd=LIST_PROP") public ModelAndView getProps( HttpServletRequest request, HttpServletResponse response, - @RequestParam String bjobBzwkDstcd, - @RequestParam String bjobMsgDstcd + @RequestParam String bjobBzwkDstcd ) throws Exception { Map resultMap = new HashMap(); +// if(!StringUtils.isEmpty(bjobBzwkDstcd)) { +// HashMap propMap = service.getProps(bjobBzwkDstcd); // 프로퍼티 정보 +// HashMap InstMap = service.selectOsidInstiDstcd(bjobBzwkDstcd); +// +// resultMap.put("propMap", propMap); +// resultMap.put("InstMap", InstMap); +// } + if(!StringUtils.isEmpty(bjobBzwkDstcd)) { - HashMap propMap = service.getProps(bjobBzwkDstcd, bjobMsgDstcd); // 프로퍼티 정보 - HashMap InstMap = service.selectOsidInstiDstcd(bjobBzwkDstcd); - - resultMap.put("propMap", propMap); - resultMap.put("InstMap", InstMap); + HashMap map = service.getProps(bjobBzwkDstcd); } - + ModelAndView modelAndView = new ModelAndView("jsonView", resultMap); return modelAndView; } diff --git a/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcDao.java b/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcDao.java index e10de38..e7c56dc 100644 --- a/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcDao.java +++ b/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcDao.java @@ -87,4 +87,9 @@ public class BapMessageProcDao extends SqlMapClientTemplateDao { public void deleteVerifyInfo(HashMap param) throws Exception{ this.template.delete("BapMessageProc.deleteVerifyInfo", param); } + + public void deleteBS01(HashMap param) throws Exception{ + this.template.delete("BapMessageProc.deleteBS01", param); + } + } \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcService.java b/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcService.java index d0e3441..180f2ac 100644 --- a/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcService.java +++ b/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcService.java @@ -75,9 +75,8 @@ public class BapMessageProcService extends BapBaseService { } } - public void insert(HashMap paramMap, HashMap[] list, HashMap connList) throws Exception { - -// paramMap.put( "bjobMsgDstcd", dao.generatePK(paramMap)); + public void insert(HashMap paramMap, HashMap[] list, HashMap connList) throws Exception { + paramMap.put( "bjobMsgDstcd", dao.generatePK(paramMap)); dao.insert(paramMap); telePropDao.delete(paramMap); telePropDao.deleteProperty(paramMap); @@ -99,7 +98,8 @@ public class BapMessageProcService extends BapBaseService { public void delete(HashMap paramMap) throws Exception { dao.delete(paramMap); - dao.deleteVerifyInfo(paramMap); +// dao.deleteVerifyInfo(paramMap); + dao.deleteBS01(paramMap); telePropDao.delete(paramMap); telePropDao.deleteProperty(paramMap); } @@ -114,6 +114,18 @@ public class BapMessageProcService extends BapBaseService { map.put("rows", list); return map; } + + public HashMap getProps(String bjobBzwkDstcd) throws Exception { + + HashMap param = new HashMap(); + param.put("bjobBzwkDstcd", bjobBzwkDstcd); + List> list = dao.getProps(param); + HashMap map = new HashMap(); + + map.put("rows", list); + + return map; + } public HashMap selectOsidInstiDstcd(String bjobBzwkDstcd) throws Exception { diff --git a/src/main/java/com/eactive/eai/rms/bap/tansaction/procWork/BapProcWorkController.java b/src/main/java/com/eactive/eai/rms/bap/tansaction/procWork/BapProcWorkController.java index d7e4b55..b185650 100644 --- a/src/main/java/com/eactive/eai/rms/bap/tansaction/procWork/BapProcWorkController.java +++ b/src/main/java/com/eactive/eai/rms/bap/tansaction/procWork/BapProcWorkController.java @@ -92,14 +92,14 @@ public class BapProcWorkController extends BapBaseAnnotationController { List> bjobBzwkDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ02", "BJOBBZWKDSTCD", "BJOBBZWKNAME"); List> osidInstiDstcd = statusService.selectOsidInstiDstcd(""); - List> svcPrcssNo = comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'SVC_PRCSS_NO' "); +// List> svcPrcssNo = comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'SVC_PRCSS_NO' "); //comboService.selectListCombo("SVC_PRCSS_NO"); Map resultMap = new HashMap(); resultMap.put("bjobBzwkDstcd" , bjobBzwkDstcd); resultMap.put("osidInstiDstcd" , osidInstiDstcd); - resultMap.put("svcPrcssNo" , svcPrcssNo); +// resultMap.put("svcPrcssNo" , svcPrcssNo); ModelAndView modelAndView = new ModelAndView("jsonView",resultMap); return modelAndView; 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 6f0f4c1..78511ed 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 @@ -50,32 +50,30 @@ public class BapTransactionStatusController extends BapBaseAnnotationController * @throws Exception */ @RequestMapping(value= "/bap/transaction/transactionStatusMan.json", params = "cmd=LIST") - public ModelAndView selectList(HttpServletRequest request, + public ModelAndView selectList(HttpServletRequest request, JsonPageVo pageVo, @RequestParam HashMap paramMap) throws Exception { -// String date = (String)paramMap.get("searchStartYYYYMMDD"); -// CommonCommand command = new CommonCommand("com.eactive.eai.agent.schedule.GetScheduleBasisListCommand",date); + String date = (String)paramMap.get("searchStartYYYYMMDD"); + CommonCommand command = new CommonCommand("com.eactive.eai.agent.schedule.GetScheduleBasisListCommand",date); + + Map returnMap = agentUtilService.broadcast(command); + Iterator iter = returnMap.keySet().iterator(); + String svrName = iter.next(); + String[] basis = null; + + if(returnMap.get(svrName) instanceof String[]) { + basis = (String[])returnMap.get(svrName); + } -// String[] basis = null; - - Map returnMap = null; - Iterator iter = null; - String svrName = ""; -// try { -// returnMap = agentUtilService.broadcast(command); -// iter = returnMap.keySet().iterator(); -// svrName = iter.next(); -// basis = (String[])returnMap.get(svrName); -// } catch (Exception e) { -// basis = new String[1]; -// basis[0] = "D"; -// } - -// paramMap.put("basis", basis); + if ( basis == null ){ + basis = new String[1]; + basis[0] = "D"; + } + paramMap.put("basis", basis); String activeTab = (String)paramMap.get("activeTab"); if ( activeTab.equals("tabS") ){ - CommonCommand command = new CommonCommand("com.eactive.eai.agent.transaction.ProcessingFileTransferCommand",""); + command = new CommonCommand("com.eactive.eai.agent.transaction.ProcessingFileTransferCommand",""); returnMap = agentUtilService.broadcast(command); iter = returnMap.keySet().iterator(); svrName = iter.next(); @@ -84,9 +82,22 @@ public class BapTransactionStatusController extends BapBaseAnnotationController paramMap.put("procList", list); } - Map resultMap = service.selectList( paramMap); + //Map resultMap = service.selectList( paramMap); - ModelAndView modelAndView = new ModelAndView("jsonView",resultMap); + //ModelAndView modelAndView = new ModelAndView("jsonView",resultMap); + + Map listMap = service.selectList(pageVo.getStartNum(), pageVo.getEndNum(), paramMap); + + pageVo.setTotalCount((Integer)listMap.get("totalCount")); + + Map resultMap = new HashMap(); + resultMap.put("total" , pageVo.getTotal()); //전체 페이지수 + resultMap.put("page" , pageVo.getPage()); //현재 페이지수 + resultMap.put("records", pageVo.getTotalCount()); //전체 레코드건수 + resultMap.put("rows" , listMap.get("rows")); + + ModelAndView modelAndView = new ModelAndView("jsonView",resultMap); + return modelAndView; } @@ -135,22 +146,19 @@ public class BapTransactionStatusController extends BapBaseAnnotationController public ModelAndView initCombo( HttpServletRequest request, HttpServletResponse response) throws Exception { - List> groupCoCd = comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'EAIGROUPCOCD' "); - //comboService.selectListCombo("EAIGROUPCOCD"); - List> bjobBzwkDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ02", "BJOBBZWKDSTCD", "BJOBBZWKNAME"); - List> osidInstiDstcd = service.selectOsidInstiDstcd(""); - List> uapplCd = comboService.selectListComboForTableWithCode("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME"); + List> bjobBzwkDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ02", "BJOBBZWKDSTCD", "BJOBBZWKNAME"); + List> osidInstiDstcd = service.selectOsidInstiDstcd(""); +// List> uapplCd = comboService.selectListComboForTableWithCode("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME"); Map resultMap = new HashMap(); resultMap.put("bjobBzwkDstcd" , bjobBzwkDstcd); resultMap.put("osidInstiDstcd" , osidInstiDstcd); - resultMap.put("groupCoCd" , groupCoCd); - resultMap.put("uapplCd" , uapplCd); +// resultMap.put("uapplCd" , uapplCd); - ModelAndView modelAndView = new ModelAndView("jsonView",resultMap); - return modelAndView; - } + ModelAndView modelAndView = new ModelAndView("jsonView",resultMap); + return modelAndView; + } @RequestMapping(value= "/bap/transaction/transactionStatusMan.json",params = "cmd=LIST_ORGN_COMBO") public ModelAndView initOrgnCombo( HttpServletRequest request, diff --git a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusDao.java b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusDao.java index d38f2ee..e562a90 100644 --- a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusDao.java +++ b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusDao.java @@ -15,18 +15,31 @@ public class BapTransactionStatusDao extends SqlMapClientTemplateDao { public List> findStatusList(HashMap param) throws Exception { return (List>)template.queryForList("BapTranStatus.list_normal", param); } + public int findStatusListCount(HashMap param) throws Exception { + return (Integer)template.queryForObject("BapTranStatus.list_normal_count", param); + } public List> findErrorList(HashMap param) throws Exception { return (List>)template.queryForList("BapTranStatus.list_e", param); } + public int findErrorListCount(HashMap param) throws Exception { + return (Integer)template.queryForObject("BapTranStatus.list_e_count", param); + } public List> findFutureList(HashMap param) throws Exception { return (List>)template.queryForList("BapTranStatus.list_f", param); } + public int findFutureListCount(HashMap param) throws Exception { + return (Integer)template.queryForObject("BapTranStatus.list_f_count", param); + } public List> findDelayList(HashMap param) throws Exception { return (List>)template.queryForList("BapTranStatus.list_l", param); } public List> findSpecList(HashMap param) throws Exception { return (List>)template.queryForList("BapTranStatus.speclist", param); - } + } + public int findSpecListCount(HashMap param) throws Exception { + return (Integer)template.queryForObject("BapTranStatus.speclist_count", param); + } + public HashMap selectDetail(HashMap param) throws Exception { return (HashMap)template.queryForObject("BapTranStatus.masterlog", param); diff --git a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusService.java b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusService.java index eb11183..a716cb6 100644 --- a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusService.java +++ b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusService.java @@ -20,46 +20,51 @@ public class BapTransactionStatusService extends BapBaseService { @Qualifier("bapTransactionStatusDao") private BapTransactionStatusDao dao; - public HashMap selectList(HashMap paramMap) throws Exception { - + public HashMap selectList(int startNum,int endNum, HashMap paramMap) throws Exception { + String activeTab = (String)paramMap.get("activeTab"); ArrayList tranPrcssDstcds = new ArrayList(); - ArrayList tranPrcssDstcds2 = new ArrayList(); - + paramMap.put("startNum" , startNum); + paramMap.put("endNum" , endNum); + HashMap map = new HashMap(); - + if ( activeTab.equals("tabE")){ tranPrcssDstcds.add("T"); - //tranPrcssDstcds.add("R"); + tranPrcssDstcds.add("R"); paramMap.put("tranPrcssDstcds", tranPrcssDstcds); - paramMap.put("tranPrcssDstcds2", tranPrcssDstcds2); List> listNomal = dao.findStatusList(paramMap); List> listError = dao.findErrorList(paramMap); map.put("rows", processErrorList(listNomal, listError)); - + map.put("totalCount", dao.findErrorListCount(paramMap)); }else if ( activeTab.equals("tabF")){ List> listF = dao.findFutureList(paramMap); map.put("rows", listF); + map.put("totalCount", dao.findFutureListCount(paramMap)); }else if ( activeTab.equals("tabQ")){ tranPrcssDstcds.add("Q"); paramMap.put("tranPrcssDstcds", tranPrcssDstcds); List> waitlist = dao.findStatusList(paramMap); map.put("rows", waitlist); - + map.put("totalCount", dao.findStatusListCount(paramMap)); }else if ( activeTab.equals("tabS")){ - tranPrcssDstcds2.add("S"); + tranPrcssDstcds.add("S"); paramMap.put("tranPrcssDstcds", tranPrcssDstcds); - paramMap.put("tranPrcssDstcds2", tranPrcssDstcds2); List> sendlist = dao.findStatusList(paramMap); @SuppressWarnings("unchecked") List> memList = (List>)paramMap.get("procList"); - processMemList(sendlist, memList); + + if(memList != null) { + processMemList(sendlist, memList); + } map.put("rows", sendlist); + map.put("totalCount", dao.findStatusListCount(paramMap)); }else if ( activeTab.equals("tabA")){ List> listA = dao.findSpecList(paramMap); map.put("rows", listA); + map.put("totalCount", dao.findSpecListCount(paramMap)); } return map; 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 2978d11..1610347 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 @@ -17,7 +17,6 @@ import org.springframework.web.servlet.ModelAndView; import com.eactive.eai.agent.command.CommonCommand; import com.eactive.eai.rms.common.base.BapBaseAnnotationController; -import com.eactive.eai.rms.common.combo.ComboService; import com.eactive.eai.rms.common.combo.IbatisComboService; import com.eactive.eai.rms.common.login.SessionManager; import com.eactive.eai.rms.common.util.CamelCaseUtil; @@ -72,15 +71,15 @@ public class BapTransactionTraceController extends BapBaseAnnotationController public ModelAndView initCombo( HttpServletRequest request, HttpServletResponse response) throws Exception { - List> groupCoCd = comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'EAIGROUPCOCD' "); +// 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"); Map resultMap = new HashMap(); resultMap.put("bjobBzwkDstcd" , bjobBzwkDstcd); - resultMap.put("groupCoCd" , groupCoCd); - resultMap.put("uapplCd" , uapplCd); +// resultMap.put("groupCoCd" , groupCoCd); +// 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/BapTransactionTraceDao.java b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceDao.java index 474bb38..c34bca0 100644 --- a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceDao.java +++ b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceDao.java @@ -19,4 +19,8 @@ public class BapTransactionTraceDao extends SqlMapClientTemplateDao { public List> selectList(HashMap param) throws Exception { return (List>)template.queryForList("BapTransactionTrace.selectList", param); } + + public List> selectOsidInstiDstcd(HashMap param) throws Exception { + return (List>)template.queryForList("BapTranStatus.selectOsidInstiDstcd", param); + } } \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceService.java b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceService.java index 79cf1e7..93e5906 100644 --- a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceService.java +++ b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceService.java @@ -34,6 +34,14 @@ public class BapTransactionTraceService extends BapBaseService { return map; - } + } + + public List> selectOsidInstiDstcd(String bjobBzwkDstcd) throws Exception { + + HashMap param = new HashMap(); + param.put("bjobBzwkDstcd", bjobBzwkDstcd); + + return dao.selectOsidInstiDstcd(param); + } } \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionWait/BapTransactionWaitController.java b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionWait/BapTransactionWaitController.java index 73b097c..bab492b 100644 --- a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionWait/BapTransactionWaitController.java +++ b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionWait/BapTransactionWaitController.java @@ -86,14 +86,14 @@ public class BapTransactionWaitController extends BapBaseAnnotationController { List> bjobBzwkDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ02", "BJOBBZWKDSTCD", "BJOBBZWKNAME"); List> osidInstiDstcd = statusService.selectOsidInstiDstcd(""); - List> svcPrcssNo = comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'SVC_PRCSS_NO' "); +// List> svcPrcssNo = comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'SVC_PRCSS_NO' "); //comboService.selectListCombo("SVC_PRCSS_NO"); Map resultMap = new HashMap(); resultMap.put("bjobBzwkDstcd" , bjobBzwkDstcd); resultMap.put("osidInstiDstcd" , osidInstiDstcd); - resultMap.put("svcPrcssNo" , svcPrcssNo); +// resultMap.put("svcPrcssNo" , svcPrcssNo); ModelAndView modelAndView = new ModelAndView("jsonView",resultMap); return modelAndView; diff --git a/src/main/resources/com/eactive/eai/rms/bap/manage/adapter/Adapter-oracle.xml b/src/main/resources/com/eactive/eai/rms/bap/manage/adapter/Adapter-oracle.xml index a7a9be8..5386651 100644 --- a/src/main/resources/com/eactive/eai/rms/bap/manage/adapter/Adapter-oracle.xml +++ b/src/main/resources/com/eactive/eai/rms/bap/manage/adapter/Adapter-oracle.xml @@ -47,6 +47,9 @@ UPPER(AdptrBzwkGroupName) LIKE '%' || #searchAdptrBzwkGroupName# || '%' + + UPPER(AdptrBzwkGroupDesc) LIKE '%' || #searchAdptrBzwkGroupDesc# || '%' + ) TMP ) T WHERE ROWNO BETWEEN #startNum# AND #endNum# diff --git a/src/main/resources/com/eactive/eai/rms/bap/manage/common/AdapterPropertyMan.xml b/src/main/resources/com/eactive/eai/rms/bap/manage/common/AdapterPropertyMan.xml index 4d6dbe6..e280b9f 100644 --- a/src/main/resources/com/eactive/eai/rms/bap/manage/common/AdapterPropertyMan.xml +++ b/src/main/resources/com/eactive/eai/rms/bap/manage/common/AdapterPropertyMan.xml @@ -3,40 +3,40 @@ SELECT PRPTYGROUPNAME AS "PRPTYGROUPNAME", PRPTYGROUPDESC AS "PRPTYGROUPDESC" - FROM $schemaId$.TSEAIBA03 + FROM $schemaId$.TSEAIBP01 WHERE PrptyGroupName = #prptyGroupName# SELECT PRPTYNAME AS "PRPTYNAME", PRPTY2VAL AS "PRPTY2VAL" - FROM $schemaId$.TSEAIBA04 + FROM $schemaId$.TSEAIBP02 WHERE PrptyGroupName = #prptyGroupName# - UPDATE $schemaId$.TSEAIBA03 + UPDATE $schemaId$.TSEAIBP01 SET PrptyGroupDesc = #prptyGroupDesc# WHERE PrptyGroupName = #prptyGroupName# - INSERT INTO $schemaId$.TSEAIBA03( + INSERT INTO $schemaId$.TSEAIBP01( PrptyGroupName, PrptyGroupDesc) VALUES(#prptyGroupName#, #prptyGroupDesc#) - INSERT INTO $schemaId$.TSEAIBA04( + INSERT INTO $schemaId$.TSEAIBP02( PrptyGroupName, PrptyName, Prpty2Val) VALUES(#prptyGroupName#, #prptyName#, #prpty2Val#) - DELETE FROM $schemaId$.TSEAIBA03 WHERE PrptyGroupName = #prptyGroupName# + DELETE FROM $schemaId$.TSEAIBP01 WHERE PrptyGroupName = #prptyGroupName# - DELETE FROM $schemaId$.TSEAIBA04 WHERE PrptyGroupName = #prptyGroupName# + DELETE FROM $schemaId$.TSEAIBP02 WHERE PrptyGroupName = #prptyGroupName# diff --git a/src/main/resources/com/eactive/eai/rms/bap/manage/message/FlowRuleMan.xml b/src/main/resources/com/eactive/eai/rms/bap/manage/message/FlowRuleMan.xml index f8a14f0..e6724d2 100644 --- a/src/main/resources/com/eactive/eai/rms/bap/manage/message/FlowRuleMan.xml +++ b/src/main/resources/com/eactive/eai/rms/bap/manage/message/FlowRuleMan.xml @@ -66,8 +66,8 @@ #telgmPtrnDstcd# , #telgmDtalsOperCd# , #bjobCmnTelgmTranCd# , - #toutVal#::NUMERIC , - #bjobIterNotms#::NUMERIC , + #toutVal# , + #bjobIterNotms# , #telgmClsID# , #cndnItemDcsnCtnt# , #cndnTelgmPtrnCd# , @@ -75,7 +75,7 @@ #cndnTranClsfiCd# , #cndnRspnsCd# , #bjobStgeFlxblCndnDesc# , - #tranPrcssPrity#::NUMERIC ) + #tranPrcssPrity# ) diff --git a/src/main/resources/com/eactive/eai/rms/bap/manage/work/MessageProcMan-oracle.xml b/src/main/resources/com/eactive/eai/rms/bap/manage/work/MessageProcMan-oracle.xml index 65001e2..9d14d71 100644 --- a/src/main/resources/com/eactive/eai/rms/bap/manage/work/MessageProcMan-oracle.xml +++ b/src/main/resources/com/eactive/eai/rms/bap/manage/work/MessageProcMan-oracle.xml @@ -101,7 +101,7 @@ MsgPrcssPrity , BjobTelgmRecSize , SysCd , - SysCd2 , + UapplCd , SndrcvFileName , ThisMsgChrgIDs , @@ -125,7 +125,7 @@ #msgPrcssPrity# , #bjobTelgmRecSize# , NVL(#sysCd#, ' ' ) , - NVL(#sysCd2#, ' ' ) , + NVL(#uapplCd#, ' ' ) , #sndrcvFileName# , #thisMsgChrgIDs# , @@ -149,7 +149,7 @@ MsgPrcssPrity = #msgPrcssPrity# , BjobTelgmRecSize = #bjobTelgmRecSize# , SysCd = NVL(#sysCd#, ' ' ) , - SysCd2 = NVL(#sysCd2#, ' ' ) , + UapplCd = #uapplCd# , SndrcvFileName = #sndrcvFileName# , ThisMsgChrgIDs = #thisMsgChrgIDs# , diff --git a/src/main/resources/com/eactive/eai/rms/bap/manage/work/MessageProcMan.xml b/src/main/resources/com/eactive/eai/rms/bap/manage/work/MessageProcMan.xml index f60f593..d1fe75f 100644 --- a/src/main/resources/com/eactive/eai/rms/bap/manage/work/MessageProcMan.xml +++ b/src/main/resources/com/eactive/eai/rms/bap/manage/work/MessageProcMan.xml @@ -51,4 +51,8 @@ DELETE FROM $schemaId$.TSEAIBJ01 WHERE BjobMsgDstcd = #bjobMsgDstcd# + + DELETE FROM $schemaId$.TSEAIBS01 + WHERE BjobMsgDstcd = #bjobMsgDstcd# + \ No newline at end of file diff --git a/src/main/resources/com/eactive/eai/rms/bap/manage/work/SystemInstMan-oracle.xml b/src/main/resources/com/eactive/eai/rms/bap/manage/work/SystemInstMan-oracle.xml index dc7a5f4..c647ca5 100644 --- a/src/main/resources/com/eactive/eai/rms/bap/manage/work/SystemInstMan-oracle.xml +++ b/src/main/resources/com/eactive/eai/rms/bap/manage/work/SystemInstMan-oracle.xml @@ -31,6 +31,9 @@ AND A.OsidInstiName LIKE '%' || #searchOsidInstiName# || '%' AND A.OsidInstiDstcd LIKE '%' || #searchOsidInstiDstcd# || '%' AND B.BjobBzwkName LIKE '%' || #searchBjobBzwkName# || '%' + AND A.BjobBzwkDstcd LIKE '%' || #searchBjobBzwkDstcd# || '%' + AND A.SendPrcssRuleCd LIKE '%' || #searchSendPrcssRulecd# || '%' + AND A.RecvPrcssRuleCd LIKE '%' || #searchRecvPrcssRulecd# || '%' ) TMP WHERE ROWNO BETWEEN #startNum# AND #endNum# @@ -43,6 +46,9 @@ AND A.OsidInstiName LIKE '%' || #searchOsidInstiName# || '%' AND A.OsidInstiDstcd LIKE '%' || #searchOsidInstiDstcd# || '%' AND B.BjobBzwkName LIKE '%' || #searchBjobBzwkName# || '%' + AND A.BjobBzwkDstcd LIKE '%' || #searchBjobBzwkDstcd# || '%' + AND A.SendPrcssRuleCd LIKE '%' || #searchSendPrcssRulecd# || '%' + AND A.RecvPrcssRuleCd LIKE '%' || #searchRecvPrcssRulecd# || '%'