diff --git a/src/com/eactive/eai/batch/code/CodeMessageDAO.java b/src/com/eactive/eai/batch/code/CodeMessageDAO.java index bac0d7b..62aeb3b 100644 --- a/src/com/eactive/eai/batch/code/CodeMessageDAO.java +++ b/src/com/eactive/eai/batch/code/CodeMessageDAO.java @@ -1,5 +1,6 @@ package com.eactive.eai.batch.code; +import com.eactive.eai.batch.common.StringUtil; import com.eactive.eai.common.dao.BaseDAO; import com.eactive.eai.common.dao.DAOException; import com.eactive.eai.common.exception.ExceptionUtil; @@ -40,11 +41,11 @@ public class CodeMessageDAO extends BaseDAO implements CodeMessageQuery rs = executeQuery(); while(rs.next()) { cmv = new CodeMessageVO(); - cmv.setMsgKey (rs.getString("Msg" )); - cmv.setMsgTxt (rs.getString("MsgCtnt" )); - cmv.setMsgEtc (rs.getString("TreatMatrCtnt" )); - cmv.setSmsSendType (rs.getString("SMSSendYn" )); - cmv.setItsmObstclGrdDstcd(rs.getString("ITSMObstclGrdDstcd" )); + cmv.setMsgKey (StringUtil.nvlTrim(rs.getString("Msg" ))); + cmv.setMsgTxt (StringUtil.nvlTrim(rs.getString("MsgCtnt" ))); + cmv.setMsgEtc (StringUtil.nvlTrim(rs.getString("TreatMatrCtnt" ))); + cmv.setSmsSendType (StringUtil.nvlTrim(rs.getString("SMSSendYn" ))); + cmv.setItsmObstclGrdDstcd(StringUtil.nvlTrim(rs.getString("ITSMObstclGrdDstcd" ))); allMsg.put(cmv.getMsgKey(), cmv); } return allMsg; @@ -68,11 +69,11 @@ public class CodeMessageDAO extends BaseDAO implements CodeMessageQuery CodeMessageVO cmv = null; while(rs.next()) { cmv = new CodeMessageVO(); - cmv.setMsgKey (rs.getString("Msg" )); - cmv.setMsgTxt (rs.getString("MsgCtnt" )); - cmv.setMsgEtc (rs.getString("TreatMatrCtnt" )); - cmv.setSmsSendType (rs.getString("SMSSendYn" )); - cmv.setItsmObstclGrdDstcd(rs.getString("ITSMObstclGrdDstcd" )); + cmv.setMsgKey (StringUtil.nvlTrim(rs.getString("Msg" ))); + cmv.setMsgTxt (StringUtil.nvlTrim(rs.getString("MsgCtnt" ))); + cmv.setMsgEtc (StringUtil.nvlTrim(rs.getString("TreatMatrCtnt" ))); + cmv.setSmsSendType (StringUtil.nvlTrim(rs.getString("SMSSendYn" ))); + cmv.setItsmObstclGrdDstcd(StringUtil.nvlTrim(rs.getString("ITSMObstclGrdDstcd" ))); } return (cmv); } catch(Exception e) { diff --git a/src/com/eactive/eai/batch/osd/OutsideDAO.java b/src/com/eactive/eai/batch/osd/OutsideDAO.java index 6b1a056..bd2a0f6 100644 --- a/src/com/eactive/eai/batch/osd/OutsideDAO.java +++ b/src/com/eactive/eai/batch/osd/OutsideDAO.java @@ -4,6 +4,7 @@ import java.sql.ResultSet; import java.util.ArrayList; import java.util.HashMap; +import com.eactive.eai.batch.common.StringUtil; import com.eactive.eai.common.dao.BaseDAO; import com.eactive.eai.common.dao.DAOException; import com.eactive.eai.common.exception.ExceptionUtil; @@ -29,20 +30,20 @@ public class OutsideDAO extends BaseDAO implements OutsideQuery { vo = new OutsideVO(); - vo.setBatchCode (rs.getString("BjobBzwkDstcd" ).trim()); - vo.setOsdCode (rs.getString("OsidInstiDstcd" ).trim()); - vo.setOsdName (rs.getString("OsidInstiName" ).trim()); - vo.setAdpGroupName(rs.getString("AdptrBzwkGroupName" ).trim()); - vo.setSendRuleCode(rs.getString("SendPrcssRuleCd" ).trim()); - vo.setRecvRuleCode(rs.getString("RecvPrcssRuleCd" ).trim()); - vo.setOsdSendPrpt (rs.getString("EAIFileSendPtrnDstcd").trim()); - vo.setOsdRecvPrpt (rs.getString("EAIFileRecvPtrnDstcd").trim()); + vo.setBatchCode (StringUtil.nvl(rs.getString("BjobBzwkDstcd" )).trim()); + vo.setOsdCode (StringUtil.nvl(rs.getString("OsidInstiDstcd" )).trim()); + vo.setOsdName (StringUtil.nvl(rs.getString("OsidInstiName" )).trim()); + vo.setAdpGroupName(StringUtil.nvl(rs.getString("AdptrBzwkGroupName" )).trim()); + vo.setSendRuleCode(StringUtil.nvl(rs.getString("SendPrcssRuleCd" )).trim()); + vo.setRecvRuleCode(StringUtil.nvl(rs.getString("RecvPrcssRuleCd" )).trim()); + vo.setOsdSendPrpt (StringUtil.nvl(rs.getString("EAIFileSendPtrnDstcd")).trim()); + vo.setOsdRecvPrpt (StringUtil.nvl(rs.getString("EAIFileRecvPtrnDstcd")).trim()); vo.setBlkSize (rs.getInt ("TelgmBlckSize" )); vo.setSequenceSize(rs.getInt ("TelgmSernoSize" )); vo.setBizStartIdx (rs.getInt ("TranStartIndx" )); vo.setBizEndIdx (rs.getInt ("TranEndIndx" )); vo.setPacketSize (rs.getInt ("TelgmPcketSize" )); - vo.setBatchName (rs.getString("BjobBzwkName" ).trim()); + vo.setBatchName (StringUtil.nvl(rs.getString("BjobBzwkName" )).trim()); // logger.debug(" - ["+ vo.getBatchCode() +"] ["+ vo.getBatchName() +"] ["+ vo.getOsdCode() +"] ["+ vo.getOsdName() +"] ["+ vo.getSendRuleCode() +"] ["+ vo.getRecvRuleCode() +"]"); al = all.remove(vo.getBatchCode()); @@ -82,18 +83,18 @@ public class OutsideDAO extends BaseDAO implements OutsideQuery { vo = new OutsideLinkVO(); - vo.setSyslinkCode (rs.getString("SysLnkgDstcd" ).trim()); - vo.setBatchCode (rs.getString("BjobBzwkDstcd" ).trim()); - vo.setOsdCode (rs.getString("OsidInstiDstcd" ).trim()); - vo.setReqResCode (rs.getString("RqstRspnsDstcd" ).trim()); - vo.setLinkIP (rs.getString("LnkgIPInfoName" ).trim()); - vo.setLinkPort (rs.getString("LnkgPortInfoName" ).trim()); - vo.setUserID (rs.getString("LnkgID" ).trim()); - vo.setPwd (rs.getString("LnkgPwd" ).trim()); + vo.setSyslinkCode (StringUtil.nvl(rs.getString("SysLnkgDstcd" )).trim()); + vo.setBatchCode (StringUtil.nvl(rs.getString("BjobBzwkDstcd" )).trim()); + vo.setOsdCode (StringUtil.nvl(rs.getString("OsidInstiDstcd" )).trim()); + vo.setReqResCode (StringUtil.nvl(rs.getString("RqstRspnsDstcd" )).trim()); + vo.setLinkIP (StringUtil.nvl(rs.getString("LnkgIPInfoName" )).trim()); + vo.setLinkPort (StringUtil.nvl(rs.getString("LnkgPortInfoName" )).trim()); + vo.setUserID (StringUtil.nvl(rs.getString("LnkgID" )).trim()); + vo.setPwd (StringUtil.nvl(rs.getString("LnkgPwd" )).trim()); vo.setToVal (rs.getInt ("ToutVal" )); - vo.setLinkStatus (rs.getString("TCirtLnkgStusCd" ).trim()); - vo.setAdpGroupName(rs.getString("AdptrBzwkGroupName").trim()); - vo.setAdpName (rs.getString("AdptrBzwkName" ).trim()); + vo.setLinkStatus (StringUtil.nvl(rs.getString("TCirtLnkgStusCd" )).trim()); + vo.setAdpGroupName(StringUtil.nvl(rs.getString("AdptrBzwkGroupName")).trim()); + vo.setAdpName (StringUtil.nvl(rs.getString("AdptrBzwkName" )).trim()); logger.debug(" - ["+ vo.getBatchCode() +"] ["+ vo.getOsdCode() +"] ["+ vo.getReqResCode() +"] ["+ vo.getLinkPort() +"] ["+ vo.getLinkIP() +"]"); al = all.remove(vo.getOsdCode()); @@ -168,20 +169,20 @@ public class OutsideDAO extends BaseDAO implements OutsideQuery if (rs.next()){ vo = new OutsideVO(); - vo.setBatchCode (rs.getString("BjobBzwkDstcd" ).trim()); - vo.setOsdCode (rs.getString("OsidInstiDstcd" ).trim()); - vo.setOsdName (rs.getString("OsidInstiName" ).trim()); - vo.setAdpGroupName(rs.getString("AdptrBzwkGroupName" ).trim()); - vo.setSendRuleCode(rs.getString("SendPrcssRuleCd" ).trim()); - vo.setRecvRuleCode(rs.getString("RecvPrcssRuleCd" ).trim()); - vo.setOsdSendPrpt (rs.getString("EAIFileSendPtrnDstcd").trim()); - vo.setOsdRecvPrpt (rs.getString("EAIFileRecvPtrnDstcd").trim()); + vo.setBatchCode (StringUtil.nvl(rs.getString("BjobBzwkDstcd" )).trim()); + vo.setOsdCode (StringUtil.nvl(rs.getString("OsidInstiDstcd" )).trim()); + vo.setOsdName (StringUtil.nvl(rs.getString("OsidInstiName" )).trim()); + vo.setAdpGroupName(StringUtil.nvl(rs.getString("AdptrBzwkGroupName" )).trim()); + vo.setSendRuleCode(StringUtil.nvl(rs.getString("SendPrcssRuleCd" )).trim()); + vo.setRecvRuleCode(StringUtil.nvl(rs.getString("RecvPrcssRuleCd" )).trim()); + vo.setOsdSendPrpt (StringUtil.nvl(rs.getString("EAIFileSendPtrnDstcd")).trim()); + vo.setOsdRecvPrpt (StringUtil.nvl(rs.getString("EAIFileRecvPtrnDstcd")).trim()); vo.setBlkSize (rs.getInt ("TelgmBlckSize" )); vo.setSequenceSize(rs.getInt ("TelgmSernoSize" )); vo.setBizStartIdx (rs.getInt ("TranStartIndx" )); vo.setBizEndIdx (rs.getInt ("TranEndIndx" )); vo.setPacketSize (rs.getInt ("TelgmPcketSize" )); - vo.setBatchName (rs.getString("BjobBzwkName" ).trim()); + vo.setBatchName (StringUtil.nvl(rs.getString("BjobBzwkName" )).trim()); // logger.debug(" - ["+ vo.getBatchCode() +"] ["+ vo.getBatchName() +"] ["+ vo.getOsdCode() +"] ["+ vo.getOsdName() +"] ["+ vo.getSendRuleCode() +"] ["+ vo.getRecvRuleCode() +"]"); } @@ -223,18 +224,18 @@ public class OutsideDAO extends BaseDAO implements OutsideQuery { vo = new OutsideLinkVO(); - vo.setSyslinkCode (rs.getString("SysLnkgDstcd" ).trim()); - vo.setBatchCode (rs.getString("BjobBzwkDstcd" ).trim()); - vo.setOsdCode (rs.getString("OsidInstiDstcd" ).trim()); - vo.setReqResCode (rs.getString("RqstRspnsDstcd" ).trim()); - vo.setLinkIP (rs.getString("LnkgIPInfoName" ).trim()); - vo.setLinkPort (rs.getString("LnkgPortInfoName" ).trim()); - vo.setUserID (rs.getString("LnkgID" ).trim()); - vo.setPwd (rs.getString("LnkgPwd" ).trim()); + vo.setSyslinkCode (StringUtil.nvl(rs.getString("SysLnkgDstcd" )).trim()); + vo.setBatchCode (StringUtil.nvl(rs.getString("BjobBzwkDstcd" )).trim()); + vo.setOsdCode (StringUtil.nvl(rs.getString("OsidInstiDstcd" )).trim()); + vo.setReqResCode (StringUtil.nvl(rs.getString("RqstRspnsDstcd" )).trim()); + vo.setLinkIP (StringUtil.nvl(rs.getString("LnkgIPInfoName" )).trim()); + vo.setLinkPort (StringUtil.nvl(rs.getString("LnkgPortInfoName" )).trim()); + vo.setUserID (StringUtil.nvl(rs.getString("LnkgID" )).trim()); + vo.setPwd (StringUtil.nvl(rs.getString("LnkgPwd" )).trim()); vo.setToVal (rs.getInt ("ToutVal" )); - vo.setLinkStatus (rs.getString("TCirtLnkgStusCd" ).trim()); - vo.setAdpGroupName(rs.getString("AdptrBzwkGroupName").trim()); - vo.setAdpName (rs.getString("AdptrBzwkName" ).trim()); + vo.setLinkStatus (StringUtil.nvl(rs.getString("TCirtLnkgStusCd" )).trim()); + vo.setAdpGroupName(StringUtil.nvl(rs.getString("AdptrBzwkGroupName")).trim()); + vo.setAdpName (StringUtil.nvl(rs.getString("AdptrBzwkName" )).trim()); // logger.debug(" - ["+ vo.getBatchCode() +"] ["+ vo.getOsdCode() +"] ["+ vo.getReqResCode() +"] ["+ vo.getLinkPort() +"] ["+ vo.getLinkIP() +"]"); al.add(vo); diff --git a/src/com/eactive/eai/batch/rule/dirInfo/DirInfoDAO.java b/src/com/eactive/eai/batch/rule/dirInfo/DirInfoDAO.java index 42920ba..40bef94 100644 --- a/src/com/eactive/eai/batch/rule/dirInfo/DirInfoDAO.java +++ b/src/com/eactive/eai/batch/rule/dirInfo/DirInfoDAO.java @@ -1,12 +1,13 @@ package com.eactive.eai.batch.rule.dirInfo; -import com.eactive.eai.common.dao.BaseDAO; -import com.eactive.eai.common.dao.DAOException; -import com.eactive.eai.common.exception.ExceptionUtil; - import java.sql.ResultSet; import java.util.ArrayList; +import com.eactive.eai.batch.common.StringUtil; +import com.eactive.eai.common.dao.BaseDAO; +import com.eactive.eai.common.dao.DAOException; +import com.eactive.eai.common.exception.ExceptionUtil; + public class DirInfoDAO extends BaseDAO implements DirInfoQuery { @@ -22,26 +23,26 @@ public class DirInfoDAO extends BaseDAO implements DirInfoQuery while(rs.next()) { vo = new BatchJobInfoVO(); - vo.setMsgDstCode (rs.getString("BjobMsgDstcd" )); - vo.setMsgDstName (rs.getString("BjobMsgDsticName" )); - vo.setBatchCode (rs.getString("BjobBzwkDstcd" )); - vo.setJobTranDstcd (rs.getString("BjobTranDstcdName" )); - vo.setSendUseYN (rs.getString("EAIFileSendUseYn" )); - vo.setRecvUseYN (rs.getString("EAIFileRecvUseYn" )); + vo.setMsgDstCode (StringUtil.nvl(rs.getString("BjobMsgDstcd" ))); + vo.setMsgDstName (StringUtil.nvl(rs.getString("BjobMsgDsticName" ))); + vo.setBatchCode (StringUtil.nvl(rs.getString("BjobBzwkDstcd" ))); + vo.setJobTranDstcd (StringUtil.nvl(rs.getString("BjobTranDstcdName" ))); + vo.setSendUseYN (StringUtil.nvl(rs.getString("EAIFileSendUseYn" ))); + vo.setRecvUseYN (StringUtil.nvl(rs.getString("EAIFileRecvUseYn" ))); vo.setFileHeaderLogSize (rs.getLong ("BjobTelgmHdrSize" )); vo.setFileRecSize (rs.getLong ("BjobTelgmRecSize" )); vo.setFileTrailerLogSize(rs.getLong ("BjobTelgmTrailSize" )); vo.setPriority (rs.getInt ("MsgPrcssPrity" )); - vo.setSysCd (rs.getString("SysCd" )); - vo.setUapplCd (rs.getString("UapplCd" )); - vo.setSndrcvFileName (rs.getString("SndrcvFileName" )); - vo.setIntfID (rs.getString("IntfID" )); + vo.setSysCd (StringUtil.nvl(rs.getString("SysCd" ))); + vo.setUapplCd (StringUtil.nvl(rs.getString("UapplCd" ))); + vo.setSndrcvFileName (StringUtil.nvl(rs.getString("SndrcvFileName" ))); + vo.setIntfID (StringUtil.nvl(rs.getString("IntfID" ))); String chrgIDs = rs.getString("ThisMsgChrgIDs"); if ( chrgIDs != null ){ String[] arr = chrgIDs.split(","); vo.setChrgIDs(arr); } - vo.setRecvNotiUseYn (rs.getString("RecvNotiUseYn" )); + vo.setRecvNotiUseYn (StringUtil.nvl(rs.getString("RecvNotiUseYn" ))); al.add(vo); } diff --git a/src/com/eactive/eai/batch/rule/kikwanInfo/KikwanInfoDAO.java b/src/com/eactive/eai/batch/rule/kikwanInfo/KikwanInfoDAO.java index 886737e..5531888 100644 --- a/src/com/eactive/eai/batch/rule/kikwanInfo/KikwanInfoDAO.java +++ b/src/com/eactive/eai/batch/rule/kikwanInfo/KikwanInfoDAO.java @@ -3,6 +3,7 @@ package com.eactive.eai.batch.rule.kikwanInfo; import java.sql.ResultSet; import java.util.HashMap; +import com.eactive.eai.batch.common.StringUtil; import com.eactive.eai.common.dao.BaseDAO; import com.eactive.eai.common.dao.DAOException; import com.eactive.eai.common.exception.ExceptionUtil; @@ -24,10 +25,10 @@ public class KikwanInfoDAO extends BaseDAO implements KikwanInfoQuery { vo = new KikwanInfoVO(); - vo.setKikwanCd ( rs.getString("KikwanCd").trim()); - vo.setKikwanName( rs.getString("KikwanName").trim()); - vo.setSysIp ( rs.getString("SysIp").trim()); - vo.setEncIp ( rs.getString("EncIp").trim()); + vo.setKikwanCd ( StringUtil.nvl(rs.getString("KikwanCd").trim())); + vo.setKikwanName( StringUtil.nvl(rs.getString("KikwanName").trim())); + vo.setSysIp ( StringUtil.nvl(rs.getString("SysIp").trim())); + vo.setEncIp ( StringUtil.nvl(rs.getString("EncIp").trim())); map.put(vo.getKikwanCd(), vo); } @@ -53,10 +54,10 @@ public class KikwanInfoDAO extends BaseDAO implements KikwanInfoQuery vo = new KikwanInfoVO(); if (rs.next()) { - vo.setKikwanCd ( rs.getString("KikwanCd").trim()); - vo.setKikwanName( rs.getString("KikwanName").trim()); - vo.setSysIp ( rs.getString("SysIp").trim()); - vo.setEncIp ( rs.getString("EncIp").trim()); + vo.setKikwanCd ( StringUtil.nvl(rs.getString("KikwanCd")).trim()); + vo.setKikwanName( StringUtil.nvl(rs.getString("KikwanName")).trim()); + vo.setSysIp ( StringUtil.nvl(rs.getString("SysIp")).trim()); + vo.setEncIp ( StringUtil.nvl(rs.getString("EncIp")).trim()); } } catch(Exception e) { throw new DAOException(ExceptionUtil.getErrorCode(e,"BECEAIMFR017", new String[] {kikwanCd, kikwanCd})); diff --git a/src/com/eactive/eai/batch/rule/nodeinfo/NodeInfoDAO.java b/src/com/eactive/eai/batch/rule/nodeinfo/NodeInfoDAO.java index d0ea8b9..f6c6923 100644 --- a/src/com/eactive/eai/batch/rule/nodeinfo/NodeInfoDAO.java +++ b/src/com/eactive/eai/batch/rule/nodeinfo/NodeInfoDAO.java @@ -1,5 +1,6 @@ package com.eactive.eai.batch.rule.nodeinfo; +import com.eactive.eai.batch.common.StringUtil; import com.eactive.eai.common.dao.BaseDAO; import com.eactive.eai.common.dao.DAOException; import com.eactive.eai.common.exception.ExceptionUtil; @@ -25,16 +26,16 @@ public class NodeInfoDAO extends BaseDAO implements NodeInfoQuery { vo = new NodeInfoVO(); - vo.setRuleCode(rs.getString(1).trim()); - vo.setPhaseCode(rs.getString(2).trim()); - vo.setPhaseType(rs.getString(3).trim()); - vo.setFlowComp(rs.getString(4).trim()); - vo.setTelegramID(rs.getString(5).trim()); + vo.setRuleCode(StringUtil.nvl(rs.getString(1)).trim()); + vo.setPhaseCode(StringUtil.nvl(rs.getString(2)).trim()); + vo.setPhaseType(StringUtil.nvl(rs.getString(3)).trim()); + vo.setFlowComp(StringUtil.nvl(rs.getString(4)).trim()); + vo.setTelegramID(StringUtil.nvl(rs.getString(5)).trim()); vo.setLengthField(rs.getInt(6)); - vo.setDesc(rs.getString(7).trim()); + vo.setDesc(StringUtil.nvl(rs.getString(7)).trim()); - ArrayList al = all.get(rs.getString(1).trim()); + ArrayList al = all.get(StringUtil.nvl(rs.getString(1)).trim()); if (al == null) { al = new ArrayList(); al.add(vo); @@ -68,13 +69,13 @@ public class NodeInfoDAO extends BaseDAO implements NodeInfoQuery vo = new NodeInfoVO(); while (rs.next()) { - vo.setRuleCode(rs.getString(1).trim()); - vo.setPhaseCode(rs.getString(2).trim()); - vo.setPhaseType(rs.getString(3).trim()); - vo.setFlowComp(rs.getString(4).trim()); - vo.setTelegramID(rs.getString(5).trim()); + vo.setRuleCode(StringUtil.nvl(rs.getString(1)).trim()); + vo.setPhaseCode(StringUtil.nvl(rs.getString(2)).trim()); + vo.setPhaseType(StringUtil.nvl(rs.getString(3)).trim()); + vo.setFlowComp(StringUtil.nvl(rs.getString(4)).trim()); + vo.setTelegramID(StringUtil.nvl(rs.getString(5)).trim()); vo.setLengthField(rs.getInt(6)); - vo.setDesc(rs.getString(7).trim()); + vo.setDesc(StringUtil.nvl(rs.getString(7)).trim()); } } catch(Exception e) { throw new DAOException(ExceptionUtil.getErrorCode(e,"BECEAIMFR017", new String[] {strRuleCode, strPhaseCode})); @@ -101,13 +102,13 @@ public class NodeInfoDAO extends BaseDAO implements NodeInfoQuery { vo = new NodeInfoVO(); - vo.setRuleCode(rs.getString(1).trim()); - vo.setPhaseCode(rs.getString(2).trim()); - vo.setPhaseType(rs.getString(3).trim()); - vo.setFlowComp(rs.getString(4).trim()); - vo.setTelegramID(rs.getString(5).trim()); + vo.setRuleCode(StringUtil.nvl(rs.getString(1)).trim()); + vo.setPhaseCode(StringUtil.nvl(rs.getString(2)).trim()); + vo.setPhaseType(StringUtil.nvl(rs.getString(3)).trim()); + vo.setFlowComp(StringUtil.nvl(rs.getString(4)).trim()); + vo.setTelegramID(StringUtil.nvl(rs.getString(5)).trim()); vo.setLengthField(rs.getInt(6)); - vo.setDesc(rs.getString(7).trim()); + vo.setDesc(StringUtil.nvl(rs.getString(7)).trim()); al.add(vo); } diff --git a/src/com/eactive/eai/batch/rule/phaseinfo/PhaseInfoDAO.java b/src/com/eactive/eai/batch/rule/phaseinfo/PhaseInfoDAO.java index 4716111..3f9bd70 100644 --- a/src/com/eactive/eai/batch/rule/phaseinfo/PhaseInfoDAO.java +++ b/src/com/eactive/eai/batch/rule/phaseinfo/PhaseInfoDAO.java @@ -1,13 +1,14 @@ package com.eactive.eai.batch.rule.phaseinfo; -import com.eactive.eai.common.dao.BaseDAO; -import com.eactive.eai.common.dao.DAOException; -import com.eactive.eai.common.exception.ExceptionUtil; - import java.sql.ResultSet; import java.util.ArrayList; import java.util.HashMap; +import com.eactive.eai.batch.common.StringUtil; +import com.eactive.eai.common.dao.BaseDAO; +import com.eactive.eai.common.dao.DAOException; +import com.eactive.eai.common.exception.ExceptionUtil; + public class PhaseInfoDAO extends BaseDAO implements PhaseInfoQuery { /** @@ -27,24 +28,24 @@ public class PhaseInfoDAO extends BaseDAO implements PhaseInfoQuery while(rs.next()) { vo = new PhaseInfoVO(); - vo.setRuleCode(rs.getString(1).trim()); - vo.setPhaseSeq(rs.getString(2).trim()); - vo.setPhaseCode(rs.getString(3).trim()); - vo.setPhaseType(rs.getString(4).trim()); - vo.setDesc(rs.getString(5).trim()); - vo.setTelegramType(rs.getString(6).trim()); - vo.setOpCode(rs.getString(7).trim()); - vo.setTrClass(rs.getString(8).trim()); + vo.setRuleCode(StringUtil.nvl(rs.getString(1)).trim()); + vo.setPhaseSeq(StringUtil.nvl(rs.getString(2)).trim()); + vo.setPhaseCode(StringUtil.nvl(rs.getString(3)).trim()); + vo.setPhaseType(StringUtil.nvl(rs.getString(4)).trim()); + vo.setDesc(StringUtil.nvl(rs.getString(5)).trim()); + vo.setTelegramType(StringUtil.nvl(rs.getString(6)).trim()); + vo.setOpCode(StringUtil.nvl(rs.getString(7)).trim()); + vo.setTrClass(StringUtil.nvl(rs.getString(8)).trim()); vo.setTOVal(rs.getInt(9)); vo.setRepeat(rs.getInt(10)); - vo.setConditionTxt(rs.getString(11).trim()); + vo.setConditionTxt(StringUtil.nvl(rs.getString(11)).trim()); vo.setPriority(rs.getInt(12)); - vo.setCTelegramType(rs.getString(13).trim()); - vo.setCOpCode(rs.getString(14).trim()); - vo.setCTrClass(rs.getString(15).trim()); - vo.setCResCode(rs.getString(16).trim()); - vo.setTelegramID(rs.getString(17).trim()); - vo.setNextPhaseCode(rs.getString(18).trim()); + vo.setCTelegramType(StringUtil.nvl(rs.getString(13)).trim()); + vo.setCOpCode(StringUtil.nvl(rs.getString(14)).trim()); + vo.setCTrClass(StringUtil.nvl(rs.getString(15)).trim()); + vo.setCResCode(StringUtil.nvl(rs.getString(16)).trim()); + vo.setTelegramID(StringUtil.nvl(rs.getString(17)).trim()); + vo.setNextPhaseCode(StringUtil.nvl(rs.getString(18)).trim()); ArrayList al = all.get(vo.getRuleCode()); diff --git a/src/com/eactive/eai/batch/rule/ruleinfo/RuleInfoDAO.java b/src/com/eactive/eai/batch/rule/ruleinfo/RuleInfoDAO.java index 2394459..f53ae35 100644 --- a/src/com/eactive/eai/batch/rule/ruleinfo/RuleInfoDAO.java +++ b/src/com/eactive/eai/batch/rule/ruleinfo/RuleInfoDAO.java @@ -3,6 +3,7 @@ package com.eactive.eai.batch.rule.ruleinfo; import java.sql.ResultSet; import java.util.HashMap; +import com.eactive.eai.batch.common.StringUtil; import com.eactive.eai.common.dao.BaseDAO; import com.eactive.eai.common.dao.DAOException; import com.eactive.eai.common.exception.ExceptionUtil; @@ -22,8 +23,8 @@ public class RuleInfoDAO extends BaseDAO implements RuleInfoQuery while(rs.next()) { vo = new RuleInfoVO(); - vo.setRuleCode(rs.getString(1).trim()); - vo.setDesc(rs.getString(2).trim()); + vo.setRuleCode(StringUtil.nvl(rs.getString(1)).trim()); + vo.setDesc(StringUtil.nvl(rs.getString(2)).trim()); all.put(vo.getRuleCode(), vo); } @@ -48,8 +49,8 @@ public class RuleInfoDAO extends BaseDAO implements RuleInfoQuery vo = new RuleInfoVO(); while (rs.next()) { - vo.setRuleCode(rs.getString(1)); - vo.setDesc(rs.getString(2)); + vo.setRuleCode(StringUtil.nvl(rs.getString(1))); + vo.setDesc(StringUtil.nvl(rs.getString(2))); } } catch(Exception e) { throw new DAOException(ExceptionUtil.getErrorCode(e,"BECEAIMFR029", new String[] {strRuleCode})); diff --git a/src/com/eactive/eai/batch/rule/sysInfo/SysInfoDAO.java b/src/com/eactive/eai/batch/rule/sysInfo/SysInfoDAO.java index 09b21b5..2bfa443 100644 --- a/src/com/eactive/eai/batch/rule/sysInfo/SysInfoDAO.java +++ b/src/com/eactive/eai/batch/rule/sysInfo/SysInfoDAO.java @@ -3,6 +3,7 @@ package com.eactive.eai.batch.rule.sysInfo; import java.sql.ResultSet; import java.util.HashMap; +import com.eactive.eai.batch.common.StringUtil; import com.eactive.eai.common.dao.BaseDAO; import com.eactive.eai.common.dao.DAOException; import com.eactive.eai.common.exception.ExceptionUtil; @@ -25,15 +26,15 @@ public class SysInfoDAO extends BaseDAO implements SysInfoQuery { vo = new SysInfoVO(); - vo.setSysCd ( rs.getString("sysCd").trim()); - vo.setSysName ( rs.getString("sysName").trim()); - vo.setSysIp ( rs.getString("sysIp").trim()); + vo.setSysCd ( StringUtil.nvl(rs.getString("sysCd")).trim()); + vo.setSysName ( StringUtil.nvl(rs.getString("sysName")).trim()); + vo.setSysIp ( StringUtil.nvl(rs.getString("sysIp")).trim()); vo.setSysPort ( rs.getShort("sysPort")); - vo.setUserId ( rs.getString("userId").trim()); - vo.setUserPassword( Seed.decrypt(rs.getString("userPassword"))); - vo.setSendDir ( rs.getString("sendDir").trim()); - vo.setRecvDir ( rs.getString("recvDir").trim()); - vo.setSftpYn ( rs.getString("sftpYn").trim()); + vo.setUserId ( StringUtil.nvl(rs.getString("userId")).trim()); + vo.setUserPassword( Seed.decrypt(StringUtil.nvl(rs.getString("userPassword")))); + vo.setSendDir ( StringUtil.nvl(rs.getString("sendDir")).trim()); + vo.setRecvDir ( StringUtil.nvl(rs.getString("recvDir")).trim()); + vo.setSftpYn ( StringUtil.nvl(rs.getString("sftpYn")).trim()); map.put(vo.getSysCd(), vo); @@ -60,15 +61,15 @@ public class SysInfoDAO extends BaseDAO implements SysInfoQuery vo = new SysInfoVO(); if (rs.next()) { - vo.setSysCd ( rs.getString("sysCd").trim()); - vo.setSysName ( rs.getString("sysName").trim()); - vo.setSysIp ( rs.getString("sysIp").trim()); + vo.setSysCd ( StringUtil.nvl(rs.getString("sysCd")).trim()); + vo.setSysName ( StringUtil.nvl(rs.getString("sysName")).trim()); + vo.setSysIp ( StringUtil.nvl(rs.getString("sysIp")).trim()); vo.setSysPort ( rs.getShort("sysPort")); - vo.setUserId ( rs.getString("userId").trim()); - vo.setUserPassword( Seed.decrypt(rs.getString("userPassword"))); - vo.setSendDir ( rs.getString("sendDir").trim()); - vo.setRecvDir ( rs.getString("recvDir").trim()); - vo.setSftpYn ( rs.getString("sftpYn").trim()); + vo.setUserId ( StringUtil.nvl(rs.getString("userId")).trim()); + vo.setUserPassword( Seed.decrypt(StringUtil.nvl(rs.getString("userPassword")))); + vo.setSendDir ( StringUtil.nvl(rs.getString("sendDir")).trim()); + vo.setRecvDir ( StringUtil.nvl(rs.getString("recvDir")).trim()); + vo.setSftpYn ( StringUtil.nvl(rs.getString("sftpYn")).trim()); } } catch(Exception e) { throw new DAOException(ExceptionUtil.getErrorCode(e,"BECEAIMFR017", new String[] {sysCd, sysCd})); diff --git a/src/com/eactive/eai/batch/rule/telegraminfo/TelegramInfoDAO.java b/src/com/eactive/eai/batch/rule/telegraminfo/TelegramInfoDAO.java index b636c8e..bfc4c00 100644 --- a/src/com/eactive/eai/batch/rule/telegraminfo/TelegramInfoDAO.java +++ b/src/com/eactive/eai/batch/rule/telegraminfo/TelegramInfoDAO.java @@ -3,6 +3,7 @@ package com.eactive.eai.batch.rule.telegraminfo; import java.sql.ResultSet; import java.util.HashMap; +import com.eactive.eai.batch.common.StringUtil; import com.eactive.eai.common.dao.BaseDAO; import com.eactive.eai.common.dao.DAOException; import com.eactive.eai.common.exception.ExceptionUtil; @@ -26,9 +27,9 @@ public class TelegramInfoDAO extends BaseDAO implements TelegramInfoQuery while(rs.next()) { pvo = new TelegramInfoVO(); - pvo.setTelegramID(rs.getString(1).trim()); - pvo.setMsgMetaDstcd(rs.getString(2).trim()); - pvo.setTelegramClsName(rs.getString(3).trim()); + pvo.setTelegramID(StringUtil.nvl(rs.getString(1)).trim()); + pvo.setMsgMetaDstcd(StringUtil.nvl(rs.getString(2)).trim()); + pvo.setTelegramClsName(StringUtil.nvl(rs.getString(3)).trim()); all.put(pvo.getTelegramID(), pvo); } } catch(Exception e) { diff --git a/src/com/eactive/eai/batch/telegram/TelegramDAO.java b/src/com/eactive/eai/batch/telegram/TelegramDAO.java index 302f080..ee0abac 100644 --- a/src/com/eactive/eai/batch/telegram/TelegramDAO.java +++ b/src/com/eactive/eai/batch/telegram/TelegramDAO.java @@ -1,5 +1,6 @@ package com.eactive.eai.batch.telegram; +import com.eactive.eai.batch.common.StringUtil; import com.eactive.eai.common.dao.BaseDAO; import com.eactive.eai.common.dao.DAOException; import com.eactive.eai.common.exception.ExceptionUtil; @@ -54,7 +55,7 @@ public class TelegramDAO extends BaseDAO implements TelegramQuery TelegramItemVO itemVO = new TelegramItemVO(rs.getString(3).trim(), rs.getString(4).trim(), rs.getString(5).trim(), rs.getString(6).trim()); // 전문 필드중에 가변부가 있으면 전문의 variableFieldCheckTag를 true로 세팅한다. - if (rs.getString(5).trim().toUpperCase().equals("XX")) + if (StringUtil.nvlTrim(rs.getString(5)).trim().toUpperCase().equals("XX")) { telegramVO.setVariableFieldCheckTag(true); } @@ -100,8 +101,8 @@ public class TelegramDAO extends BaseDAO implements TelegramQuery int k=0; while(rs.next()) { - keys[k] = rs.getString(1); - fieldsCount[k] = rs.getString(2); + keys[k] = StringUtil.nvlTrim(rs.getString(1)); + fieldsCount[k] = StringUtil.nvlTrim(rs.getString(2)); k++; } rs.close(); @@ -119,10 +120,10 @@ public class TelegramDAO extends BaseDAO implements TelegramQuery { // telegramitem 순서값은 런타임시에는 사용하지 않는다. 대신 TelegramVO에서 item이 추가될때 순서를 부여한다. // 이러한 이유는 TSEAIBM02에서 수정작업을 편하게 하도록 하기 위함이다. - TelegramItemVO itemVO = new TelegramItemVO(rs.getString(3).trim(), rs.getString(4).trim(), rs.getString(5).trim(), rs.getString(6).trim()); + TelegramItemVO itemVO = new TelegramItemVO(StringUtil.nvl(rs.getString(3)).trim(), StringUtil.nvl(rs.getString(4)).trim(), StringUtil.nvl(rs.getString(5)).trim(), StringUtil.nvl(rs.getString(6)).trim()); // 전문 필드중에 가변부가 있으면 전문의 variableFieldCheckTag를 true로 세팅한다. - if (rs.getString(5).trim().toUpperCase().equals("XX")) + if (StringUtil.nvlTrim(rs.getString(5)).trim().toUpperCase().equals("XX")) { telegramVO.setVariableFieldCheckTag(true); } diff --git a/src/com/eactive/eai/common/scheduler/SchedulerDAO.java b/src/com/eactive/eai/common/scheduler/SchedulerDAO.java index 57dd086..ea1b7fe 100644 --- a/src/com/eactive/eai/common/scheduler/SchedulerDAO.java +++ b/src/com/eactive/eai/common/scheduler/SchedulerDAO.java @@ -3,6 +3,7 @@ package com.eactive.eai.common.scheduler; import java.sql.ResultSet; import java.util.HashMap; +import com.eactive.eai.batch.common.StringUtil; import com.eactive.eai.common.dao.BaseDAO; import com.eactive.eai.common.dao.DAOException; import com.eactive.eai.common.util.Logger; @@ -25,12 +26,12 @@ public class SchedulerDAO extends BaseDAO implements SchedulerQuery { ScheduleJobInfo info = null; while(rs.next()) { info = new ScheduleJobInfo( - rs.getString(1), - rs.getString(2), - rs.getString(3), - rs.getString(4), - rs.getString(5), - rs.getString(6) + StringUtil.nvl(rs.getString(1)), + StringUtil.nvl(rs.getString(2)), + StringUtil.nvl(rs.getString(3)), + StringUtil.nvl(rs.getString(4)), + StringUtil.nvl(rs.getString(5)), + StringUtil.nvl(rs.getString(6)) ); infos.put(rs.getString(1), info); if(info!=null) logger.debug("@ "+info.toString());