From 8ecfc36ca36991e76641265223721f50da81bc5b Mon Sep 17 00:00:00 2001 From: Suraputt Suntimitr Date: Wed, 25 May 2016 19:27:25 +0700 Subject: [PATCH] issus:Soap Res --- src/th/co/ais/ssbsrfc/config/StateConfig.java | 1 - src/th/co/ais/ssbsrfc/control/TestMain.java | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------ src/th/co/ais/ssbsrfc/instance/AdjustmentInfo.java | 39 +++------------------------------------ src/th/co/ais/ssbsrfc/instance/AdjustmentInfoRes.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/th/co/ais/ssbsrfc/instance/AdjustmentRequest.java | 4 +++- src/th/co/ais/ssbsrfc/instance/AdjustmentRequestRes.java | 33 +++++++++++++++++++++++++++++++++ src/th/co/ais/ssbsrfc/instance/AdjustmentResponseIns.java | 91 ++++++++++++------------------------------------------------------------------------------- src/th/co/ais/ssbsrfc/instance/CheckRequest.java | 2 +- src/th/co/ais/ssbsrfc/instance/SubAccessCode.java | 4 ++-- src/th/co/ais/ssbsrfc/message/MessageParser.java | 7 ++----- src/th/co/ais/ssbsrfc/substate/SubMessages.java | 10 +++++----- src/th/co/ais/ssbsrfc/substate/SubWaitAdjustmentChargeReportResponse.java | 17 ++++------------- src/th/co/ais/ssbsrfc/substate/SubWaitAdjustmentChargeRequestResponse.java | 27 +++++++++++---------------- src/th/co/ais/ssbsrfc/substate/SubWaitChargeReport.java | 53 ++++++++++++++++++++++++++++++++++++++--------------- src/th/co/ais/ssbsrfc/substate/SubWaitChargeRequest.java | 47 ++++++++++++++++++++++++++++++++--------------- src/th/co/ais/ssbsrfc/substate/ssss.java | 5 +++++ 16 files changed, 270 insertions(+), 303 deletions(-) create mode 100644 src/th/co/ais/ssbsrfc/instance/AdjustmentInfoRes.java create mode 100644 src/th/co/ais/ssbsrfc/instance/AdjustmentRequestRes.java create mode 100644 src/th/co/ais/ssbsrfc/substate/ssss.java diff --git a/src/th/co/ais/ssbsrfc/config/StateConfig.java b/src/th/co/ais/ssbsrfc/config/StateConfig.java index d3fc409..88c165a 100644 --- a/src/th/co/ais/ssbsrfc/config/StateConfig.java +++ b/src/th/co/ais/ssbsrfc/config/StateConfig.java @@ -444,7 +444,6 @@ public class StateConfig { //set return event type to this matched eventType = ef.eventType; } - AppLog.d("EVENT TYPE:"+eventType+"In If"+eventType.equals(StateConfig.Incoming_A_Request)); if (eventType.equals(StateConfig.Incoming_ChargeRequest_Request)) { //String page = rawData.getRawDataMessage(); String page = rawData.getRawDataAttribute("val"); diff --git a/src/th/co/ais/ssbsrfc/control/TestMain.java b/src/th/co/ais/ssbsrfc/control/TestMain.java index 312144a..4377457 100644 --- a/src/th/co/ais/ssbsrfc/control/TestMain.java +++ b/src/th/co/ais/ssbsrfc/control/TestMain.java @@ -1,142 +1,87 @@ package th.co.ais.ssbsrfc.control; -import java.util.List; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.util.Scanner; import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamReader; -import javax.xml.transform.stream.StreamSource; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPMessage; +import th.co.ais.ssbsrfc.instance.AdjustmentResponseIns; +import th.co.ais.ssbsrfc.message.MessageParser; @XmlAccessorType(XmlAccessType.FIELD) -class Customer { - @XmlElement(name="Version",namespace="http://www.huawei.com/bme/cbsinterface/cbscommon") - String Version; - @XmlElement(name="ResultCode",namespace="http://www.huawei.com/bme/cbsinterface/cbscommon") - String ResultCode; - @XmlElement(name="MsgLanguageCode",namespace="http://www.huawei.com/bme/cbsinterface/cbscommon") - String MsgLanguageCode; - @XmlElement(name="ResultDesc",namespace="http://www.huawei.com/bme/cbsinterface/cbscommon") - String ResultDesc; - @XmlElement(name="AcctKey",namespace="http://www.huawei.com/bme/cbsinterface/arservices") - String AcctKey; - - @XmlElement(name="AdjustmentInfo",namespace="http://www.huawei.com/bme/cbsinterface/arservices") - List AdjustmentInfo; -} -class AdjustmentInfo{ - - String BalanceType; - String BalanceID; - String BalanceTypeName; - String OldBalanceAmt; - String NewBalanceAmt; - String CurrencyID; - - @XmlElement(name="BalanceID",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") - public String getBalanceID() { - return BalanceID; - } - - public void setBalanceID(String balanceID) { - BalanceID = balanceID; - } - - @XmlElement(name="BalanceTypeName",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") - public String getBalanceTypeName() { - return BalanceTypeName; - } - public void setBalanceTypeName(String balanceTypeName) { - BalanceTypeName = balanceTypeName; - } - - @XmlElement(name="OldBalanceAmt",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") - public String getOldBalanceAmt() { - return OldBalanceAmt; - } - - public void setOldBalanceAmt(String oldBalanceAmt) { - OldBalanceAmt = oldBalanceAmt; - } - - @XmlElement(name="NewBalanceAmt",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") - public String getNewBalanceAmt() { - return NewBalanceAmt; - } - public void setNewBalanceAmt(String newBalanceAmt) { - NewBalanceAmt = newBalanceAmt; - } - @XmlElement(name="CurrencyID",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") - public String getCurrencyID() { - return CurrencyID; - } - - public void setCurrencyID(String currencyID) { - CurrencyID = currencyID; - } - - @XmlElement(name="BalanceType",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") - public String getBalanceType() { - return BalanceType; - } +public class TestMain { - public void setBalanceType(String BalanceType) { - this.BalanceType = BalanceType; + public static Object fromSoap(String strSoap, Class objClass) { + Object obj = null; + + try { + SOAPMessage message = MessageFactory.newInstance().createMessage(null, new ByteArrayInputStream(strSoap.getBytes())); + Unmarshaller unmarshaller = JAXBContext.newInstance(objClass).createUnmarshaller(); + SOAPBody body = message.getSOAPBody(); + if(body != null && !body.getTextContent().trim().equals("")) { + obj = unmarshaller.unmarshal(body.extractContentAsDocument()); + } + } catch (Exception e) { + e.printStackTrace(); + } + + return obj; } - -} - - -public class TestMain { - public static void main(String[] args) throws Exception { - - XMLInputFactory xif = XMLInputFactory.newFactory(); - StreamSource xml = new StreamSource("D:\\car.xml"); - XMLStreamReader xsr = xif.createXMLStreamReader(xml); - xsr.nextTag(); - while(!xsr.getLocalName().equals("ResultHeader")) { - xsr.nextTag(); - System.out.println(xsr.getLocalName()); - System.out.println(xsr.hasNext()); - } - System.out.println(xsr.hasNext()); - xsr.next(); - /*while(!xsr.getLocalName().equals("AdjustmentResult")) { - xsr.nextTag(); - }*/ + +// String msg = ""; +// XMLInputFactory xif = XMLInputFactory.newFactory(); +// StreamSource xml = new StreamSource("D:\\car.xml"); +// XMLStreamReader xsr = xif.createXMLStreamReader(xml); +// xsr.nextTag(); +// +// while(!xsr.getLocalName().equals("ResultHeader")) { +// if(xsr.getLocalName().equals("ResultHeader")){ +// +// } +// xsr.nextTag(); +// System.out.println(xsr.getLocalName()); +// } +// +// JAXBContext jc = JAXBContext.newInstance(Customer.class); +// Unmarshaller unmarshaller = jc.createUnmarshaller(); +// JAXBElement jb = unmarshaller.unmarshal(xsr, Customer.class); +// xsr.close(); +// +// Customer customer = jb.getValue(); +// System.out.println("Version:"+customer.Version); +// System.out.println("ResultCode:"+customer.ResultCode); +// System.out.println("MsgLanguageCode:"+customer.MsgLanguageCode); +// System.out.println("ResultDesc:"+customer.ResultDesc); +// System.out.println("AcctKey:"+customer.AcctKey); + - JAXBContext jc = JAXBContext.newInstance(Customer.class); - Unmarshaller unmarshaller = jc.createUnmarshaller(); - JAXBElement jb = unmarshaller.unmarshal(xsr, Customer.class); - xsr.close(); - - Customer customer = jb.getValue(); - System.out.println("Version:"+customer.Version); - System.out.println("ResultCode:"+customer.ResultCode); - System.out.println("MsgLanguageCode:"+customer.MsgLanguageCode); - System.out.println("ResultDesc:"+customer.ResultDesc); - /*System.out.println("AcctKey:"+customer.AcctKey); - System.out.println("BalanceID:"+customer.AdjustmentInfo.get(0).getBalanceID()); + /* System.out.println("BalanceID:"+customer.AdjustmentInfo.get(0).getBalanceID()); System.out.println("BalanceType:"+customer.AdjustmentInfo.get(0).getBalanceType()); System.out.println("BalanceTypeName:"+customer.AdjustmentInfo.get(0).getBalanceTypeName()); System.out.println("CurrencyID:"+customer.AdjustmentInfo.get(0).CurrencyID); System.out.println("NewBalanceAmt:"+customer.AdjustmentInfo.get(0).NewBalanceAmt); System.out.println("OldBalanceAmt:"+customer.AdjustmentInfo.get(0).OldBalanceAmt);*/ - + String value = new Scanner(new File("D:\\car.xml")).useDelimiter("\\Z").next(); + + + AdjustmentResponseIns ins = (AdjustmentResponseIns)MessageParser.fromSoap(value, AdjustmentResponseIns.class); + + System.out.println(MessageParser.toJson(ins)); + } } diff --git a/src/th/co/ais/ssbsrfc/instance/AdjustmentInfo.java b/src/th/co/ais/ssbsrfc/instance/AdjustmentInfo.java index d72875a..488d70a 100644 --- a/src/th/co/ais/ssbsrfc/instance/AdjustmentInfo.java +++ b/src/th/co/ais/ssbsrfc/instance/AdjustmentInfo.java @@ -1,17 +1,16 @@ package th.co.ais.ssbsrfc.instance; import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +@XmlType (propOrder={"balanceType", "adjustmentType","adjustmentAmt","currencyID"}) public class AdjustmentInfo { String BalanceType; String AdjustmentType; String AdjustmentAmt; String CurrencyID; - String BalanceID; - String BalanceTypeName; - String OldBalanceAmt; - String NewBalanceAmt; @XmlElement(name="BalanceType",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") public String getBalanceType() { @@ -28,38 +27,6 @@ public class AdjustmentInfo { public void setAdjustmentType(String adjustmentType) { AdjustmentType = adjustmentType; } - - @XmlElement(name="BalanceID",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") - public String getBalanceID() { - return BalanceID; - } - public void setBalanceID(String balanceID) { - BalanceID = balanceID; - } - - @XmlElement(name="BalanceTypeName",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") - public String getBalanceTypeName() { - return BalanceTypeName; - } - public void setBalanceTypeName(String balanceTypeName) { - BalanceTypeName = balanceTypeName; - } - - @XmlElement(name="OldBalanceAmt",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") - public String getOldBalanceAmt() { - return OldBalanceAmt; - } - public void setOldBalanceAmt(String oldBalanceAmt) { - OldBalanceAmt = oldBalanceAmt; - } - - @XmlElement(name="NewBalanceAmt",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") - public String getNewBalanceAmt() { - return NewBalanceAmt; - } - public void setNewBalanceAmt(String newBalanceAmt) { - NewBalanceAmt = newBalanceAmt; - } @XmlElement(name="AdjustmentAmt",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") public String getAdjustmentAmt() { diff --git a/src/th/co/ais/ssbsrfc/instance/AdjustmentInfoRes.java b/src/th/co/ais/ssbsrfc/instance/AdjustmentInfoRes.java new file mode 100644 index 0000000..7aeea66 --- /dev/null +++ b/src/th/co/ais/ssbsrfc/instance/AdjustmentInfoRes.java @@ -0,0 +1,60 @@ +package th.co.ais.ssbsrfc.instance; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +@XmlType (propOrder={"balanceType", "balanceID","balanceTypeName","oldBalanceAmt","newBalanceAmt","currencyID"}) +public class AdjustmentInfoRes { + + String BalanceType; + String BalanceID; + String BalanceTypeName; + String OldBalanceAmt; + String NewBalanceAmt; + String CurrencyID; + + @XmlElement(name="BalanceType",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") + public String getBalanceType() { + return BalanceType; + } + public void setBalanceType(String balanceType) { + BalanceType = balanceType; + } + @XmlElement(name="BalanceID",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") + public String getBalanceID() { + return BalanceID; + } + public void setBalanceID(String balanceID) { + BalanceID = balanceID; + } + @XmlElement(name="BalanceTypeName",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") + public String getBalanceTypeName() { + return BalanceTypeName; + } + public void setBalanceTypeName(String balanceTypeName) { + BalanceTypeName = balanceTypeName; + } + @XmlElement(name="OldBalanceAmt",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") + public String getOldBalanceAmt() { + return OldBalanceAmt; + } + public void setOldBalanceAmt(String oldBalanceAmt) { + OldBalanceAmt = oldBalanceAmt; + } + @XmlElement(name="NewBalanceAmt",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") + public String getNewBalanceAmt() { + return NewBalanceAmt; + } + public void setNewBalanceAmt(String newBalanceAmt) { + NewBalanceAmt = newBalanceAmt; + } + @XmlElement(name="CurrencyID",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") + public String getCurrencyID() { + return CurrencyID; + } + public void setCurrencyID(String currencyID) { + CurrencyID = currencyID; + } + +} diff --git a/src/th/co/ais/ssbsrfc/instance/AdjustmentRequest.java b/src/th/co/ais/ssbsrfc/instance/AdjustmentRequest.java index 0c3d965..bdae239 100644 --- a/src/th/co/ais/ssbsrfc/instance/AdjustmentRequest.java +++ b/src/th/co/ais/ssbsrfc/instance/AdjustmentRequest.java @@ -1,9 +1,11 @@ package th.co.ais.ssbsrfc.instance; import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +@XmlType (propOrder={"adjustmentSerialNo","adjustmentObj","opType","adjustmentInfo"}) public class AdjustmentRequest { - + private String AdjustmentSerialNo; private AdjustmentObj adjustmentObj; private String OpType; diff --git a/src/th/co/ais/ssbsrfc/instance/AdjustmentRequestRes.java b/src/th/co/ais/ssbsrfc/instance/AdjustmentRequestRes.java new file mode 100644 index 0000000..427ff43 --- /dev/null +++ b/src/th/co/ais/ssbsrfc/instance/AdjustmentRequestRes.java @@ -0,0 +1,33 @@ +package th.co.ais.ssbsrfc.instance; + +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +@XmlType (name="AdjustmentRequestRes",propOrder={"acctKey","adjustmentInfo"}) +public class AdjustmentRequestRes { + + private String AcctKey; + private List AdjustmentInfo; + + + @XmlElement(name="AcctKey",namespace="http://www.huawei.com/bme/cbsinterface/arservices") + public String getAcctKey() { + return AcctKey; + } + public void setAcctKey(String AcctKey) { + this.AcctKey = AcctKey; + } + + @XmlElement(name="AdjustmentInfo",namespace="http://www.huawei.com/bme/cbsinterface/arservices") + public List getAdjustmentInfo() { + return AdjustmentInfo; + } + public void setAdjustmentInfo(List adjustmentInfo) { + AdjustmentInfo = adjustmentInfo; + } + + + +} diff --git a/src/th/co/ais/ssbsrfc/instance/AdjustmentResponseIns.java b/src/th/co/ais/ssbsrfc/instance/AdjustmentResponseIns.java index 8c9d2a2..7330002 100644 --- a/src/th/co/ais/ssbsrfc/instance/AdjustmentResponseIns.java +++ b/src/th/co/ais/ssbsrfc/instance/AdjustmentResponseIns.java @@ -1,95 +1,28 @@ package th.co.ais.ssbsrfc.instance; -import java.util.List; - import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement(name="AdjustmentRequestMsg",namespace ="http://www.huawei.com/bme/cbsinterface/arservices") public class AdjustmentResponseIns { - - @XmlElement(name="Version",namespace="http://www.huawei.com/bme/cbsinterface/cbscommon") - String Version; - @XmlElement(name="ResultCode",namespace="http://www.huawei.com/bme/cbsinterface/cbscommon") - String ResultCode; - @XmlElement(name="MsgLanguageCode",namespace="http://www.huawei.com/bme/cbsinterface/cbscommon") - String MsgLanguageCode; - public String getVersion() { - return Version; - } - - public void setVersion(String version) { - Version = version; - } - - public String getResultCode() { - return ResultCode; - } - - public void setResultCode(String resultCode) { - ResultCode = resultCode; - } - public String getMsgLanguageCode() { - return MsgLanguageCode; - } - - public void setMsgLanguageCode(String msgLanguageCode) { - MsgLanguageCode = msgLanguageCode; - } - - public String getResultDesc() { - return ResultDesc; - } - - public void setResultDesc(String resultDesc) { - ResultDesc = resultDesc; - } + @XmlElement(name="ResultHeader") + ResultHeader resultHeader; + @XmlElement(name="AdjustmentResult") + AdjustmentRequestRes adjustmentResult; - public String getAcctKey() { - return AcctKey; - } - - public void setAcctKey(String acctKey) { - AcctKey = acctKey; - } - - public List getAdjustmentInfo() { - return AdjustmentInfo; - } - - public void setAdjustmentInfo(List adjustmentInfo) { - AdjustmentInfo = adjustmentInfo; - } - - @XmlElement(name="ResultDesc",namespace="http://www.huawei.com/bme/cbsinterface/cbscommon") - String ResultDesc; - @XmlElement(name="AcctKey",namespace="http://www.huawei.com/bme/cbsinterface/arservices") - String AcctKey; - - @XmlElement(name="AdjustmentInfo",namespace="http://www.huawei.com/bme/cbsinterface/arservices") - List AdjustmentInfo; - - /*@XmlElement(name = "ResultHeader") - List resultHeader; - @XmlElement(name = "AdjustmentResult") - List adjustmentResult; - - @XmlElement(name = "ResultHeader") - public List getResultHeader() { + public ResultHeader getresultHeader() { return resultHeader; } - @XmlElement(name = "AdjustmentResult") - public List getAdjustmentResult() { - return adjustmentResult; - } - public void setResultHeader(List resultHeader) { + public void setResultHeader(ResultHeader resultHeader) { this.resultHeader = resultHeader; } - public void setAdjustmentResult(List adjustmentResult) { + public AdjustmentRequestRes getadjustmentResult() { + return adjustmentResult; + } + public void setAdjustmentResult(AdjustmentRequestRes adjustmentResult) { this.adjustmentResult = adjustmentResult; - }*/ - - + } + } \ No newline at end of file diff --git a/src/th/co/ais/ssbsrfc/instance/CheckRequest.java b/src/th/co/ais/ssbsrfc/instance/CheckRequest.java index 7d0e5e8..28c135a 100644 --- a/src/th/co/ais/ssbsrfc/instance/CheckRequest.java +++ b/src/th/co/ais/ssbsrfc/instance/CheckRequest.java @@ -2,7 +2,7 @@ package th.co.ais.ssbsrfc.instance; public class CheckRequest { private String dn; - + public String getDn() { return dn; } diff --git a/src/th/co/ais/ssbsrfc/instance/SubAccessCode.java b/src/th/co/ais/ssbsrfc/instance/SubAccessCode.java index c9269da..6e5282f 100644 --- a/src/th/co/ais/ssbsrfc/instance/SubAccessCode.java +++ b/src/th/co/ais/ssbsrfc/instance/SubAccessCode.java @@ -6,11 +6,11 @@ public class SubAccessCode { private String PrimaryIdentity; - @XmlElement(name="SubAccessCode",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") + @XmlElement(name="PrimaryIdentity",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") public String getPrimaryIdentity() { return PrimaryIdentity; } - + public void setPrimaryIdentity(String primaryIdentity) { PrimaryIdentity = primaryIdentity; } diff --git a/src/th/co/ais/ssbsrfc/message/MessageParser.java b/src/th/co/ais/ssbsrfc/message/MessageParser.java index eecbd99..9ca0e68 100644 --- a/src/th/co/ais/ssbsrfc/message/MessageParser.java +++ b/src/th/co/ais/ssbsrfc/message/MessageParser.java @@ -160,7 +160,6 @@ public class MessageParser SOAPMessage outgoingMessage = messageFactory.createMessage(); SOAPPart soappart = outgoingMessage.getSOAPPart(); SOAPEnvelope envelope = soappart.getEnvelope(); - envelope.addNamespaceDeclaration("def", "http://definition.webservices.daa.ema.com/"); envelope.removeNamespaceDeclaration("SOAP-ENV"); envelope.removeNamespaceDeclaration("cbs"); @@ -260,7 +259,7 @@ public class MessageParser return obj; } - public static AdjustmentResponseIns formsoap(String ss) throws XMLStreamException, JAXBException{ + /*public static AdjustmentResponseIns formsoap(String ss) throws XMLStreamException, JAXBException{ Reader reader = new StringReader(ss); XMLInputFactory factory = XMLInputFactory.newInstance(); // Or newFactory() @@ -268,10 +267,8 @@ public class MessageParser AppLog.d("IN:"+xsr); xsr.nextTag(); - int i =0; while(!xsr.getLocalName().equals("ResultHeader")) { xsr.nextTag(); - AppLog.d("I HERE:"+i++); } JAXBContext jc = JAXBContext.newInstance(AdjustmentResponseIns.class); @@ -281,7 +278,7 @@ public class MessageParser AdjustmentResponseIns customer = jb.getValue(); return customer; - } + }*/ public static String toJson(Object obj) { String strJson = ""; diff --git a/src/th/co/ais/ssbsrfc/substate/SubMessages.java b/src/th/co/ais/ssbsrfc/substate/SubMessages.java index 5254c07..c13c01d 100644 --- a/src/th/co/ais/ssbsrfc/substate/SubMessages.java +++ b/src/th/co/ais/ssbsrfc/substate/SubMessages.java @@ -22,15 +22,15 @@ public class SubMessages { String message = MessageParser.toSoap(ins); EQXRawInstance eqxRaw = new EQXRawInstance(); String command = "Test B"; - String to = Global.getEC02WarmConfig("Resource-Name-SDF"); + String to = Global.getEC02WarmConfig("Resource-Name-OCSOld"); String session = "SESSION"; Invoke iv = new Invoke("B",session,command,eventType,null); String invoke = iv.toString(); eqxRaw.setMessage(message); eqxRaw.setTo(to); eqxRaw.setInvoke(invoke); - eqxRaw.setCtype(EQXMsg.TEXTPLAIN); - + eqxRaw.setCtype(EQXMsg.TEXTXML); + eqxRaw.setUrl(Global.getEC02WarmConfig("Http-OCSOld-URL")); return eqxRaw; } @@ -58,7 +58,7 @@ public class SubMessages { eqxRaw.setMessage(message); eqxRaw.setTo(to); eqxRaw.setInvoke(invoke); - eqxRaw.setCtype(EQXMsg.TEXTPLAIN); + eqxRaw.setCtype(EQXMsg.TEXTXML); eqxRaw.setCommand(command); return eqxRaw; @@ -74,7 +74,7 @@ public class SubMessages { eqxRaw.setMessage(message); eqxRaw.setTo(to); eqxRaw.setInvoke(invoke); - eqxRaw.setCtype(EQXMsg.TEXTPLAIN); + eqxRaw.setCtype(EQXMsg.TEXTXML); eqxRaw.setCommand(command); return eqxRaw; diff --git a/src/th/co/ais/ssbsrfc/substate/SubWaitAdjustmentChargeReportResponse.java b/src/th/co/ais/ssbsrfc/substate/SubWaitAdjustmentChargeReportResponse.java index beea99b..eff3b24 100644 --- a/src/th/co/ais/ssbsrfc/substate/SubWaitAdjustmentChargeReportResponse.java +++ b/src/th/co/ais/ssbsrfc/substate/SubWaitAdjustmentChargeReportResponse.java @@ -33,18 +33,9 @@ public class SubWaitAdjustmentChargeReportResponse extends WaitSubState { String value = EqxStringUtils.getMessage(equinoxRawData, ec02Instance); AppLog.d("## PARAMETERS : " + value); - - AdjustmentResponseIns ins = null; - try { - ins = (AdjustmentResponseIns) MessageParser.formsoap(value); - } catch (XMLStreamException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (JAXBException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - AppLog.d(ins.getVersion()); + AdjustmentResponseIns ins = (AdjustmentResponseIns) MessageParser.fromSoap(value, AdjustmentResponseIns.class); + AppLog.d(ins.getadjustmentResult().getAcctKey()); + chargeReportIns.setResult("000"); chargeReportIns.setPrepaidsubscriberflag("1"); @@ -52,7 +43,7 @@ public class SubWaitAdjustmentChargeReportResponse extends WaitSubState { } public void verifyMessage(AbstractAF abstractAF, EC02Instance ec02Instance, EquinoxRawData equinoxRawData) - { + { this.type = Constant.TYPE_SUCCESS; } diff --git a/src/th/co/ais/ssbsrfc/substate/SubWaitAdjustmentChargeRequestResponse.java b/src/th/co/ais/ssbsrfc/substate/SubWaitAdjustmentChargeRequestResponse.java index 9a502e0..1316d18 100644 --- a/src/th/co/ais/ssbsrfc/substate/SubWaitAdjustmentChargeRequestResponse.java +++ b/src/th/co/ais/ssbsrfc/substate/SubWaitAdjustmentChargeRequestResponse.java @@ -1,12 +1,10 @@ package th.co.ais.ssbsrfc.substate; -import java.io.Reader; -import java.io.StringReader; +import java.util.Date; +import java.util.Random; import javax.xml.bind.JAXBException; -import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; import ec02.af.abstracts.AbstractAF; import ec02.af.data.EquinoxRawData; @@ -37,21 +35,18 @@ public class SubWaitAdjustmentChargeRequestResponse extends WaitSubState { String value = EqxStringUtils.getMessage(equinoxRawData, ec02Instance); AppLog.d("## PARAMETERS : " + value); - AdjustmentResponseIns ins=null; + AdjustmentResponseIns ins= (AdjustmentResponseIns) MessageParser.fromSoap(value, AdjustmentResponseIns.class); + + AppLog.d(ins.getadjustmentResult().getAcctKey()); - try { - ins = (AdjustmentResponseIns) MessageParser.formsoap(value); - } catch (XMLStreamException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (JAXBException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - AppLog.d("MsgLanguageCode:"+ins.getMsgLanguageCode()); + Random random = new Random(); + Date time = new Date(); + String x = time.getTime()+""; + int y = 900000000+random.nextInt(1000); + String MSGID =x+""+y; chargeResponseIns.setResult("000"); chargeResponseIns.setdesc("SUCCESS"); - chargeResponseIns.setChargingID("50928192340800649741"); + chargeResponseIns.setChargingID(MSGID); chargeResponseIns.setPrepaidsubscriberflag("1"); return chargeResponseIns; diff --git a/src/th/co/ais/ssbsrfc/substate/SubWaitChargeReport.java b/src/th/co/ais/ssbsrfc/substate/SubWaitChargeReport.java index 7627b63..2ff7940 100644 --- a/src/th/co/ais/ssbsrfc/substate/SubWaitChargeReport.java +++ b/src/th/co/ais/ssbsrfc/substate/SubWaitChargeReport.java @@ -1,5 +1,7 @@ package th.co.ais.ssbsrfc.substate; +import java.util.HashMap; + import ec02.af.abstracts.AbstractAF; import ec02.af.data.EquinoxRawData; import ec02.utils.AppLog; @@ -10,11 +12,13 @@ import th.co.ais.ssbsrfc.instance.AdjustmentInfo; import th.co.ais.ssbsrfc.instance.AdjustmentObj; import th.co.ais.ssbsrfc.instance.AdjustmentRequest; import th.co.ais.ssbsrfc.instance.AdjustmentRequestIns; +import th.co.ais.ssbsrfc.instance.CheckRequest; import th.co.ais.ssbsrfc.instance.EC02Instance; import th.co.ais.ssbsrfc.instance.EQXRawInstance; import th.co.ais.ssbsrfc.instance.OwnershipInfo; import th.co.ais.ssbsrfc.instance.RequestHeader; import th.co.ais.ssbsrfc.instance.SubAccessCode; +import th.co.ais.ssbsrfc.utils.EqxStringUtils; public class SubWaitChargeReport extends WaitSubState { @@ -36,33 +40,52 @@ public class SubWaitChargeReport extends WaitSubState { public Object getMessage(EC02Instance ec02Instance, EquinoxRawData equinoxRawData) { + String value = EqxStringUtils.getMessage(equinoxRawData, ec02Instance); + AppLog.d("## PARAMETERS : " + value); + HashMap map = new HashMap(); + String page = equinoxRawData.getRawDataAttribute("val"); + CheckRequest checkRequest = new CheckRequest(); + checkRequest.setDn(page); + String [] dnList = checkRequest.getDn().split("&", -1); + page = dnList[0].substring("ssid=".length()); + int i=0; + while(i map = new HashMap(); + String page = equinoxRawData.getRawDataAttribute("val"); + CheckRequest checkRequest = new CheckRequest(); + checkRequest.setDn(page); + String [] dnList = checkRequest.getDn().split("&", -1); + page = dnList[0].substring("ssid=".length()); + int i=0; + while(i