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

미사용 테이블 관련 쿼리 및 오류 부분 수정

Browse Source
This commit is contained in:
dogyeom
2025-11-07 17:22:35 +09:00
parent d12067b12d
commit 2a845e0a2f
18 changed files with 159 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/eactive/eai/rms/bap/manage/comm/server/BapServerController.java
+1 -1
View File
@@ -101,7 +101,7 @@ public class BapServerController extends BapBaseAnnotationController {
public ModelAndView initCombo( HttpServletRequest request,
HttpServletResponse response,String eaiSvcName) throws Exception {
List<Map<String, Object>> listServer = ibatisComboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'YN' ");
List<Map<String, Object>> listServer = ibatisComboService.selectListComboForTable("TSEAIBP03","EAISEVRINSTNCNAME","EAISEVRINSTNCNAME");
Map<String, Object> resultMap = new HashMap<String, Object>();
resultMap.put("serverRows" , listServer);
src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcController.java
+19 -16
View File
@@ -137,20 +137,20 @@ public class BapMessageProcController extends BapBaseAnnotationController {
List<Map<String, Object>> bjobBzwkDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ02", "BJOBBZWKDSTCD", "BJOBBZWKNAME");
List<Map<String, Object>> bjobInstiDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ06", "OSIDINSTIDSTCD", "OSIDINSTINAME");
//
// List<Map<String, Object>> sysCd = comboService.selectListComboForTableWithCode("TSEAIBJ11", "SYSCD", "SYSNAME");
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' ");
List<Map<String, Object>> sysCd = comboService.selectListComboForTableWithCode("TSEAIBJ11", "SYSCD", "SYSNAME");
// 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' ");
Map<String, Object> resultMap = new HashMap<String, Object>();
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<String, Object> resultMap = new HashMap<String, Object>();
// if(!StringUtils.isEmpty(bjobBzwkDstcd)) {
// HashMap<String, Object> propMap = service.getProps(bjobBzwkDstcd); // 프로퍼티 정보
// HashMap<String, Object> InstMap = service.selectOsidInstiDstcd(bjobBzwkDstcd);
//
// resultMap.put("propMap", propMap);
// resultMap.put("InstMap", InstMap);
// }
if(!StringUtils.isEmpty(bjobBzwkDstcd)) {
HashMap<String, Object> propMap = service.getProps(bjobBzwkDstcd, bjobMsgDstcd); // 프로퍼티 정보
HashMap<String, Object> InstMap = service.selectOsidInstiDstcd(bjobBzwkDstcd);
resultMap.put("propMap", propMap);
resultMap.put("InstMap", InstMap);
HashMap<String, Object> map = service.getProps(bjobBzwkDstcd);
}
ModelAndView modelAndView = new ModelAndView("jsonView", resultMap);
return modelAndView;
}
src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcDao.java
+5
View File
@@ -87,4 +87,9 @@ public class BapMessageProcDao extends SqlMapClientTemplateDao {
public void deleteVerifyInfo(HashMap<String, Object> param) throws Exception{
this.template.delete("BapMessageProc.deleteVerifyInfo", param);
}
public void deleteBS01(HashMap<String, Object> param) throws Exception{
this.template.delete("BapMessageProc.deleteBS01", param);
}
}
src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcService.java
+16 -4
View File
@@ -75,9 +75,8 @@ public class BapMessageProcService extends BapBaseService {
}
}
public void insert(HashMap<String, Object> paramMap, HashMap<String, Object>[] list, HashMap<String, Object> connList) throws Exception {
// paramMap.put( "bjobMsgDstcd", dao.generatePK(paramMap));
public void insert(HashMap<String, Object> paramMap, HashMap<String, Object>[] list, HashMap<String, Object> 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<String, Object> 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<String, Object> getProps(String bjobBzwkDstcd) throws Exception {
HashMap<String, Object> param = new HashMap<String, Object>();
param.put("bjobBzwkDstcd", bjobBzwkDstcd);
List<Map<String, Object>> list = dao.getProps(param);
HashMap<String, Object> map = new HashMap<String, Object>();
map.put("rows", list);
return map;
}
public HashMap<String, Object> selectOsidInstiDstcd(String bjobBzwkDstcd) throws Exception {
src/main/java/com/eactive/eai/rms/bap/tansaction/procWork/BapProcWorkController.java
+2 -2
View File
@@ -92,14 +92,14 @@ public class BapProcWorkController extends BapBaseAnnotationController {
List<Map<String, Object>> bjobBzwkDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ02", "BJOBBZWKDSTCD", "BJOBBZWKNAME");
List<Map<String, Object>> osidInstiDstcd = statusService.selectOsidInstiDstcd("");
List<Map<String, Object>> svcPrcssNo = comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'SVC_PRCSS_NO' ");
// List<Map<String, Object>> svcPrcssNo = comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'SVC_PRCSS_NO' ");
//comboService.selectListCombo("SVC_PRCSS_NO");
Map<String, Object> resultMap = new HashMap<String, Object>();
resultMap.put("bjobBzwkDstcd" , bjobBzwkDstcd);
resultMap.put("osidInstiDstcd" , osidInstiDstcd);
resultMap.put("svcPrcssNo" , svcPrcssNo);
// resultMap.put("svcPrcssNo" , svcPrcssNo);
ModelAndView modelAndView = new ModelAndView("jsonView",resultMap);
return modelAndView;
src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusController.java
+40 -32
View File
@@ -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<String, Object> 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<String, Object> returnMap = agentUtilService.broadcast(command);
Iterator<String> 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<String, Object> returnMap = null;
Iterator<String> 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<String, Object> resultMap = service.selectList( paramMap);
//Map<String, Object> resultMap = service.selectList( paramMap);
ModelAndView modelAndView = new ModelAndView("jsonView",resultMap);
//ModelAndView modelAndView = new ModelAndView("jsonView",resultMap);
Map<String, Object> listMap = service.selectList(pageVo.getStartNum(), pageVo.getEndNum(), paramMap);
pageVo.setTotalCount((Integer)listMap.get("totalCount"));
Map<String, Object> resultMap = new HashMap<String, Object>();
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<Map<String, Object>> groupCoCd = comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'EAIGROUPCOCD' ");
//comboService.selectListCombo("EAIGROUPCOCD");
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>> bjobBzwkDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ02", "BJOBBZWKDSTCD", "BJOBBZWKNAME");
List<Map<String, Object>> osidInstiDstcd = service.selectOsidInstiDstcd("");
// List<Map<String, Object>> uapplCd = comboService.selectListComboForTableWithCode("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME");
Map<String, Object> resultMap = new HashMap<String, Object>();
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,
src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusDao.java
+14 -1
View File
@@ -15,18 +15,31 @@ public class BapTransactionStatusDao extends SqlMapClientTemplateDao {
public List<Map<String, Object>> findStatusList(HashMap<String, Object> param) throws Exception {
return (List<Map<String, Object>>)template.queryForList("BapTranStatus.list_normal", param);
}
public int findStatusListCount(HashMap<String, Object> param) throws Exception {
return (Integer)template.queryForObject("BapTranStatus.list_normal_count", param);
}
public List<Map<String, Object>> findErrorList(HashMap<String, Object> param) throws Exception {
return (List<Map<String, Object>>)template.queryForList("BapTranStatus.list_e", param);
}
public int findErrorListCount(HashMap<String, Object> param) throws Exception {
return (Integer)template.queryForObject("BapTranStatus.list_e_count", param);
}
public List<Map<String, Object>> findFutureList(HashMap<String, Object> param) throws Exception {
return (List<Map<String, Object>>)template.queryForList("BapTranStatus.list_f", param);
}
public int findFutureListCount(HashMap<String, Object> param) throws Exception {
return (Integer)template.queryForObject("BapTranStatus.list_f_count", param);
}
public List<Map<String, Object>> findDelayList(HashMap<String, Object> param) throws Exception {
return (List<Map<String, Object>>)template.queryForList("BapTranStatus.list_l", param);
}
public List<Map<String, Object>> findSpecList(HashMap<String, Object> param) throws Exception {
return (List<Map<String, Object>>)template.queryForList("BapTranStatus.speclist", param);
}
}
public int findSpecListCount(HashMap<String, Object> param) throws Exception {
return (Integer)template.queryForObject("BapTranStatus.speclist_count", param);
}
public HashMap<String, Object> selectDetail(HashMap<String, Object> param) throws Exception {
return (HashMap<String, Object>)template.queryForObject("BapTranStatus.masterlog", param);
src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusService.java
+17 -12
View File
@@ -20,46 +20,51 @@ public class BapTransactionStatusService extends BapBaseService {
@Qualifier("bapTransactionStatusDao")
private BapTransactionStatusDao dao;
public HashMap<String, Object> selectList(HashMap<String, Object> paramMap) throws Exception {
public HashMap<String, Object> selectList(int startNum,int endNum, HashMap<String, Object> paramMap) throws Exception {
String activeTab = (String)paramMap.get("activeTab");
ArrayList<String> tranPrcssDstcds = new ArrayList<String>();
ArrayList<String> tranPrcssDstcds2 = new ArrayList<String>();
paramMap.put("startNum" , startNum);
paramMap.put("endNum" , endNum);
HashMap<String, Object> map = new HashMap<String, Object>();
if ( activeTab.equals("tabE")){
tranPrcssDstcds.add("T");
//tranPrcssDstcds.add("R");
tranPrcssDstcds.add("R");
paramMap.put("tranPrcssDstcds", tranPrcssDstcds);
paramMap.put("tranPrcssDstcds2", tranPrcssDstcds2);
List<Map<String, Object>> listNomal = dao.findStatusList(paramMap);
List<Map<String, Object>> listError = dao.findErrorList(paramMap);
map.put("rows", processErrorList(listNomal, listError));
map.put("totalCount", dao.findErrorListCount(paramMap));
}else if ( activeTab.equals("tabF")){
List<Map<String, Object>> 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<Map<String, Object>> 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<Map<String, Object>> sendlist = dao.findStatusList(paramMap);
@SuppressWarnings("unchecked")
List<Map<String, Serializable>> memList = (List<Map<String, Serializable>>)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<Map<String, Object>> listA = dao.findSpecList(paramMap);
map.put("rows", listA);
map.put("totalCount", dao.findSpecListCount(paramMap));
}
return map;
src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceController.java
+4 -5
View File
@@ -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<Map<String, Object>> groupCoCd = comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'EAIGROUPCOCD' ");
// 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");
Map<String, Object> resultMap = new HashMap<String, Object>();
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;
src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceDao.java
+4
View File
@@ -19,4 +19,8 @@ public class BapTransactionTraceDao extends SqlMapClientTemplateDao {
public List<Map<String, Object>> selectList(HashMap<String, Object> param) throws Exception {
return (List<Map<String, Object>>)template.queryForList("BapTransactionTrace.selectList", param);
}
public List<Map<String, Object>> selectOsidInstiDstcd(HashMap<String, Object> param) throws Exception {
return (List<Map<String, Object>>)template.queryForList("BapTranStatus.selectOsidInstiDstcd", param);
}
}
src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceService.java
+9 -1
View File
@@ -34,6 +34,14 @@ public class BapTransactionTraceService extends BapBaseService {
return map;
}
}
public List<Map<String, Object>> selectOsidInstiDstcd(String bjobBzwkDstcd) throws Exception {
HashMap<String, Object> param = new HashMap<String, Object>();
param.put("bjobBzwkDstcd", bjobBzwkDstcd);
return dao.selectOsidInstiDstcd(param);
}
}
src/main/java/com/eactive/eai/rms/bap/tansaction/transactionWait/BapTransactionWaitController.java
+2 -2
View File
@@ -86,14 +86,14 @@ public class BapTransactionWaitController extends BapBaseAnnotationController {
List<Map<String, Object>> bjobBzwkDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ02", "BJOBBZWKDSTCD", "BJOBBZWKNAME");
List<Map<String, Object>> osidInstiDstcd = statusService.selectOsidInstiDstcd("");
List<Map<String, Object>> svcPrcssNo = comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'SVC_PRCSS_NO' ");
// List<Map<String, Object>> svcPrcssNo = comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'SVC_PRCSS_NO' ");
//comboService.selectListCombo("SVC_PRCSS_NO");
Map<String, Object> resultMap = new HashMap<String, Object>();
resultMap.put("bjobBzwkDstcd" , bjobBzwkDstcd);
resultMap.put("osidInstiDstcd" , osidInstiDstcd);
resultMap.put("svcPrcssNo" , svcPrcssNo);
// resultMap.put("svcPrcssNo" , svcPrcssNo);
ModelAndView modelAndView = new ModelAndView("jsonView",resultMap);
return modelAndView;