F17ABAS001 source code commit

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106134 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-gst/ibase/webitm/ejb/gst/GSTDataSubmitWizEJB.java

@@ -11,7 +11,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Base64;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -21,9 +20,6 @@ import java.util.UUID;
 
 import javax.annotation.PostConstruct;
 
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
 import org.json.JSONObject;
 import org.json.XML;
 import org.w3c.dom.Document;
@@ -464,7 +460,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 						
 				        valueXmlString.append("<Detail2 domID='1'>");
 				        valueXmlString.append("<auth_token><![CDATA["+ authToken +"]]></auth_token>");
-				        valueXmlString.append("<auth_sek><![CDATA["+ authSEK +"]]></auth_sek>");
+				        valueXmlString.append("<auth_sek><![CDATA["+ sek +"]]></auth_sek>");
 				        valueXmlString.append("</Detail2>" );
 				        valueXmlString.append("<Detail2 domID='2'>");
 				        valueXmlString.append(retXML);
@@ -674,20 +670,6 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 								rs.close();
 								rs = null;
 							}
-							
-							/*sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = '1' AND SUBMIT_STATUS = 'P' AND PRD_CODE = ? AND SITE_CODE = ?";
-							pstmt = conn.prepareStatement(sql);
-							pstmt.setString(1, periodCode);
-							pstmt.setString(2, loginSiteCode);
-							rs = pstmt.executeQuery();
-							if(rs.next())
-							{
-								if(rs.getInt("CNT") > 0)
-								{
-									errList.add( "VTRECSAPEN" );
-									errFields.add("returns_type");
-								}
-							}*/
 						}
 					}
 					break;
@@ -878,7 +860,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 		{
 			System.out.println("GSTDataSubmitWizEJB.handleRequest()["+e.getMessage()+"]");
 			e.printStackTrace();
-			throw new ITMException(e);
+			retResponseXML = "<root><message><![CDATA[Message : Error occured!]]></message></root>";
 		}
 		finally
 		{
@@ -916,7 +898,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 				gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstinNo;
 				gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey);
 				
-				HttpResponse<JsonNode> getDataResp = Unirest.get(String.format("%s%s", GSP_API_URL,GSTR1_URL_V2))//TODO need to change URL to v0.3
+				HttpResponse<JsonNode> getDataResp = Unirest.get(String.format("%s%s", GSP_API_URL,GSTR1_URL_V3))
 							        				 .queryString("action", action)
 							        				 .queryString("gstin", gstinNo)
 							        				 .queryString("ret_period", periodCode)
@@ -1049,7 +1031,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 	        gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstin;
 			gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey);
 			
-			HttpResponse<JsonNode> getGstr1SumryResp = Unirest.get(String.format("%s%s", GSP_API_URL, GSTR1_URL_V2))//TODO need to change with version 0.3
+			HttpResponse<JsonNode> getGstr1SumryResp = Unirest.get(String.format("%s%s", GSP_API_URL, GSTR1_URL_V3))
 													   .queryString("action","RETSUM")
 													   .queryString("gstin", gstin)
 													   .queryString("ret_period", periodCode)