Commit 8ecfc36ca36991e76641265223721f50da81bc5b
1 parent
0130962b
Exists in
INGW_CMF
issus:Soap Res
Showing
16 changed files
with
270 additions
and
303 deletions
Show diff stats
src/th/co/ais/ssbsrfc/config/StateConfig.java
@@ -444,7 +444,6 @@ public class StateConfig { | @@ -444,7 +444,6 @@ public class StateConfig { | ||
444 | //set return event type to this matched | 444 | //set return event type to this matched |
445 | eventType = ef.eventType; | 445 | eventType = ef.eventType; |
446 | } | 446 | } |
447 | - AppLog.d("EVENT TYPE:"+eventType+"In If"+eventType.equals(StateConfig.Incoming_A_Request)); | ||
448 | if (eventType.equals(StateConfig.Incoming_ChargeRequest_Request)) { | 447 | if (eventType.equals(StateConfig.Incoming_ChargeRequest_Request)) { |
449 | //String page = rawData.getRawDataMessage(); | 448 | //String page = rawData.getRawDataMessage(); |
450 | String page = rawData.getRawDataAttribute("val"); | 449 | String page = rawData.getRawDataAttribute("val"); |
src/th/co/ais/ssbsrfc/control/TestMain.java
1 | package th.co.ais.ssbsrfc.control; | 1 | package th.co.ais.ssbsrfc.control; |
2 | 2 | ||
3 | -import java.util.List; | 3 | +import java.io.ByteArrayInputStream; |
4 | +import java.io.File; | ||
5 | +import java.util.Scanner; | ||
4 | 6 | ||
5 | import javax.xml.bind.JAXBContext; | 7 | import javax.xml.bind.JAXBContext; |
6 | -import javax.xml.bind.JAXBElement; | ||
7 | import javax.xml.bind.Unmarshaller; | 8 | import javax.xml.bind.Unmarshaller; |
8 | import javax.xml.bind.annotation.XmlAccessType; | 9 | import javax.xml.bind.annotation.XmlAccessType; |
9 | import javax.xml.bind.annotation.XmlAccessorType; | 10 | import javax.xml.bind.annotation.XmlAccessorType; |
10 | -import javax.xml.bind.annotation.XmlAttribute; | ||
11 | -import javax.xml.bind.annotation.XmlElement; | ||
12 | -import javax.xml.bind.annotation.XmlRootElement; | ||
13 | -import javax.xml.stream.XMLInputFactory; | ||
14 | -import javax.xml.stream.XMLStreamReader; | ||
15 | -import javax.xml.transform.stream.StreamSource; | 11 | +import javax.xml.soap.MessageFactory; |
12 | +import javax.xml.soap.SOAPBody; | ||
13 | +import javax.xml.soap.SOAPMessage; | ||
16 | 14 | ||
15 | +import th.co.ais.ssbsrfc.instance.AdjustmentResponseIns; | ||
16 | +import th.co.ais.ssbsrfc.message.MessageParser; | ||
17 | 17 | ||
18 | @XmlAccessorType(XmlAccessType.FIELD) | 18 | @XmlAccessorType(XmlAccessType.FIELD) |
19 | -class Customer { | ||
20 | 19 | ||
21 | - @XmlElement(name="Version",namespace="http://www.huawei.com/bme/cbsinterface/cbscommon") | ||
22 | - String Version; | ||
23 | - @XmlElement(name="ResultCode",namespace="http://www.huawei.com/bme/cbsinterface/cbscommon") | ||
24 | - String ResultCode; | ||
25 | - @XmlElement(name="MsgLanguageCode",namespace="http://www.huawei.com/bme/cbsinterface/cbscommon") | ||
26 | - String MsgLanguageCode; | ||
27 | - @XmlElement(name="ResultDesc",namespace="http://www.huawei.com/bme/cbsinterface/cbscommon") | ||
28 | - String ResultDesc; | ||
29 | - @XmlElement(name="AcctKey",namespace="http://www.huawei.com/bme/cbsinterface/arservices") | ||
30 | - String AcctKey; | ||
31 | - | ||
32 | - @XmlElement(name="AdjustmentInfo",namespace="http://www.huawei.com/bme/cbsinterface/arservices") | ||
33 | - List<AdjustmentInfo> AdjustmentInfo; | ||
34 | -} | ||
35 | -class AdjustmentInfo{ | ||
36 | - | ||
37 | - String BalanceType; | ||
38 | - String BalanceID; | ||
39 | - String BalanceTypeName; | ||
40 | - String OldBalanceAmt; | ||
41 | - String NewBalanceAmt; | ||
42 | - String CurrencyID; | ||
43 | - | ||
44 | - @XmlElement(name="BalanceID",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") | ||
45 | - public String getBalanceID() { | ||
46 | - return BalanceID; | ||
47 | - } | ||
48 | - | ||
49 | - public void setBalanceID(String balanceID) { | ||
50 | - BalanceID = balanceID; | ||
51 | - } | ||
52 | - | ||
53 | - @XmlElement(name="BalanceTypeName",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") | ||
54 | - public String getBalanceTypeName() { | ||
55 | - return BalanceTypeName; | ||
56 | - } | ||
57 | 20 | ||
58 | - public void setBalanceTypeName(String balanceTypeName) { | ||
59 | - BalanceTypeName = balanceTypeName; | ||
60 | - } | ||
61 | - | ||
62 | - @XmlElement(name="OldBalanceAmt",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") | ||
63 | - public String getOldBalanceAmt() { | ||
64 | - return OldBalanceAmt; | ||
65 | - } | ||
66 | - | ||
67 | - public void setOldBalanceAmt(String oldBalanceAmt) { | ||
68 | - OldBalanceAmt = oldBalanceAmt; | ||
69 | - } | ||
70 | - | ||
71 | - @XmlElement(name="NewBalanceAmt",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") | ||
72 | - public String getNewBalanceAmt() { | ||
73 | - return NewBalanceAmt; | ||
74 | - } | ||
75 | 21 | ||
76 | - public void setNewBalanceAmt(String newBalanceAmt) { | ||
77 | - NewBalanceAmt = newBalanceAmt; | ||
78 | - } | ||
79 | 22 | ||
80 | - @XmlElement(name="CurrencyID",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") | ||
81 | - public String getCurrencyID() { | ||
82 | - return CurrencyID; | ||
83 | - } | ||
84 | - | ||
85 | - public void setCurrencyID(String currencyID) { | ||
86 | - CurrencyID = currencyID; | ||
87 | - } | ||
88 | - | ||
89 | - @XmlElement(name="BalanceType",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") | ||
90 | - public String getBalanceType() { | ||
91 | - return BalanceType; | ||
92 | - } | 23 | +public class TestMain { |
93 | 24 | ||
94 | - public void setBalanceType(String BalanceType) { | ||
95 | - this.BalanceType = BalanceType; | 25 | + public static Object fromSoap(String strSoap, Class objClass) { |
26 | + Object obj = null; | ||
27 | + | ||
28 | + try { | ||
29 | + SOAPMessage message = MessageFactory.newInstance().createMessage(null, new ByteArrayInputStream(strSoap.getBytes())); | ||
30 | + Unmarshaller unmarshaller = JAXBContext.newInstance(objClass).createUnmarshaller(); | ||
31 | + SOAPBody body = message.getSOAPBody(); | ||
32 | + if(body != null && !body.getTextContent().trim().equals("")) { | ||
33 | + obj = unmarshaller.unmarshal(body.extractContentAsDocument()); | ||
34 | + } | ||
35 | + } catch (Exception e) { | ||
36 | + e.printStackTrace(); | ||
37 | + } | ||
38 | + | ||
39 | + return obj; | ||
96 | } | 40 | } |
97 | 41 | ||
98 | - | ||
99 | -} | ||
100 | - | ||
101 | - | ||
102 | -public class TestMain { | ||
103 | - | ||
104 | public static void main(String[] args) throws Exception { | 42 | public static void main(String[] args) throws Exception { |
105 | - | ||
106 | - XMLInputFactory xif = XMLInputFactory.newFactory(); | ||
107 | - StreamSource xml = new StreamSource("D:\\car.xml"); | ||
108 | - XMLStreamReader xsr = xif.createXMLStreamReader(xml); | ||
109 | - xsr.nextTag(); | ||
110 | - while(!xsr.getLocalName().equals("ResultHeader")) { | ||
111 | - xsr.nextTag(); | ||
112 | - System.out.println(xsr.getLocalName()); | ||
113 | - System.out.println(xsr.hasNext()); | ||
114 | - } | ||
115 | - System.out.println(xsr.hasNext()); | ||
116 | - xsr.next(); | ||
117 | - /*while(!xsr.getLocalName().equals("AdjustmentResult")) { | ||
118 | - xsr.nextTag(); | ||
119 | - }*/ | 43 | + |
44 | +// String msg = ""; | ||
45 | +// XMLInputFactory xif = XMLInputFactory.newFactory(); | ||
46 | +// StreamSource xml = new StreamSource("D:\\car.xml"); | ||
47 | +// XMLStreamReader xsr = xif.createXMLStreamReader(xml); | ||
48 | +// xsr.nextTag(); | ||
49 | +// | ||
50 | +// while(!xsr.getLocalName().equals("ResultHeader")) { | ||
51 | +// if(xsr.getLocalName().equals("ResultHeader")){ | ||
52 | +// | ||
53 | +// } | ||
54 | +// xsr.nextTag(); | ||
55 | +// System.out.println(xsr.getLocalName()); | ||
56 | +// } | ||
57 | +// | ||
58 | +// JAXBContext jc = JAXBContext.newInstance(Customer.class); | ||
59 | +// Unmarshaller unmarshaller = jc.createUnmarshaller(); | ||
60 | +// JAXBElement<Customer> jb = unmarshaller.unmarshal(xsr, Customer.class); | ||
61 | +// xsr.close(); | ||
62 | +// | ||
63 | +// Customer customer = jb.getValue(); | ||
64 | +// System.out.println("Version:"+customer.Version); | ||
65 | +// System.out.println("ResultCode:"+customer.ResultCode); | ||
66 | +// System.out.println("MsgLanguageCode:"+customer.MsgLanguageCode); | ||
67 | +// System.out.println("ResultDesc:"+customer.ResultDesc); | ||
68 | +// System.out.println("AcctKey:"+customer.AcctKey); | ||
69 | + | ||
120 | 70 | ||
121 | - JAXBContext jc = JAXBContext.newInstance(Customer.class); | ||
122 | - Unmarshaller unmarshaller = jc.createUnmarshaller(); | ||
123 | - JAXBElement<Customer> jb = unmarshaller.unmarshal(xsr, Customer.class); | ||
124 | - xsr.close(); | ||
125 | - | ||
126 | - Customer customer = jb.getValue(); | ||
127 | - System.out.println("Version:"+customer.Version); | ||
128 | - System.out.println("ResultCode:"+customer.ResultCode); | ||
129 | - System.out.println("MsgLanguageCode:"+customer.MsgLanguageCode); | ||
130 | - System.out.println("ResultDesc:"+customer.ResultDesc); | ||
131 | - /*System.out.println("AcctKey:"+customer.AcctKey); | ||
132 | - System.out.println("BalanceID:"+customer.AdjustmentInfo.get(0).getBalanceID()); | 71 | + /* System.out.println("BalanceID:"+customer.AdjustmentInfo.get(0).getBalanceID()); |
133 | System.out.println("BalanceType:"+customer.AdjustmentInfo.get(0).getBalanceType()); | 72 | System.out.println("BalanceType:"+customer.AdjustmentInfo.get(0).getBalanceType()); |
134 | System.out.println("BalanceTypeName:"+customer.AdjustmentInfo.get(0).getBalanceTypeName()); | 73 | System.out.println("BalanceTypeName:"+customer.AdjustmentInfo.get(0).getBalanceTypeName()); |
135 | System.out.println("CurrencyID:"+customer.AdjustmentInfo.get(0).CurrencyID); | 74 | System.out.println("CurrencyID:"+customer.AdjustmentInfo.get(0).CurrencyID); |
136 | System.out.println("NewBalanceAmt:"+customer.AdjustmentInfo.get(0).NewBalanceAmt); | 75 | System.out.println("NewBalanceAmt:"+customer.AdjustmentInfo.get(0).NewBalanceAmt); |
137 | System.out.println("OldBalanceAmt:"+customer.AdjustmentInfo.get(0).OldBalanceAmt);*/ | 76 | System.out.println("OldBalanceAmt:"+customer.AdjustmentInfo.get(0).OldBalanceAmt);*/ |
138 | 77 | ||
139 | - | 78 | + String value = new Scanner(new File("D:\\car.xml")).useDelimiter("\\Z").next(); |
79 | + | ||
80 | + | ||
81 | + AdjustmentResponseIns ins = (AdjustmentResponseIns)MessageParser.fromSoap(value, AdjustmentResponseIns.class); | ||
82 | + | ||
83 | + System.out.println(MessageParser.toJson(ins)); | ||
84 | + | ||
140 | } | 85 | } |
141 | } | 86 | } |
142 | 87 |
src/th/co/ais/ssbsrfc/instance/AdjustmentInfo.java
1 | package th.co.ais.ssbsrfc.instance; | 1 | package th.co.ais.ssbsrfc.instance; |
2 | 2 | ||
3 | import javax.xml.bind.annotation.XmlElement; | 3 | import javax.xml.bind.annotation.XmlElement; |
4 | +import javax.xml.bind.annotation.XmlType; | ||
4 | 5 | ||
6 | + | ||
7 | +@XmlType (propOrder={"balanceType", "adjustmentType","adjustmentAmt","currencyID"}) | ||
5 | public class AdjustmentInfo { | 8 | public class AdjustmentInfo { |
6 | 9 | ||
7 | String BalanceType; | 10 | String BalanceType; |
8 | String AdjustmentType; | 11 | String AdjustmentType; |
9 | String AdjustmentAmt; | 12 | String AdjustmentAmt; |
10 | String CurrencyID; | 13 | String CurrencyID; |
11 | - String BalanceID; | ||
12 | - String BalanceTypeName; | ||
13 | - String OldBalanceAmt; | ||
14 | - String NewBalanceAmt; | ||
15 | 14 | ||
16 | @XmlElement(name="BalanceType",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") | 15 | @XmlElement(name="BalanceType",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") |
17 | public String getBalanceType() { | 16 | public String getBalanceType() { |
@@ -28,38 +27,6 @@ public class AdjustmentInfo { | @@ -28,38 +27,6 @@ public class AdjustmentInfo { | ||
28 | public void setAdjustmentType(String adjustmentType) { | 27 | public void setAdjustmentType(String adjustmentType) { |
29 | AdjustmentType = adjustmentType; | 28 | AdjustmentType = adjustmentType; |
30 | } | 29 | } |
31 | - | ||
32 | - @XmlElement(name="BalanceID",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") | ||
33 | - public String getBalanceID() { | ||
34 | - return BalanceID; | ||
35 | - } | ||
36 | - public void setBalanceID(String balanceID) { | ||
37 | - BalanceID = balanceID; | ||
38 | - } | ||
39 | - | ||
40 | - @XmlElement(name="BalanceTypeName",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") | ||
41 | - public String getBalanceTypeName() { | ||
42 | - return BalanceTypeName; | ||
43 | - } | ||
44 | - public void setBalanceTypeName(String balanceTypeName) { | ||
45 | - BalanceTypeName = balanceTypeName; | ||
46 | - } | ||
47 | - | ||
48 | - @XmlElement(name="OldBalanceAmt",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") | ||
49 | - public String getOldBalanceAmt() { | ||
50 | - return OldBalanceAmt; | ||
51 | - } | ||
52 | - public void setOldBalanceAmt(String oldBalanceAmt) { | ||
53 | - OldBalanceAmt = oldBalanceAmt; | ||
54 | - } | ||
55 | - | ||
56 | - @XmlElement(name="NewBalanceAmt",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") | ||
57 | - public String getNewBalanceAmt() { | ||
58 | - return NewBalanceAmt; | ||
59 | - } | ||
60 | - public void setNewBalanceAmt(String newBalanceAmt) { | ||
61 | - NewBalanceAmt = newBalanceAmt; | ||
62 | - } | ||
63 | 30 | ||
64 | @XmlElement(name="AdjustmentAmt",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") | 31 | @XmlElement(name="AdjustmentAmt",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") |
65 | public String getAdjustmentAmt() { | 32 | public String getAdjustmentAmt() { |
@@ -0,0 +1,60 @@ | @@ -0,0 +1,60 @@ | ||
1 | +package th.co.ais.ssbsrfc.instance; | ||
2 | + | ||
3 | +import javax.xml.bind.annotation.XmlElement; | ||
4 | +import javax.xml.bind.annotation.XmlType; | ||
5 | + | ||
6 | + | ||
7 | +@XmlType (propOrder={"balanceType", "balanceID","balanceTypeName","oldBalanceAmt","newBalanceAmt","currencyID"}) | ||
8 | +public class AdjustmentInfoRes { | ||
9 | + | ||
10 | + String BalanceType; | ||
11 | + String BalanceID; | ||
12 | + String BalanceTypeName; | ||
13 | + String OldBalanceAmt; | ||
14 | + String NewBalanceAmt; | ||
15 | + String CurrencyID; | ||
16 | + | ||
17 | + @XmlElement(name="BalanceType",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") | ||
18 | + public String getBalanceType() { | ||
19 | + return BalanceType; | ||
20 | + } | ||
21 | + public void setBalanceType(String balanceType) { | ||
22 | + BalanceType = balanceType; | ||
23 | + } | ||
24 | + @XmlElement(name="BalanceID",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") | ||
25 | + public String getBalanceID() { | ||
26 | + return BalanceID; | ||
27 | + } | ||
28 | + public void setBalanceID(String balanceID) { | ||
29 | + BalanceID = balanceID; | ||
30 | + } | ||
31 | + @XmlElement(name="BalanceTypeName",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") | ||
32 | + public String getBalanceTypeName() { | ||
33 | + return BalanceTypeName; | ||
34 | + } | ||
35 | + public void setBalanceTypeName(String balanceTypeName) { | ||
36 | + BalanceTypeName = balanceTypeName; | ||
37 | + } | ||
38 | + @XmlElement(name="OldBalanceAmt",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") | ||
39 | + public String getOldBalanceAmt() { | ||
40 | + return OldBalanceAmt; | ||
41 | + } | ||
42 | + public void setOldBalanceAmt(String oldBalanceAmt) { | ||
43 | + OldBalanceAmt = oldBalanceAmt; | ||
44 | + } | ||
45 | + @XmlElement(name="NewBalanceAmt",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") | ||
46 | + public String getNewBalanceAmt() { | ||
47 | + return NewBalanceAmt; | ||
48 | + } | ||
49 | + public void setNewBalanceAmt(String newBalanceAmt) { | ||
50 | + NewBalanceAmt = newBalanceAmt; | ||
51 | + } | ||
52 | + @XmlElement(name="CurrencyID",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") | ||
53 | + public String getCurrencyID() { | ||
54 | + return CurrencyID; | ||
55 | + } | ||
56 | + public void setCurrencyID(String currencyID) { | ||
57 | + CurrencyID = currencyID; | ||
58 | + } | ||
59 | + | ||
60 | +} |
src/th/co/ais/ssbsrfc/instance/AdjustmentRequest.java
1 | package th.co.ais.ssbsrfc.instance; | 1 | package th.co.ais.ssbsrfc.instance; |
2 | 2 | ||
3 | import javax.xml.bind.annotation.XmlElement; | 3 | import javax.xml.bind.annotation.XmlElement; |
4 | +import javax.xml.bind.annotation.XmlType; | ||
4 | 5 | ||
6 | +@XmlType (propOrder={"adjustmentSerialNo","adjustmentObj","opType","adjustmentInfo"}) | ||
5 | public class AdjustmentRequest { | 7 | public class AdjustmentRequest { |
6 | - | 8 | + |
7 | private String AdjustmentSerialNo; | 9 | private String AdjustmentSerialNo; |
8 | private AdjustmentObj adjustmentObj; | 10 | private AdjustmentObj adjustmentObj; |
9 | private String OpType; | 11 | private String OpType; |
src/th/co/ais/ssbsrfc/instance/AdjustmentRequestRes.java
0 → 100644
@@ -0,0 +1,33 @@ | @@ -0,0 +1,33 @@ | ||
1 | +package th.co.ais.ssbsrfc.instance; | ||
2 | + | ||
3 | +import java.util.List; | ||
4 | + | ||
5 | +import javax.xml.bind.annotation.XmlElement; | ||
6 | +import javax.xml.bind.annotation.XmlType; | ||
7 | + | ||
8 | +@XmlType (name="AdjustmentRequestRes",propOrder={"acctKey","adjustmentInfo"}) | ||
9 | +public class AdjustmentRequestRes { | ||
10 | + | ||
11 | + private String AcctKey; | ||
12 | + private List<AdjustmentInfoRes> AdjustmentInfo; | ||
13 | + | ||
14 | + | ||
15 | + @XmlElement(name="AcctKey",namespace="http://www.huawei.com/bme/cbsinterface/arservices") | ||
16 | + public String getAcctKey() { | ||
17 | + return AcctKey; | ||
18 | + } | ||
19 | + public void setAcctKey(String AcctKey) { | ||
20 | + this.AcctKey = AcctKey; | ||
21 | + } | ||
22 | + | ||
23 | + @XmlElement(name="AdjustmentInfo",namespace="http://www.huawei.com/bme/cbsinterface/arservices") | ||
24 | + public List<AdjustmentInfoRes> getAdjustmentInfo() { | ||
25 | + return AdjustmentInfo; | ||
26 | + } | ||
27 | + public void setAdjustmentInfo(List<AdjustmentInfoRes> adjustmentInfo) { | ||
28 | + AdjustmentInfo = adjustmentInfo; | ||
29 | + } | ||
30 | + | ||
31 | + | ||
32 | + | ||
33 | +} |
src/th/co/ais/ssbsrfc/instance/AdjustmentResponseIns.java
1 | package th.co.ais.ssbsrfc.instance; | 1 | package th.co.ais.ssbsrfc.instance; |
2 | 2 | ||
3 | -import java.util.List; | ||
4 | - | ||
5 | import javax.xml.bind.annotation.XmlElement; | 3 | import javax.xml.bind.annotation.XmlElement; |
6 | import javax.xml.bind.annotation.XmlRootElement; | 4 | import javax.xml.bind.annotation.XmlRootElement; |
7 | 5 | ||
8 | 6 | ||
9 | @XmlRootElement(name="AdjustmentRequestMsg",namespace ="http://www.huawei.com/bme/cbsinterface/arservices") | 7 | @XmlRootElement(name="AdjustmentRequestMsg",namespace ="http://www.huawei.com/bme/cbsinterface/arservices") |
10 | public class AdjustmentResponseIns { | 8 | public class AdjustmentResponseIns { |
11 | - | ||
12 | - @XmlElement(name="Version",namespace="http://www.huawei.com/bme/cbsinterface/cbscommon") | ||
13 | - String Version; | ||
14 | - @XmlElement(name="ResultCode",namespace="http://www.huawei.com/bme/cbsinterface/cbscommon") | ||
15 | - String ResultCode; | ||
16 | - @XmlElement(name="MsgLanguageCode",namespace="http://www.huawei.com/bme/cbsinterface/cbscommon") | ||
17 | - String MsgLanguageCode; | ||
18 | - public String getVersion() { | ||
19 | - return Version; | ||
20 | - } | ||
21 | - | ||
22 | - public void setVersion(String version) { | ||
23 | - Version = version; | ||
24 | - } | ||
25 | - | ||
26 | - public String getResultCode() { | ||
27 | - return ResultCode; | ||
28 | - } | ||
29 | - | ||
30 | - public void setResultCode(String resultCode) { | ||
31 | - ResultCode = resultCode; | ||
32 | - } | ||
33 | 9 | ||
34 | - public String getMsgLanguageCode() { | ||
35 | - return MsgLanguageCode; | ||
36 | - } | ||
37 | - | ||
38 | - public void setMsgLanguageCode(String msgLanguageCode) { | ||
39 | - MsgLanguageCode = msgLanguageCode; | ||
40 | - } | ||
41 | - | ||
42 | - public String getResultDesc() { | ||
43 | - return ResultDesc; | ||
44 | - } | ||
45 | - | ||
46 | - public void setResultDesc(String resultDesc) { | ||
47 | - ResultDesc = resultDesc; | ||
48 | - } | 10 | + @XmlElement(name="ResultHeader") |
11 | + ResultHeader resultHeader; | ||
12 | + @XmlElement(name="AdjustmentResult") | ||
13 | + AdjustmentRequestRes adjustmentResult; | ||
49 | 14 | ||
50 | - public String getAcctKey() { | ||
51 | - return AcctKey; | ||
52 | - } | ||
53 | - | ||
54 | - public void setAcctKey(String acctKey) { | ||
55 | - AcctKey = acctKey; | ||
56 | - } | ||
57 | - | ||
58 | - public List<AdjustmentInfo> getAdjustmentInfo() { | ||
59 | - return AdjustmentInfo; | ||
60 | - } | ||
61 | - | ||
62 | - public void setAdjustmentInfo(List<AdjustmentInfo> adjustmentInfo) { | ||
63 | - AdjustmentInfo = adjustmentInfo; | ||
64 | - } | ||
65 | - | ||
66 | - @XmlElement(name="ResultDesc",namespace="http://www.huawei.com/bme/cbsinterface/cbscommon") | ||
67 | - String ResultDesc; | ||
68 | - @XmlElement(name="AcctKey",namespace="http://www.huawei.com/bme/cbsinterface/arservices") | ||
69 | - String AcctKey; | ||
70 | - | ||
71 | - @XmlElement(name="AdjustmentInfo",namespace="http://www.huawei.com/bme/cbsinterface/arservices") | ||
72 | - List<AdjustmentInfo> AdjustmentInfo; | ||
73 | - | ||
74 | - /*@XmlElement(name = "ResultHeader") | ||
75 | - List<ResultHeader> resultHeader; | ||
76 | - @XmlElement(name = "AdjustmentResult") | ||
77 | - List<AdjustmentResult> adjustmentResult; | ||
78 | - | ||
79 | - @XmlElement(name = "ResultHeader") | ||
80 | - public List<ResultHeader> getResultHeader() { | 15 | + public ResultHeader getresultHeader() { |
81 | return resultHeader; | 16 | return resultHeader; |
82 | } | 17 | } |
83 | - @XmlElement(name = "AdjustmentResult") | ||
84 | - public List<AdjustmentResult> getAdjustmentResult() { | ||
85 | - return adjustmentResult; | ||
86 | - } | ||
87 | - public void setResultHeader(List<ResultHeader> resultHeader) { | 18 | + public void setResultHeader(ResultHeader resultHeader) { |
88 | this.resultHeader = resultHeader; | 19 | this.resultHeader = resultHeader; |
89 | } | 20 | } |
90 | - public void setAdjustmentResult(List<AdjustmentResult> adjustmentResult) { | 21 | + public AdjustmentRequestRes getadjustmentResult() { |
22 | + return adjustmentResult; | ||
23 | + } | ||
24 | + public void setAdjustmentResult(AdjustmentRequestRes adjustmentResult) { | ||
91 | this.adjustmentResult = adjustmentResult; | 25 | this.adjustmentResult = adjustmentResult; |
92 | - }*/ | ||
93 | - | ||
94 | - | 26 | + } |
27 | + | ||
95 | } | 28 | } |
96 | \ No newline at end of file | 29 | \ No newline at end of file |
src/th/co/ais/ssbsrfc/instance/CheckRequest.java
@@ -2,7 +2,7 @@ package th.co.ais.ssbsrfc.instance; | @@ -2,7 +2,7 @@ package th.co.ais.ssbsrfc.instance; | ||
2 | 2 | ||
3 | public class CheckRequest { | 3 | public class CheckRequest { |
4 | private String dn; | 4 | private String dn; |
5 | - | 5 | + |
6 | public String getDn() { | 6 | public String getDn() { |
7 | return dn; | 7 | return dn; |
8 | } | 8 | } |
src/th/co/ais/ssbsrfc/instance/SubAccessCode.java
@@ -6,11 +6,11 @@ public class SubAccessCode { | @@ -6,11 +6,11 @@ public class SubAccessCode { | ||
6 | 6 | ||
7 | private String PrimaryIdentity; | 7 | private String PrimaryIdentity; |
8 | 8 | ||
9 | - @XmlElement(name="SubAccessCode",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") | 9 | + @XmlElement(name="PrimaryIdentity",namespace="http://cbs.huawei.com/ar/wsservice/arcommon") |
10 | public String getPrimaryIdentity() { | 10 | public String getPrimaryIdentity() { |
11 | return PrimaryIdentity; | 11 | return PrimaryIdentity; |
12 | } | 12 | } |
13 | - | 13 | + |
14 | public void setPrimaryIdentity(String primaryIdentity) { | 14 | public void setPrimaryIdentity(String primaryIdentity) { |
15 | PrimaryIdentity = primaryIdentity; | 15 | PrimaryIdentity = primaryIdentity; |
16 | } | 16 | } |
src/th/co/ais/ssbsrfc/message/MessageParser.java
@@ -160,7 +160,6 @@ public class MessageParser | @@ -160,7 +160,6 @@ public class MessageParser | ||
160 | SOAPMessage outgoingMessage = messageFactory.createMessage(); | 160 | SOAPMessage outgoingMessage = messageFactory.createMessage(); |
161 | SOAPPart soappart = outgoingMessage.getSOAPPart(); | 161 | SOAPPart soappart = outgoingMessage.getSOAPPart(); |
162 | SOAPEnvelope envelope = soappart.getEnvelope(); | 162 | SOAPEnvelope envelope = soappart.getEnvelope(); |
163 | - envelope.addNamespaceDeclaration("def", "http://definition.webservices.daa.ema.com/"); | ||
164 | 163 | ||
165 | envelope.removeNamespaceDeclaration("SOAP-ENV"); | 164 | envelope.removeNamespaceDeclaration("SOAP-ENV"); |
166 | envelope.removeNamespaceDeclaration("cbs"); | 165 | envelope.removeNamespaceDeclaration("cbs"); |
@@ -260,7 +259,7 @@ public class MessageParser | @@ -260,7 +259,7 @@ public class MessageParser | ||
260 | return obj; | 259 | return obj; |
261 | } | 260 | } |
262 | 261 | ||
263 | - public static AdjustmentResponseIns formsoap(String ss) throws XMLStreamException, JAXBException{ | 262 | + /*public static AdjustmentResponseIns formsoap(String ss) throws XMLStreamException, JAXBException{ |
264 | 263 | ||
265 | Reader reader = new StringReader(ss); | 264 | Reader reader = new StringReader(ss); |
266 | XMLInputFactory factory = XMLInputFactory.newInstance(); // Or newFactory() | 265 | XMLInputFactory factory = XMLInputFactory.newInstance(); // Or newFactory() |
@@ -268,10 +267,8 @@ public class MessageParser | @@ -268,10 +267,8 @@ public class MessageParser | ||
268 | 267 | ||
269 | AppLog.d("IN:"+xsr); | 268 | AppLog.d("IN:"+xsr); |
270 | xsr.nextTag(); | 269 | xsr.nextTag(); |
271 | - int i =0; | ||
272 | while(!xsr.getLocalName().equals("ResultHeader")) { | 270 | while(!xsr.getLocalName().equals("ResultHeader")) { |
273 | xsr.nextTag(); | 271 | xsr.nextTag(); |
274 | - AppLog.d("I HERE:"+i++); | ||
275 | } | 272 | } |
276 | 273 | ||
277 | JAXBContext jc = JAXBContext.newInstance(AdjustmentResponseIns.class); | 274 | JAXBContext jc = JAXBContext.newInstance(AdjustmentResponseIns.class); |
@@ -281,7 +278,7 @@ public class MessageParser | @@ -281,7 +278,7 @@ public class MessageParser | ||
281 | 278 | ||
282 | AdjustmentResponseIns customer = jb.getValue(); | 279 | AdjustmentResponseIns customer = jb.getValue(); |
283 | return customer; | 280 | return customer; |
284 | - } | 281 | + }*/ |
285 | 282 | ||
286 | public static String toJson(Object obj) { | 283 | public static String toJson(Object obj) { |
287 | String strJson = ""; | 284 | String strJson = ""; |
src/th/co/ais/ssbsrfc/substate/SubMessages.java
@@ -22,15 +22,15 @@ public class SubMessages { | @@ -22,15 +22,15 @@ public class SubMessages { | ||
22 | String message = MessageParser.toSoap(ins); | 22 | String message = MessageParser.toSoap(ins); |
23 | EQXRawInstance eqxRaw = new EQXRawInstance(); | 23 | EQXRawInstance eqxRaw = new EQXRawInstance(); |
24 | String command = "Test B"; | 24 | String command = "Test B"; |
25 | - String to = Global.getEC02WarmConfig("Resource-Name-SDF"); | 25 | + String to = Global.getEC02WarmConfig("Resource-Name-OCSOld"); |
26 | String session = "SESSION"; | 26 | String session = "SESSION"; |
27 | Invoke iv = new Invoke("B",session,command,eventType,null); | 27 | Invoke iv = new Invoke("B",session,command,eventType,null); |
28 | String invoke = iv.toString(); | 28 | String invoke = iv.toString(); |
29 | eqxRaw.setMessage(message); | 29 | eqxRaw.setMessage(message); |
30 | eqxRaw.setTo(to); | 30 | eqxRaw.setTo(to); |
31 | eqxRaw.setInvoke(invoke); | 31 | eqxRaw.setInvoke(invoke); |
32 | - eqxRaw.setCtype(EQXMsg.TEXTPLAIN); | ||
33 | - | 32 | + eqxRaw.setCtype(EQXMsg.TEXTXML); |
33 | + eqxRaw.setUrl(Global.getEC02WarmConfig("Http-OCSOld-URL")); | ||
34 | return eqxRaw; | 34 | return eqxRaw; |
35 | } | 35 | } |
36 | 36 | ||
@@ -58,7 +58,7 @@ public class SubMessages { | @@ -58,7 +58,7 @@ public class SubMessages { | ||
58 | eqxRaw.setMessage(message); | 58 | eqxRaw.setMessage(message); |
59 | eqxRaw.setTo(to); | 59 | eqxRaw.setTo(to); |
60 | eqxRaw.setInvoke(invoke); | 60 | eqxRaw.setInvoke(invoke); |
61 | - eqxRaw.setCtype(EQXMsg.TEXTPLAIN); | 61 | + eqxRaw.setCtype(EQXMsg.TEXTXML); |
62 | eqxRaw.setCommand(command); | 62 | eqxRaw.setCommand(command); |
63 | 63 | ||
64 | return eqxRaw; | 64 | return eqxRaw; |
@@ -74,7 +74,7 @@ public class SubMessages { | @@ -74,7 +74,7 @@ public class SubMessages { | ||
74 | eqxRaw.setMessage(message); | 74 | eqxRaw.setMessage(message); |
75 | eqxRaw.setTo(to); | 75 | eqxRaw.setTo(to); |
76 | eqxRaw.setInvoke(invoke); | 76 | eqxRaw.setInvoke(invoke); |
77 | - eqxRaw.setCtype(EQXMsg.TEXTPLAIN); | 77 | + eqxRaw.setCtype(EQXMsg.TEXTXML); |
78 | eqxRaw.setCommand(command); | 78 | eqxRaw.setCommand(command); |
79 | 79 | ||
80 | return eqxRaw; | 80 | return eqxRaw; |
src/th/co/ais/ssbsrfc/substate/SubWaitAdjustmentChargeReportResponse.java
@@ -33,18 +33,9 @@ public class SubWaitAdjustmentChargeReportResponse extends WaitSubState { | @@ -33,18 +33,9 @@ public class SubWaitAdjustmentChargeReportResponse extends WaitSubState { | ||
33 | String value = EqxStringUtils.getMessage(equinoxRawData, ec02Instance); | 33 | String value = EqxStringUtils.getMessage(equinoxRawData, ec02Instance); |
34 | AppLog.d("## PARAMETERS : " + value); | 34 | AppLog.d("## PARAMETERS : " + value); |
35 | 35 | ||
36 | - | ||
37 | - AdjustmentResponseIns ins = null; | ||
38 | - try { | ||
39 | - ins = (AdjustmentResponseIns) MessageParser.formsoap(value); | ||
40 | - } catch (XMLStreamException e) { | ||
41 | - // TODO Auto-generated catch block | ||
42 | - e.printStackTrace(); | ||
43 | - } catch (JAXBException e) { | ||
44 | - // TODO Auto-generated catch block | ||
45 | - e.printStackTrace(); | ||
46 | - } | ||
47 | - AppLog.d(ins.getVersion()); | 36 | + AdjustmentResponseIns ins = (AdjustmentResponseIns) MessageParser.fromSoap(value, AdjustmentResponseIns.class); |
37 | + AppLog.d(ins.getadjustmentResult().getAcctKey()); | ||
38 | + | ||
48 | chargeReportIns.setResult("000"); | 39 | chargeReportIns.setResult("000"); |
49 | chargeReportIns.setPrepaidsubscriberflag("1"); | 40 | chargeReportIns.setPrepaidsubscriberflag("1"); |
50 | 41 | ||
@@ -52,7 +43,7 @@ public class SubWaitAdjustmentChargeReportResponse extends WaitSubState { | @@ -52,7 +43,7 @@ public class SubWaitAdjustmentChargeReportResponse extends WaitSubState { | ||
52 | } | 43 | } |
53 | 44 | ||
54 | public void verifyMessage(AbstractAF abstractAF, EC02Instance ec02Instance, EquinoxRawData equinoxRawData) | 45 | public void verifyMessage(AbstractAF abstractAF, EC02Instance ec02Instance, EquinoxRawData equinoxRawData) |
55 | - { | 46 | + { |
56 | 47 | ||
57 | this.type = Constant.TYPE_SUCCESS; | 48 | this.type = Constant.TYPE_SUCCESS; |
58 | } | 49 | } |
src/th/co/ais/ssbsrfc/substate/SubWaitAdjustmentChargeRequestResponse.java
1 | package th.co.ais.ssbsrfc.substate; | 1 | package th.co.ais.ssbsrfc.substate; |
2 | 2 | ||
3 | -import java.io.Reader; | ||
4 | -import java.io.StringReader; | 3 | +import java.util.Date; |
4 | +import java.util.Random; | ||
5 | 5 | ||
6 | import javax.xml.bind.JAXBException; | 6 | import javax.xml.bind.JAXBException; |
7 | -import javax.xml.stream.XMLInputFactory; | ||
8 | import javax.xml.stream.XMLStreamException; | 7 | import javax.xml.stream.XMLStreamException; |
9 | -import javax.xml.stream.XMLStreamReader; | ||
10 | 8 | ||
11 | import ec02.af.abstracts.AbstractAF; | 9 | import ec02.af.abstracts.AbstractAF; |
12 | import ec02.af.data.EquinoxRawData; | 10 | import ec02.af.data.EquinoxRawData; |
@@ -37,21 +35,18 @@ public class SubWaitAdjustmentChargeRequestResponse extends WaitSubState { | @@ -37,21 +35,18 @@ public class SubWaitAdjustmentChargeRequestResponse extends WaitSubState { | ||
37 | String value = EqxStringUtils.getMessage(equinoxRawData, ec02Instance); | 35 | String value = EqxStringUtils.getMessage(equinoxRawData, ec02Instance); |
38 | AppLog.d("## PARAMETERS : " + value); | 36 | AppLog.d("## PARAMETERS : " + value); |
39 | 37 | ||
40 | - AdjustmentResponseIns ins=null; | 38 | + AdjustmentResponseIns ins= (AdjustmentResponseIns) MessageParser.fromSoap(value, AdjustmentResponseIns.class); |
39 | + | ||
40 | + AppLog.d(ins.getadjustmentResult().getAcctKey()); | ||
41 | 41 | ||
42 | - try { | ||
43 | - ins = (AdjustmentResponseIns) MessageParser.formsoap(value); | ||
44 | - } catch (XMLStreamException e) { | ||
45 | - // TODO Auto-generated catch block | ||
46 | - e.printStackTrace(); | ||
47 | - } catch (JAXBException e) { | ||
48 | - // TODO Auto-generated catch block | ||
49 | - e.printStackTrace(); | ||
50 | - } | ||
51 | - AppLog.d("MsgLanguageCode:"+ins.getMsgLanguageCode()); | 42 | + Random random = new Random(); |
43 | + Date time = new Date(); | ||
44 | + String x = time.getTime()+""; | ||
45 | + int y = 900000000+random.nextInt(1000); | ||
46 | + String MSGID =x+""+y; | ||
52 | chargeResponseIns.setResult("000"); | 47 | chargeResponseIns.setResult("000"); |
53 | chargeResponseIns.setdesc("SUCCESS"); | 48 | chargeResponseIns.setdesc("SUCCESS"); |
54 | - chargeResponseIns.setChargingID("50928192340800649741"); | 49 | + chargeResponseIns.setChargingID(MSGID); |
55 | chargeResponseIns.setPrepaidsubscriberflag("1"); | 50 | chargeResponseIns.setPrepaidsubscriberflag("1"); |
56 | 51 | ||
57 | return chargeResponseIns; | 52 | return chargeResponseIns; |
src/th/co/ais/ssbsrfc/substate/SubWaitChargeReport.java
1 | package th.co.ais.ssbsrfc.substate; | 1 | package th.co.ais.ssbsrfc.substate; |
2 | 2 | ||
3 | +import java.util.HashMap; | ||
4 | + | ||
3 | import ec02.af.abstracts.AbstractAF; | 5 | import ec02.af.abstracts.AbstractAF; |
4 | import ec02.af.data.EquinoxRawData; | 6 | import ec02.af.data.EquinoxRawData; |
5 | import ec02.utils.AppLog; | 7 | import ec02.utils.AppLog; |
@@ -10,11 +12,13 @@ import th.co.ais.ssbsrfc.instance.AdjustmentInfo; | @@ -10,11 +12,13 @@ import th.co.ais.ssbsrfc.instance.AdjustmentInfo; | ||
10 | import th.co.ais.ssbsrfc.instance.AdjustmentObj; | 12 | import th.co.ais.ssbsrfc.instance.AdjustmentObj; |
11 | import th.co.ais.ssbsrfc.instance.AdjustmentRequest; | 13 | import th.co.ais.ssbsrfc.instance.AdjustmentRequest; |
12 | import th.co.ais.ssbsrfc.instance.AdjustmentRequestIns; | 14 | import th.co.ais.ssbsrfc.instance.AdjustmentRequestIns; |
15 | +import th.co.ais.ssbsrfc.instance.CheckRequest; | ||
13 | import th.co.ais.ssbsrfc.instance.EC02Instance; | 16 | import th.co.ais.ssbsrfc.instance.EC02Instance; |
14 | import th.co.ais.ssbsrfc.instance.EQXRawInstance; | 17 | import th.co.ais.ssbsrfc.instance.EQXRawInstance; |
15 | import th.co.ais.ssbsrfc.instance.OwnershipInfo; | 18 | import th.co.ais.ssbsrfc.instance.OwnershipInfo; |
16 | import th.co.ais.ssbsrfc.instance.RequestHeader; | 19 | import th.co.ais.ssbsrfc.instance.RequestHeader; |
17 | import th.co.ais.ssbsrfc.instance.SubAccessCode; | 20 | import th.co.ais.ssbsrfc.instance.SubAccessCode; |
21 | +import th.co.ais.ssbsrfc.utils.EqxStringUtils; | ||
18 | 22 | ||
19 | 23 | ||
20 | public class SubWaitChargeReport extends WaitSubState { | 24 | public class SubWaitChargeReport extends WaitSubState { |
@@ -36,33 +40,52 @@ public class SubWaitChargeReport extends WaitSubState { | @@ -36,33 +40,52 @@ public class SubWaitChargeReport extends WaitSubState { | ||
36 | 40 | ||
37 | public Object getMessage(EC02Instance ec02Instance, EquinoxRawData equinoxRawData) | 41 | public Object getMessage(EC02Instance ec02Instance, EquinoxRawData equinoxRawData) |
38 | { | 42 | { |
43 | + String value = EqxStringUtils.getMessage(equinoxRawData, ec02Instance); | ||
44 | + AppLog.d("## PARAMETERS : " + value); | ||
45 | + HashMap<String , String> map = new HashMap<String, String>(); | ||
46 | + String page = equinoxRawData.getRawDataAttribute("val"); | ||
47 | + CheckRequest checkRequest = new CheckRequest(); | ||
48 | + checkRequest.setDn(page); | ||
49 | + String [] dnList = checkRequest.getDn().split("&", -1); | ||
50 | + page = dnList[0].substring("ssid=".length()); | ||
51 | + int i=0; | ||
52 | + while(i<dnList.length){ | ||
53 | + | ||
54 | + map.put(dnList[i].substring(0, dnList[i].indexOf("=")), dnList[i].substring(dnList[i].indexOf("=")+1)); | ||
55 | + i++; | ||
56 | + } | ||
57 | + | ||
58 | + | ||
59 | + | ||
60 | + this.type = Constant.TYPE_SUCCESS; | ||
61 | + | ||
39 | RequestHeader requestHeader = new RequestHeader(); | 62 | RequestHeader requestHeader = new RequestHeader(); |
40 | - requestHeader.setVersion("1"); | ||
41 | - requestHeader.setBusinessCode("1"); | 63 | + requestHeader.setVersion(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("Version").get(0)); |
64 | + requestHeader.setBusinessCode(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("BusinessCode_Refund").get(0)); | ||
42 | requestHeader.setMessageSeq("20160429104931209"); | 65 | requestHeader.setMessageSeq("20160429104931209"); |
43 | OwnershipInfo ownershipInfo = new OwnershipInfo(); | 66 | OwnershipInfo ownershipInfo = new OwnershipInfo(); |
44 | - ownershipInfo.setBEID("101"); | ||
45 | - ownershipInfo.setBRID("101"); | 67 | + ownershipInfo.setBEID(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("BEID").get(0)); |
68 | + ownershipInfo.setBRID(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("BEID").get(0)); | ||
46 | requestHeader.setOwnershipInfo(ownershipInfo); | 69 | requestHeader.setOwnershipInfo(ownershipInfo); |
47 | AccessSecurity accessSecurity = new AccessSecurity(); | 70 | AccessSecurity accessSecurity = new AccessSecurity(); |
48 | - accessSecurity.setLoginSystemCode("Xaysombath"); | ||
49 | - accessSecurity.setPassword("ATBoomuNQidKc8iYhPgx5A=="); | 71 | + accessSecurity.setLoginSystemCode(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("LoginSystemCode").get(0)); |
72 | + accessSecurity.setPassword(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("Password").get(0)); | ||
50 | requestHeader.setAccessSecurity(accessSecurity); | 73 | requestHeader.setAccessSecurity(accessSecurity); |
51 | - requestHeader.setAccessMode("3"); | 74 | + requestHeader.setAccessMode(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("AccessMode").get(0)); |
52 | 75 | ||
53 | AdjustmentRequest adjustmentrequest = new AdjustmentRequest(); | 76 | AdjustmentRequest adjustmentrequest = new AdjustmentRequest(); |
54 | - adjustmentrequest.setAdjustmentSerialNo("20160429104632990"); | 77 | + adjustmentrequest.setAdjustmentSerialNo(map.get("ssid")); |
55 | AdjustmentObj adjustmentObj = new AdjustmentObj(); | 78 | AdjustmentObj adjustmentObj = new AdjustmentObj(); |
56 | SubAccessCode subAccessCode = new SubAccessCode(); | 79 | SubAccessCode subAccessCode = new SubAccessCode(); |
57 | - subAccessCode.setPrimaryIdentity("2055579910"); | 80 | + subAccessCode.setPrimaryIdentity(map.get("ms")); |
58 | adjustmentObj.setSubAccessCode(subAccessCode); | 81 | adjustmentObj.setSubAccessCode(subAccessCode); |
59 | adjustmentrequest.setAdjustmentObj(adjustmentObj); | 82 | adjustmentrequest.setAdjustmentObj(adjustmentObj); |
60 | - adjustmentrequest.setOpType("1"); | 83 | + adjustmentrequest.setOpType(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("OpType").get(0)); |
61 | AdjustmentInfo adjustmentInfo = new AdjustmentInfo(); | 84 | AdjustmentInfo adjustmentInfo = new AdjustmentInfo(); |
62 | - adjustmentInfo.setBalanceType("C_MAIN_ACCOUNT"); | ||
63 | - adjustmentInfo.setAdjustmentType("1"); | ||
64 | - adjustmentInfo.setAdjustmentAmt("1000"); | ||
65 | - adjustmentInfo.setCurrencyID("1049"); | 85 | + adjustmentInfo.setBalanceType(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("BalanceType").get(0)); |
86 | + adjustmentInfo.setAdjustmentType(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("AdjustmentType_Refund").get(0)); | ||
87 | + adjustmentInfo.setAdjustmentAmt(map.get("rtv")); | ||
88 | + adjustmentInfo.setCurrencyID(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("CurrencyID").get(0)); | ||
66 | adjustmentrequest.setAdjustmentInfo(adjustmentInfo); | 89 | adjustmentrequest.setAdjustmentInfo(adjustmentInfo); |
67 | 90 | ||
68 | adjustmentRequest.setRequestHeader(requestHeader); | 91 | adjustmentRequest.setRequestHeader(requestHeader); |
@@ -70,7 +93,7 @@ public class SubWaitChargeReport extends WaitSubState { | @@ -70,7 +93,7 @@ public class SubWaitChargeReport extends WaitSubState { | ||
70 | 93 | ||
71 | ec02Instance.getAFInstance().setAdjustmentRequestIns(adjustmentRequest); | 94 | ec02Instance.getAFInstance().setAdjustmentRequestIns(adjustmentRequest); |
72 | 95 | ||
73 | - return adjustmentRequest; | 96 | + return value; |
74 | } | 97 | } |
75 | 98 | ||
76 | public void verifyMessage(AbstractAF abstractAF, EC02Instance ec02Instance, EquinoxRawData equinoxRawData) | 99 | public void verifyMessage(AbstractAF abstractAF, EC02Instance ec02Instance, EquinoxRawData equinoxRawData) |
src/th/co/ais/ssbsrfc/substate/SubWaitChargeRequest.java
1 | package th.co.ais.ssbsrfc.substate; | 1 | package th.co.ais.ssbsrfc.substate; |
2 | 2 | ||
3 | +import java.util.HashMap; | ||
4 | + | ||
3 | import ec02.af.abstracts.AbstractAF; | 5 | import ec02.af.abstracts.AbstractAF; |
4 | import ec02.af.data.EquinoxRawData; | 6 | import ec02.af.data.EquinoxRawData; |
5 | import ec02.utils.AppLog; | 7 | import ec02.utils.AppLog; |
@@ -10,6 +12,7 @@ import th.co.ais.ssbsrfc.instance.AdjustmentInfo; | @@ -10,6 +12,7 @@ import th.co.ais.ssbsrfc.instance.AdjustmentInfo; | ||
10 | import th.co.ais.ssbsrfc.instance.AdjustmentObj; | 12 | import th.co.ais.ssbsrfc.instance.AdjustmentObj; |
11 | import th.co.ais.ssbsrfc.instance.AdjustmentRequest; | 13 | import th.co.ais.ssbsrfc.instance.AdjustmentRequest; |
12 | import th.co.ais.ssbsrfc.instance.AdjustmentRequestIns; | 14 | import th.co.ais.ssbsrfc.instance.AdjustmentRequestIns; |
15 | +import th.co.ais.ssbsrfc.instance.CheckRequest; | ||
13 | import th.co.ais.ssbsrfc.instance.EC02Instance; | 16 | import th.co.ais.ssbsrfc.instance.EC02Instance; |
14 | import th.co.ais.ssbsrfc.instance.EQXRawInstance; | 17 | import th.co.ais.ssbsrfc.instance.EQXRawInstance; |
15 | import th.co.ais.ssbsrfc.instance.OwnershipInfo; | 18 | import th.co.ais.ssbsrfc.instance.OwnershipInfo; |
@@ -39,36 +42,50 @@ public class SubWaitChargeRequest extends WaitSubState { | @@ -39,36 +42,50 @@ public class SubWaitChargeRequest extends WaitSubState { | ||
39 | { | 42 | { |
40 | String value = EqxStringUtils.getMessage(equinoxRawData, ec02Instance); | 43 | String value = EqxStringUtils.getMessage(equinoxRawData, ec02Instance); |
41 | AppLog.d("## PARAMETERS : " + value); | 44 | AppLog.d("## PARAMETERS : " + value); |
45 | + HashMap<String , String> map = new HashMap<String, String>(); | ||
46 | + String page = equinoxRawData.getRawDataAttribute("val"); | ||
47 | + CheckRequest checkRequest = new CheckRequest(); | ||
48 | + checkRequest.setDn(page); | ||
49 | + String [] dnList = checkRequest.getDn().split("&", -1); | ||
50 | + page = dnList[0].substring("ssid=".length()); | ||
51 | + int i=0; | ||
52 | + while(i<dnList.length){ | ||
53 | + | ||
54 | + map.put(dnList[i].substring(0, dnList[i].indexOf("=")), dnList[i].substring(dnList[i].indexOf("=")+1)); | ||
55 | + i++; | ||
56 | + } | ||
42 | 57 | ||
43 | - this.type = Constant.TYPE_SUCCESS; | ||
44 | 58 | ||
59 | + | ||
60 | + this.type = Constant.TYPE_SUCCESS; | ||
61 | + | ||
45 | RequestHeader requestHeader = new RequestHeader(); | 62 | RequestHeader requestHeader = new RequestHeader(); |
46 | - requestHeader.setVersion("1"); | ||
47 | - requestHeader.setBusinessCode("1"); | 63 | + requestHeader.setVersion(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("Version").get(0)); |
64 | + requestHeader.setBusinessCode(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("BusinessCode_Deduct").get(0)); | ||
48 | requestHeader.setMessageSeq("20160429104931209"); | 65 | requestHeader.setMessageSeq("20160429104931209"); |
49 | OwnershipInfo ownershipInfo = new OwnershipInfo(); | 66 | OwnershipInfo ownershipInfo = new OwnershipInfo(); |
50 | - ownershipInfo.setBEID("101"); | ||
51 | - ownershipInfo.setBRID("101"); | 67 | + ownershipInfo.setBEID(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("BEID").get(0)); |
68 | + ownershipInfo.setBRID(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("BEID").get(0)); | ||
52 | requestHeader.setOwnershipInfo(ownershipInfo); | 69 | requestHeader.setOwnershipInfo(ownershipInfo); |
53 | AccessSecurity accessSecurity = new AccessSecurity(); | 70 | AccessSecurity accessSecurity = new AccessSecurity(); |
54 | - accessSecurity.setLoginSystemCode("Xaysombath"); | ||
55 | - accessSecurity.setPassword("ATBoomuNQidKc8iYhPgx5A=="); | 71 | + accessSecurity.setLoginSystemCode(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("LoginSystemCode").get(0)); |
72 | + accessSecurity.setPassword(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("Password").get(0)); | ||
56 | requestHeader.setAccessSecurity(accessSecurity); | 73 | requestHeader.setAccessSecurity(accessSecurity); |
57 | - requestHeader.setAccessMode("3"); | 74 | + requestHeader.setAccessMode(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("AccessMode").get(0)); |
58 | 75 | ||
59 | AdjustmentRequest adjustmentrequest = new AdjustmentRequest(); | 76 | AdjustmentRequest adjustmentrequest = new AdjustmentRequest(); |
60 | - adjustmentrequest.setAdjustmentSerialNo("20160429104632990"); | 77 | + adjustmentrequest.setAdjustmentSerialNo(map.get("ssid")); |
61 | AdjustmentObj adjustmentObj = new AdjustmentObj(); | 78 | AdjustmentObj adjustmentObj = new AdjustmentObj(); |
62 | SubAccessCode subAccessCode = new SubAccessCode(); | 79 | SubAccessCode subAccessCode = new SubAccessCode(); |
63 | - subAccessCode.setPrimaryIdentity("2055579910"); | 80 | + subAccessCode.setPrimaryIdentity(map.get("ms")); |
64 | adjustmentObj.setSubAccessCode(subAccessCode); | 81 | adjustmentObj.setSubAccessCode(subAccessCode); |
65 | adjustmentrequest.setAdjustmentObj(adjustmentObj); | 82 | adjustmentrequest.setAdjustmentObj(adjustmentObj); |
66 | - adjustmentrequest.setOpType("1"); | 83 | + adjustmentrequest.setOpType(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("OpType").get(0)); |
67 | AdjustmentInfo adjustmentInfo = new AdjustmentInfo(); | 84 | AdjustmentInfo adjustmentInfo = new AdjustmentInfo(); |
68 | - adjustmentInfo.setBalanceType("C_MAIN_ACCOUNT"); | ||
69 | - adjustmentInfo.setAdjustmentType("1"); | ||
70 | - adjustmentInfo.setAdjustmentAmt("1000"); | ||
71 | - adjustmentInfo.setCurrencyID("1049"); | 85 | + adjustmentInfo.setBalanceType(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("BalanceType").get(0)); |
86 | + adjustmentInfo.setAdjustmentType(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("AdjustmentType_Deduct").get(0)); | ||
87 | + adjustmentInfo.setAdjustmentAmt(map.get("fee")); | ||
88 | + adjustmentInfo.setCurrencyID(ec02Instance.getAbstractAF().getUtils().getHmWarmConfig().get("CurrencyID").get(0)); | ||
72 | adjustmentrequest.setAdjustmentInfo(adjustmentInfo); | 89 | adjustmentrequest.setAdjustmentInfo(adjustmentInfo); |
73 | 90 | ||
74 | adjustmentRequest.setRequestHeader(requestHeader); | 91 | adjustmentRequest.setRequestHeader(requestHeader); |