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

DAO null 처리 수정

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