Skip to content

B
business-java
Commit 5d303214 authored by steurwadkar's avatar steurwadkar
Browse files
Options

F17ABAS001 source code commit 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106243 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1ced3892
Show whitespace changes
Inline Side-by-side
Showing with 302 additions and 149 deletions
webitm-gst/ibase/webitm/ejb/gst/GSTDataSubmitWizEJB.java
View file @ 5d303214
...@@ -18,6 +18,7 @@ import java.util.UUID; ...@@ -18,6 +18,7 @@ import java.util.UUID;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import org.apache.commons.io.IOUtils;
import org.json.JSONObject; import org.json.JSONObject;
import org.json.XML; import org.json.XML;
import org.w3c.dom.Document; import org.w3c.dom.Document;
...@@ -27,6 +28,7 @@ import org.w3c.dom.NodeList; ...@@ -27,6 +28,7 @@ import org.w3c.dom.NodeList;
import com.mashape.unirest.http.HttpResponse; import com.mashape.unirest.http.HttpResponse;
import com.mashape.unirest.http.JsonNode; import com.mashape.unirest.http.JsonNode;
import com.mashape.unirest.http.Unirest; import com.mashape.unirest.http.Unirest;
import com.mashape.unirest.request.HttpRequest;
import com.sun.jmx.snmp.Timestamp; import com.sun.jmx.snmp.Timestamp;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
...@@ -291,7 +293,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -291,7 +293,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
calendar.setTime(new Date()); calendar.setTime(new Date());
calendar.add(Calendar.MONTH, -1); calendar.add(Calendar.MONTH, -1);
SimpleDateFormat sdf = new SimpleDateFormat(e12GenericUtility.getApplDateFormat()); /*SimpleDateFormat sdf = new SimpleDateFormat(e12GenericUtility.getApplDateFormat());
currDateStr = sdf.format(calendar.getTime()); currDateStr = sdf.format(calendar.getTime());
...@@ -315,10 +317,10 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -315,10 +317,10 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
{ {
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }*/
valueXmlString.append("<Detail1 domID='1'>"); valueXmlString.append("<Detail1 domID='1'>");
valueXmlString.append("<period_code><![CDATA["+periodCode+"]]></period_code>"); valueXmlString.append("<period_code><![CDATA[]]></period_code>");
valueXmlString.append("<site_code><![CDATA[").append(siteCode).append( "]]></site_code>"); valueXmlString.append("<site_code><![CDATA[").append(siteCode).append( "]]></site_code>");
valueXmlString.append("<site_descr><![CDATA[").append(siteDescr).append( "]]></site_descr>"); valueXmlString.append("<site_descr><![CDATA[").append(siteDescr).append( "]]></site_descr>");
valueXmlString.append("<gstin><![CDATA[" ).append(gstinNo).append( "]]></gstin>"); valueXmlString.append("<gstin><![CDATA[" ).append(gstinNo).append( "]]></gstin>");
...@@ -340,10 +342,14 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -340,10 +342,14 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
long timeStamp = new Timestamp().getDateTime(); long timeStamp = new Timestamp().getDateTime();
byte[] authSEK = null; byte[] authSEK = null;
String loginCode = "", chgTerm = "", callStatus = "", responseId = "", responseJsonStr= "", recType = ""; String loginCode = "", chgTerm = "", callStatus = "", responseId = "", responseJsonStr= "", recType = "";
String signDataXML = "";
System.out.println(" -------- Inside itemchange case 2222222 ------------ "); System.out.println(" -------- Inside itemchange case 2222222 ------------ ");
if( currentColumn.trim().equalsIgnoreCase( "itm_default" )) if( currentColumn.trim().equalsIgnoreCase( "itm_default" ))
{ {
loginCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm");
gstinNo = checkNull(e12GenericUtility.getColumnValue("gstin", dom1)); gstinNo = checkNull(e12GenericUtility.getColumnValue("gstin", dom1));
periodCode = checkNull(e12GenericUtility.getColumnValue("period_code", dom1)); periodCode = checkNull(e12GenericUtility.getColumnValue("period_code", dom1));
stateCode = checkNull(e12GenericUtility.getColumnValue("state_code", dom1)); stateCode = checkNull(e12GenericUtility.getColumnValue("state_code", dom1));
...@@ -392,6 +398,43 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -392,6 +398,43 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
} }
} }
else if("FILE".equalsIgnoreCase(action.trim()))
{
boolean isSignConfigFound = false;
signDataXML = "<sign_data>";
sql = "SELECT SIGN_METHOD,DOC_TYPE FROM USER_SIGN_ACC WHERE USER_ID = ? AND DOC_TYPE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, loginCode);
pstmt.setString(2, returnType.trim());
rs = pstmt.executeQuery();
while(rs.next())
{
isSignConfigFound = true;
signDataXML += "<data>";
signDataXML += "<sign_method><![CDATA["+checkNull(rs.getString("SIGN_METHOD"))+"]]></sign_method>";
signDataXML += "<doc_type><![CDATA["+checkNull(rs.getString("DOC_TYPE"))+"]]></doc_type>";
signDataXML += "</data>";
}
if(pstmt!=null)
{
pstmt.close();
pstmt=null;
}
if(rs!=null)
{
rs.close();
rs=null;
}
signDataXML += "</sign_data>";
if(!isSignConfigFound)
{
signDataXML = "";
}
}
} }
else if("GSTR2".equalsIgnoreCase(returnType)) else if("GSTR2".equalsIgnoreCase(returnType))
{ {
...@@ -402,9 +445,6 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -402,9 +445,6 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
recType = "3"; recType = "3";
} }
loginCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm");
transactionId = UUID.randomUUID().toString().replaceAll("-", ""); transactionId = UUID.randomUUID().toString().replaceAll("-", "");
appKey = checkNull(e12GenericUtility.getColumnValue("app_key", dom1)); appKey = checkNull(e12GenericUtility.getColumnValue("app_key", dom1));
...@@ -418,13 +458,13 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -418,13 +458,13 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
String encryptedOTP = aesEncryption.encryptEK(otp.getBytes(), appKeyInBytes); String encryptedOTP = aesEncryption.encryptEK(otp.getBytes(), appKeyInBytes);
JSONObject authTokenReq = new JSONObject(); JSONObject authTokenReqObj = new JSONObject();
authTokenReq.put("action", "AUTHTOKEN"); authTokenReqObj.put("action", "AUTHTOKEN");
authTokenReq.put("username", userName); authTokenReqObj.put("username", userName);
authTokenReq.put("app_key", appKeyEncryptedAndCoded); authTokenReqObj.put("app_key", appKeyEncryptedAndCoded);
authTokenReq.put("otp", encryptedOTP); authTokenReqObj.put("otp", encryptedOTP);
HttpResponse<JsonNode> authTokenResp = Unirest.post(String.format("%s%s", GSP_API_URL, AUTH_TOKEN_URL_V2)) HttpRequest authTokenReq = Unirest.post(String.format("%s%s", GSP_API_URL, AUTH_TOKEN_URL_V2))
.header("Content-Type",APPLICATION_JSON) .header("Content-Type",APPLICATION_JSON)
.header("clientid", clientId) .header("clientid", clientId)
.header("client-secret", clientSecret) .header("client-secret", clientSecret)
...@@ -434,8 +474,15 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -434,8 +474,15 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
.header("app_key", appKeyEncryptedAndCoded) .header("app_key", appKeyEncryptedAndCoded)
.header("X-Asp-Auth-Token", gspAuthString) .header("X-Asp-Auth-Token", gspAuthString)
.header("X-Asp-Auth-Signature", gspAuthSignature) .header("X-Asp-Auth-Signature", gspAuthSignature)
.body(new JsonNode(authTokenReq.toString())) .body(new JsonNode(authTokenReqObj.toString()))
.asJson(); .getHttpRequest();
System.out.println("authtoken url["+authTokenReq.getUrl()+"]");
System.out.println("authtoken method["+authTokenReq.getHttpMethod()+"]");
System.out.println("authtoken request header["+authTokenReq.getHeaders()+"]");
System.out.println("authtoken request payload["+IOUtils.toString(authTokenReq.getBody().getEntity().getContent())+"]");
HttpResponse<JsonNode> authTokenResp = authTokenReq.asJson();
System.out.println(String.format("authTokenResp Request : Status[%s] Response[%s]", authTokenResp.getStatus(), authTokenResp.getBody())); System.out.println(String.format("authTokenResp Request : Status[%s] Response[%s]", authTokenResp.getStatus(), authTokenResp.getBody()));
...@@ -445,7 +492,6 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -445,7 +492,6 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
if (object.has("auth_token") && object.has("sek") && object.has("status_cd") && Objects.equals(object.getString("status_cd"), "1")) if (object.has("auth_token") && object.has("sek") && object.has("status_cd") && Objects.equals(object.getString("status_cd"), "1"))
{ {
callStatus = "1"; callStatus = "1";
responseJsonStr = object.toString();
authToken = object.getString("auth_token"); authToken = object.getString("auth_token");
sek = object.getString("sek"); sek = object.getString("sek");
...@@ -503,6 +549,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -503,6 +549,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
gstCommonUtil.updateAPICallLogHistory(apiCallData, null); gstCommonUtil.updateAPICallLogHistory(apiCallData, null);
if( authToken != null && authToken.trim().length()>0 && authSEK != null)
{
if("GSTR1".equalsIgnoreCase(returnType)) if("GSTR1".equalsIgnoreCase(returnType))
{ {
if("SUBMIT".equalsIgnoreCase(action)) if("SUBMIT".equalsIgnoreCase(action))
...@@ -515,10 +563,13 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -515,10 +563,13 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
retXML += getGstr1Summary(authToken, stateCode, userName, gstinNo, periodCode, authSEK, appKeyEncryptedAndCoded, xtraParams, conn); retXML += getGstr1Summary(authToken, stateCode, userName, gstinNo, periodCode, authSEK, appKeyEncryptedAndCoded, xtraParams, conn);
} }
} }
}
valueXmlString.append("<Detail2 domID='1'>"); valueXmlString.append("<Detail2 domID='1'>");
valueXmlString.append("<auth_token><![CDATA["+ authToken +"]]></auth_token>"); valueXmlString.append("<auth_token><![CDATA["+ authToken +"]]></auth_token>");
valueXmlString.append("<auth_sek><![CDATA["+ sek +"]]></auth_sek>"); valueXmlString.append("<auth_sek><![CDATA["+ sek +"]]></auth_sek>");
valueXmlString.append(signDataXML);
valueXmlString.append("</Detail2>" ); valueXmlString.append("</Detail2>" );
valueXmlString.append("<Detail2 domID='2'>"); valueXmlString.append("<Detail2 domID='2'>");
valueXmlString.append(retXML); valueXmlString.append(retXML);
...@@ -935,7 +986,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -935,7 +986,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
otpRequest.put("app_key", appKeyEncryptedAndCoded); otpRequest.put("app_key", appKeyEncryptedAndCoded);
otpRequest.put("username", userName); otpRequest.put("username", userName);
HttpResponse<JsonNode> otpResp = Unirest.post(String.format("%s%s", GSP_API_URL,AUTH_TOKEN_URL_V2)) HttpRequest otpReq = Unirest.post(String.format("%s%s", GSP_API_URL,AUTH_TOKEN_URL_V2))
.header("Content-Type", APPLICATION_JSON) .header("Content-Type", APPLICATION_JSON)
.header("clientid", clientId) .header("clientid", clientId)
.header("client-secret", clientSecret) .header("client-secret", clientSecret)
...@@ -947,7 +998,14 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -947,7 +998,14 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
.header("X-Asp-Auth-Token", gspAuthString) .header("X-Asp-Auth-Token", gspAuthString)
.header("X-Asp-Auth-Signature", gspAuthSignature) .header("X-Asp-Auth-Signature", gspAuthSignature)
.body(new JsonNode(otpRequest.toString())) .body(new JsonNode(otpRequest.toString()))
.asJson(); .getHttpRequest();
System.out.println("OTP url["+otpReq.getUrl()+"]");
System.out.println("OTP method["+otpReq.getHttpMethod()+"]");
System.out.println("OTP request header["+otpReq.getHeaders()+"]");
System.out.println("OTP request payload["+IOUtils.toString(otpReq.getBody().getEntity().getContent())+"]");
HttpResponse<JsonNode> otpResp = otpReq.asJson();
System.out.println(String.format("OTP Request : Status[%s] Response[%s]", otpResp.getStatus(), otpResp.getBody())); System.out.println(String.format("OTP Request : Status[%s] Response[%s]", otpResp.getStatus(), otpResp.getBody()));
...@@ -957,8 +1015,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -957,8 +1015,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
if( object.has("status_cd") && "1".equalsIgnoreCase(object.getString("status_cd"))) if( object.has("status_cd") && "1".equalsIgnoreCase(object.getString("status_cd")))
{ {
callStatus = "1"; callStatus = "1";
responseJsonStr = object.toString(); retResponseXML = "<root><message><![CDATA[OTP has been sent successfully to mobile number registerd with GSTN.]]></message></root>";
retResponseXML = "<root><message><![CDATA[OTP generated successfuly!]]></message></root>";
} }
else else
{ {
...@@ -968,6 +1025,13 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -968,6 +1025,13 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
retResponseXML = "<root><message><![CDATA[Message : "+errorJSON.getString("message")+" \nError code : "+errorJSON.getString("error_cd")+"]]></message></root>"; retResponseXML = "<root><message><![CDATA[Message : "+errorJSON.getString("message")+" \nError code : "+errorJSON.getString("error_cd")+"]]></message></root>";
} }
} }
else if(otpResp.getStatus() == 500)
{
callStatus = "2";
String errMsg = "Message : Error occurred at GSTN server \nResponse code : "+otpResp.getStatus();
responseJsonStr = errMsg;
retResponseXML = "<root><message><![CDATA[Message : "+errMsg+" \nError code : "+otpResp.getStatus()+"]]></message></root>";
}
else else
{ {
callStatus = "2"; callStatus = "2";
...@@ -1098,7 +1162,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1098,7 +1162,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstinNo; gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstinNo;
gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey); gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey);
HttpResponse<JsonNode> getDataResp = Unirest.get(String.format("%s%s", GSP_API_URL,GSTR1_URL_V3)) HttpRequest getDataReq = Unirest.get(String.format("%s%s", GSP_API_URL,GSTR1_URL_V3))
.queryString("action", action) .queryString("action", action)
.queryString("gstin", gstinNo) .queryString("gstin", gstinNo)
.queryString("ret_period", periodCode) .queryString("ret_period", periodCode)
...@@ -1115,7 +1179,15 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1115,7 +1179,15 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
.header("gstin", gstinNo) .header("gstin", gstinNo)
.header("X-Asp-Auth-Token", gspAuthString) .header("X-Asp-Auth-Token", gspAuthString)
.header("X-Asp-Auth-Signature", gspAuthSignature) .header("X-Asp-Auth-Signature", gspAuthSignature)
.asJson(); .getHttpRequest();
System.out.println("get GSTR1 ["+action+"] invoices url["+getDataReq.getUrl()+"]");
System.out.println("get GSTR1 ["+action+"] invoices method["+getDataReq.getHttpMethod()+"]");
System.out.println("get GSTR1 ["+action+"] invoices request header["+getDataReq.getHeaders()+"]");
HttpResponse<JsonNode> getDataResp = getDataReq.asJson();
System.out.println("getDataResp.getStatus()["+getDataResp.getStatus()+"]");
if(getDataResp.getStatus() == 200) if(getDataResp.getStatus() == 200)
{ {
...@@ -1133,15 +1205,6 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1133,15 +1205,6 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
byte[] getrespJsonInBytes = aesEncryption.decodeBase64StringTOByte(getrespJsoninBase64); byte[] getrespJsonInBytes = aesEncryption.decodeBase64StringTOByte(getrespJsoninBase64);
String getjsonData = new String(getrespJsonInBytes); String getjsonData = new String(getrespJsonInBytes);
if(getjsonData.length() > 500)
{
responseJsonStr = getjsonData.substring(0,499);//TODO need to change column size value is too large
}
else
{
responseJsonStr = getjsonData;//TODO need to change column size value is too large
}
System.out.println("json response["+getjsonData+"] for ["+action+"]"); System.out.println("json response["+getjsonData+"] for ["+action+"]");
if("B2B".equalsIgnoreCase(action)) if("B2B".equalsIgnoreCase(action))
...@@ -1222,6 +1285,13 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1222,6 +1285,13 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
responseJsonStr = errorJSON.toString(); responseJsonStr = errorJSON.toString();
System.out.println("errorJSON["+errorJSON+"]"); System.out.println("errorJSON["+errorJSON+"]");
} }
}
else if(getDataResp.getStatus() == 500)
{
callStatus = "2";
String errMsg = "Message : Error occurred at GSTN server \nResponse code : "+getDataResp.getStatus();
responseJsonStr = errMsg;
System.out.println("errMsg["+errMsg+"]");
} }
else else
{ {
...@@ -1275,7 +1345,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1275,7 +1345,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstin; gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstin;
gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey); gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey);
HttpResponse<JsonNode> getGstr1SumryResp = Unirest.get(String.format("%s%s", GSP_API_URL, GSTR1_URL_V3)) HttpRequest getGstr1SumryReq = Unirest.get(String.format("%s%s", GSP_API_URL, GSTR1_URL_V3))
.queryString("action","RETSUM") .queryString("action","RETSUM")
.queryString("gstin", gstin) .queryString("gstin", gstin)
.queryString("ret_period", periodCode) .queryString("ret_period", periodCode)
...@@ -1286,13 +1356,18 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1286,13 +1356,18 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
.header("ip-usr", ipAddress) .header("ip-usr", ipAddress)
.header("username", userName) .header("username", userName)
.header("auth-token", authToken) .header("auth-token", authToken)
.header("app_key", appKeyEncryptedAndCoded)
.header("txn", transactionId) .header("txn", transactionId)
.header("ret_period", periodCode) .header("ret_period", periodCode)
.header("gstin", gstin) .header("gstin", gstin)
.header("X-Asp-Auth-Token", gspAuthString) .header("X-Asp-Auth-Token", gspAuthString)
.header("X-Asp-Auth-Signature", gspAuthSignature) .header("X-Asp-Auth-Signature", gspAuthSignature)
.asJson(); .getHttpRequest();
System.out.println("get GSTR1 summary url["+getGstr1SumryReq.getUrl()+"]");
System.out.println("get GSTR1 summary method["+getGstr1SumryReq.getHttpMethod()+"]");
System.out.println("get GSTR1 summary invoices request header["+getGstr1SumryReq.getHeaders()+"]");
HttpResponse<JsonNode> getGstr1SumryResp = getGstr1SumryReq.asJson();
System.out.println(String.format("getGstr1SumryResp Request : Status[%s] Response[%s]", getGstr1SumryResp.getStatus(), getGstr1SumryResp.getBody())); System.out.println(String.format("getGstr1SumryResp Request : Status[%s] Response[%s]", getGstr1SumryResp.getStatus(), getGstr1SumryResp.getBody()));
...@@ -1313,15 +1388,6 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1313,15 +1388,6 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
JSONObject gstr1SumryJsonObj = new JSONObject(new String(respJsonInBytes)); JSONObject gstr1SumryJsonObj = new JSONObject(new String(respJsonInBytes));
if(new String(respJsonInBytes).length() > 500)
{
responseJsonStr = new String(respJsonInBytes).substring(0,499);//TODO need to change column size value is too large
}
else
{
responseJsonStr = new String(respJsonInBytes);//TODO need to change column size value is too large
}
retString = "<summary_data>" + XML.toString(gstr1SumryJsonObj) + "</summary_data>"; retString = "<summary_data>" + XML.toString(gstr1SumryJsonObj) + "</summary_data>";
...@@ -1335,6 +1401,13 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1335,6 +1401,13 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
errMsg = "Message : "+errorJSON.getString("message")+" \nError code : "+errorJSON.getString("error_cd"); errMsg = "Message : "+errorJSON.getString("message")+" \nError code : "+errorJSON.getString("error_cd");
retString = getError(errMsg, "GSTAPIERR", conn); retString = getError(errMsg, "GSTAPIERR", conn);
} }
}
else if(getGstr1SumryResp.getStatus() == 500)
{
callStatus = "2";
errMsg = "Message : Error occurred at GSTN server \nResponse code : "+getGstr1SumryResp.getStatus();
responseJsonStr = errMsg;
retString = getError(errMsg, "GSTAPIERR", conn);
} }
else else
{ {
......
webitm-gst/ibase/webitm/ejb/gst/GSTDataSubmitWizPos.java
View file @ 5d303214
...@@ -20,6 +20,7 @@ import java.util.UUID; ...@@ -20,6 +20,7 @@ import java.util.UUID;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import org.apache.commons.io.IOUtils;
import org.bouncycastle.crypto.digests.SHA256Digest; import org.bouncycastle.crypto.digests.SHA256Digest;
import org.bouncycastle.crypto.macs.HMac; import org.bouncycastle.crypto.macs.HMac;
import org.bouncycastle.crypto.params.KeyParameter; import org.bouncycastle.crypto.params.KeyParameter;
...@@ -33,6 +34,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; ...@@ -33,6 +34,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.mashape.unirest.http.HttpResponse; import com.mashape.unirest.http.HttpResponse;
import com.mashape.unirest.http.JsonNode; import com.mashape.unirest.http.JsonNode;
import com.mashape.unirest.http.Unirest; import com.mashape.unirest.http.Unirest;
import com.mashape.unirest.request.HttpRequest;
import com.sun.jmx.snmp.Timestamp; import com.sun.jmx.snmp.Timestamp;
import ibase.utility.CommonConstants; import ibase.utility.CommonConstants;
...@@ -214,6 +216,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -214,6 +216,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
NodeList detail1NList = null, detail1ChildNList = null, detail2NList = null, detail2ChildNList = null; NodeList detail1NList = null, detail1ChildNList = null, detail2NList = null, detail2ChildNList = null;
String retString = "", nodeName = "", otp = "", stateCode = "", sek = "", returnsType = "", gstin = "", periodCode = "", grossTurnover = "", String retString = "", nodeName = "", otp = "", stateCode = "", sek = "", returnsType = "", gstin = "", periodCode = "", grossTurnover = "",
action = "", siteCode = "", gspAuthString = "", gspAuthSignature = "", currentYearTurnover = ""; action = "", siteCode = "", gspAuthString = "", gspAuthSignature = "", currentYearTurnover = "";
String loginCode = "", chgTerm = "", callStatus = "", responseId = "", responseJsonStr= "";
byte[] authSEK = null; byte[] authSEK = null;
try try
...@@ -221,6 +224,9 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -221,6 +224,9 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
String userName = "", authToken = ""; String userName = "", authToken = "";
String transactionId = UUID.randomUUID().toString().replaceAll("-", ""); String transactionId = UUID.randomUUID().toString().replaceAll("-", "");
loginCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm");
System.out.println("xmlStringAll["+xmlStringAll+"]"); System.out.println("xmlStringAll["+xmlStringAll+"]");
System.out.println("dcrId["+dcrId+"]"); System.out.println("dcrId["+dcrId+"]");
System.out.println("editFlag["+editFlag+"]"); System.out.println("editFlag["+editFlag+"]");
...@@ -379,12 +385,36 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -379,12 +385,36 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
} }
} }
} }
else if(authTokenResp.getStatus() == 500)
{
callStatus = "2";
String errMsg = "Message : Error occurred at GSTN server \nResponse code : "+authTokenResp.getStatus();
responseJsonStr = errMsg;
retString = getError(errMsg, "GSTAPIERR", conn);
}
else else
{ {
JSONObject errorJSON = authTokenResp.getBody().getObject().getJSONObject("error"); JSONObject errorJSON = authTokenResp.getBody().getObject().getJSONObject("error");
String errMsg = "Message : "+errorJSON.getString("message")+" \nError code : "+errorJSON.getString("error_cd"); String errMsg = "Message : "+errorJSON.getString("message")+" \nError code : "+errorJSON.getString("error_cd");
retString = getError(errMsg, "GSTAPIERR", conn); retString = getError(errMsg, "GSTAPIERR", conn);
} }
APICallData apiCallData = new APICallData();
apiCallData.setPeriodCode(periodCode);
apiCallData.setCallDate(new Date());
apiCallData.setSiteCode(siteCode);
apiCallData.setUserId(loginCode);
apiCallData.setCallType("AUTHTOKEN");
apiCallData.setRecType("1");
apiCallData.setNoOfRecords(0);
apiCallData.setCallStatus(callStatus);
apiCallData.setResponseId(responseId);
apiCallData.setResponseJsonStr(responseJsonStr);
apiCallData.setChgUser(loginCode);
apiCallData.setChgDate(new Date());
apiCallData.setChgTerm(chgTerm);
gstCommonUtil.updateAPICallLogHistory(apiCallData, null);
} }
if("GSTR1".equalsIgnoreCase(returnsType)) if("GSTR1".equalsIgnoreCase(returnsType))
...@@ -1281,9 +1311,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1281,9 +1311,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstin; gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstin;
gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey); gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey);
System.out.println("RETSAVE request url ["+String.format("%s%s", GSP_API_URL, GSTR1_URL_V3)+"]"); HttpRequest saveGstr1Req = Unirest.put(String.format("%s%s", GSP_API_URL, GSTR1_URL_V3))
HttpResponse<JsonNode> gstr1Resp = Unirest.put(String.format("%s%s", GSP_API_URL, GSTR1_URL_V3))
.header("Content-Type", APPLICATION_JSON) .header("Content-Type", APPLICATION_JSON)
.header("clientid", clientId) .header("clientid", clientId)
.header("client-secret", clientSecret) .header("client-secret", clientSecret)
...@@ -1294,11 +1322,17 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1294,11 +1322,17 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
.header("username", userName) .header("username", userName)
.header("ret_period", periodCode) .header("ret_period", periodCode)
.header("ip-usr", ipAddress) .header("ip-usr", ipAddress)
//.header("app_key", appKeyEncryptedAndCoded)
.header("X-Asp-Auth-Token", gspAuthString) .header("X-Asp-Auth-Token", gspAuthString)
.header("X-Asp-Auth-Signature", gspAuthSignature) .header("X-Asp-Auth-Signature", gspAuthSignature)
.body(new JsonNode(gstr1HeaderObj.toString())) .body(new JsonNode(gstr1HeaderObj.toString()))
.asJson(); .getHttpRequest();
System.out.println("SAVE GSTR1 url["+saveGstr1Req.getUrl()+"]");
System.out.println("SAVE GSTR1 method["+saveGstr1Req.getHttpMethod()+"]");
System.out.println("SAVE GSTR1 request header["+saveGstr1Req.getHeaders()+"]");
System.out.println("SAVE GSTR1 request payload["+IOUtils.toString(saveGstr1Req.getBody().getEntity().getContent())+"]");
HttpResponse<JsonNode> gstr1Resp = saveGstr1Req.asJson();
System.out.println(String.format("gstr1Resp Request : Status[%s] Response[%s]", gstr1Resp.getStatus(), gstr1Resp.getBody())); System.out.println(String.format("gstr1Resp Request : Status[%s] Response[%s]", gstr1Resp.getStatus(), gstr1Resp.getBody()));
...@@ -1321,7 +1355,6 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1321,7 +1355,6 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
String transId = Gstr1RespObj.getString("reference_id"); String transId = Gstr1RespObj.getString("reference_id");
responseId = transId; responseId = transId;
responseJsonStr = Gstr1RespObj.toString();
System.out.println("transId to getStatus["+transId+"]"); System.out.println("transId to getStatus["+transId+"]");
...@@ -1333,13 +1366,11 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1333,13 +1366,11 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
gspAuthStringRet = clientId + ":" + transactionId + ":" + timeStampRet + ":" + gstin; gspAuthStringRet = clientId + ":" + transactionId + ":" + timeStampRet + ":" + gstin;
gspAuthSignatureRet = gspSignature.sign(gspAuthStringRet, aspPrivateKey); gspAuthSignatureRet = gspSignature.sign(gspAuthStringRet, aspPrivateKey);
System.out.println("RETSTATUS request url ["+String.format("%s%s", GSP_API_URL, GSTR_URL_V3)+"]"); HttpRequest retStatusReq = Unirest.get(String.format("%s%s", GSP_API_URL, GSTR_URL_V3))
HttpResponse<JsonNode> retStatusResp = Unirest.get(String.format("%s%s", GSP_API_URL, GSTR_URL_V3))
.queryString("action","RETSTATUS") .queryString("action","RETSTATUS")
.queryString("gstin", gstin) .queryString("gstin", gstin)
.queryString("ret_period", periodCode) .queryString("ret_period", periodCode)
.queryString("trans_id",transId) .queryString("ref_id",transId)
.header("Content-Type", APPLICATION_JSON) .header("Content-Type", APPLICATION_JSON)
.header("state-cd", stateCode) .header("state-cd", stateCode)
.header("clientid", clientId) .header("clientid", clientId)
...@@ -1347,13 +1378,18 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1347,13 +1378,18 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
.header("ip-usr", ipAddress) .header("ip-usr", ipAddress)
.header("username", userName) .header("username", userName)
.header("auth-token", authToken) .header("auth-token", authToken)
//.header("app_key", appKeyEncryptedAndCoded)
.header("txn", transactionId) .header("txn", transactionId)
.header("ret_period", periodCode) .header("ret_period", periodCode)
.header("gstin", gstin) .header("gstin", gstin)
.header("X-Asp-Auth-Token", gspAuthStringRet) .header("X-Asp-Auth-Token", gspAuthStringRet)
.header("X-Asp-Auth-Signature", gspAuthSignatureRet) .header("X-Asp-Auth-Signature", gspAuthSignatureRet)
.asJson(); .getHttpRequest();
System.out.println("RETSTATUS url["+retStatusReq.getUrl()+"]");
System.out.println("RETSTATUS method["+retStatusReq.getHttpMethod()+"]");
System.out.println("RETSTATUS request header["+retStatusReq.getHeaders()+"]");
HttpResponse<JsonNode> retStatusResp = retStatusReq.asJson();
System.out.println(String.format("retStatusResp Request : Status[%s] Response[%s]", retStatusResp.getStatus(), retStatusResp.getBody())); System.out.println(String.format("retStatusResp Request : Status[%s] Response[%s]", retStatusResp.getStatus(), retStatusResp.getBody()));
...@@ -1382,7 +1418,6 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1382,7 +1418,6 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
else if("P".equalsIgnoreCase((String)retStatsJsonData.get("status_cd"))) else if("P".equalsIgnoreCase((String)retStatsJsonData.get("status_cd")))
{ {
retStatusCallStatus = "1"; retStatusCallStatus = "1";
retStatusResponseJsonStr = (String) retStatsJsonData.get("status_cd");
if(tranIdList.size() > 0) if(tranIdList.size() > 0)
{ {
updateSubmissionStatus(tranIdList, conn); updateSubmissionStatus(tranIdList, conn);
...@@ -1423,6 +1458,14 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1423,6 +1458,14 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
retString = getError(errMsg, "GSTAPIERR", conn); retString = getError(errMsg, "GSTAPIERR", conn);
isRetStatusError = true; isRetStatusError = true;
} }
}
else if(retStatusResp.getStatus() == 500)
{
retStatusCallStatus = "2";
errMsg = "Message : Error occurred at GSTN server \nResponse code : "+retStatusResp.getStatus();
retStatusResponseJsonStr = errMsg;
retString = getError(errMsg, "GSTAPIERR", conn);
isRetStatusError = true;
} }
else else
{ {
...@@ -1465,6 +1508,13 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1465,6 +1508,13 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
errMsg = "Message : "+errorJSON.getString("message")+" \nError code : "+errorJSON.getString("error_cd"); errMsg = "Message : "+errorJSON.getString("message")+" \nError code : "+errorJSON.getString("error_cd");
retString = getError(errMsg, "GSTAPIERR", conn); retString = getError(errMsg, "GSTAPIERR", conn);
} }
}
else if(gstr1Resp.getStatus() == 500)
{
callStatus = "2";
errMsg = "Message : Error occurred at GSTN server \nResponse code : "+gstr1Resp.getStatus();
responseJsonStr = errMsg;
retString = getError(errMsg, "GSTAPIERR", conn);
} }
else else
{ {
...@@ -1531,7 +1581,6 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1531,7 +1581,6 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
.header("ip-usr", ipAddress) .header("ip-usr", ipAddress)
.header("username", userName) .header("username", userName)
.header("auth-token", authToken) .header("auth-token", authToken)
//.header("app_key", appKeyEncryptedAndCoded)
.header("txn", transactionId) .header("txn", transactionId)
.header("ret_period", periodCode) .header("ret_period", periodCode)
.header("gstin", gstin) .header("gstin", gstin)
...@@ -1559,8 +1608,6 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1559,8 +1608,6 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
JSONObject gstr1SumryJsonObj = new JSONObject(new String(respJsonInBytes)); JSONObject gstr1SumryJsonObj = new JSONObject(new String(respJsonInBytes));
responseJsonStr = gstr1SumryJsonObj.toString();
System.out.println(gstr1SumryJsonObj); System.out.println(gstr1SumryJsonObj);
if("FILE".equalsIgnoreCase(action)) if("FILE".equalsIgnoreCase(action))
...@@ -1715,6 +1762,10 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1715,6 +1762,10 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
String transactionId = UUID.randomUUID().toString().replaceAll("-", ""); String transactionId = UUID.randomUUID().toString().replaceAll("-", "");
String loginCode = "", chgTerm = "", siteCode = "", callStatus = "", responseJsonStr = "", responseId = ""; String loginCode = "", chgTerm = "", siteCode = "", callStatus = "", responseJsonStr = "", responseId = "";
String sql = "";
PreparedStatement pstmt = null;
int updateCnt = 0;
try try
{ {
...@@ -1754,7 +1805,6 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1754,7 +1805,6 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
.header("ip-usr", ipAddress) .header("ip-usr", ipAddress)
.header("username", userName) .header("username", userName)
.header("auth-token", authToken) .header("auth-token", authToken)
//.header("app_key", appKeyEncryptedAndCoded)
.header("txn", transactionId) .header("txn", transactionId)
.header("ret_period", periodCode) .header("ret_period", periodCode)
.header("gstin", gstin) .header("gstin", gstin)
...@@ -1782,8 +1832,26 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1782,8 +1832,26 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
JSONObject gstr1SubmitObj = new JSONObject(new String(respJsonInBytes)); JSONObject gstr1SubmitObj = new JSONObject(new String(respJsonInBytes));
String transId = gstr1SubmitObj.getString("reference_id"); String transId = gstr1SubmitObj.getString("reference_id");
responseId = transId; responseId = transId;
responseJsonStr = transId;
System.out.println("transId to getStatus after SUBMIT call["+transId+"]"); System.out.println("transId to getStatus after SUBMIT call["+transId+"]");
sql = "UPDATE GST_DATA_HDR SET SUBMIT_STATUS = ? AND SUBMIT_DATE = ? WHERE PRD_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, "S");
pstmt.setString(2, new SimpleDateFormat(new E12GenericUtility().getApplDateFormat()).format(new Date()));
pstmt.setString(3, periodCode);
pstmt.setString(4, siteCode);
updateCnt = pstmt.executeUpdate();
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
System.out.println("submit status updated of ["+siteCode+"] for ["+periodCode+"] update count ["+updateCnt+"]");
} }
else else
{ {
...@@ -1793,6 +1861,13 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1793,6 +1861,13 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
errMsg = "Message : "+errorJSON.getString("message")+" \nError code : "+errorJSON.getString("error_cd"); errMsg = "Message : "+errorJSON.getString("message")+" \nError code : "+errorJSON.getString("error_cd");
retString = getError(errMsg, "GSTAPIERR", conn); retString = getError(errMsg, "GSTAPIERR", conn);
} }
}
else if(gstr1SubmitResp.getStatus() == 500)
{
callStatus = "2";
errMsg = "Message : Error occurred at GSTN server \nResponse code : "+gstr1SubmitResp.getStatus();
responseJsonStr = errMsg;
retString = getError(errMsg, "GSTAPIERR", conn);
} }
else else
{ {
...@@ -1887,7 +1962,6 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1887,7 +1962,6 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
byte[] respJsonInBytes = aesEncryption.decodeBase64StringTOByte(respJsoninBase64); byte[] respJsonInBytes = aesEncryption.decodeBase64StringTOByte(respJsoninBase64);
JSONObject gstr2InvoiceJsonObj = new JSONObject(new String(respJsonInBytes)); JSONObject gstr2InvoiceJsonObj = new JSONObject(new String(respJsonInBytes));
responseJsonStr = gstr2InvoiceJsonObj.toString();
System.out.println("respJsonInBytes["+new String(respJsonInBytes)+"]"); System.out.println("respJsonInBytes["+new String(respJsonInBytes)+"]");
...@@ -1911,6 +1985,13 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1911,6 +1985,13 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
retString = getError(errMsg, "GSTAPIERR", conn); retString = getError(errMsg, "GSTAPIERR", conn);
} }
} }
else if(getGstr2InvoicesResp.getStatus() == 500)
{
callStatus = "2";
errMsg = "Message : Error occurred at GSTN server \nResponse code : "+getGstr2InvoicesResp.getStatus();
responseJsonStr = errMsg;
retString = getError(errMsg, "GSTAPIERR", conn);
}
else else
{ {
callStatus = "2"; callStatus = "2";
......
webitm-gst/ibase/webitm/util/gst/B2CLASerializer.java
View file @ 5d303214
...@@ -6,7 +6,6 @@ import com.fasterxml.jackson.core.JsonGenerator; ...@@ -6,7 +6,6 @@ import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.SerializerProvider;
import ibase.webitm.bean.gst.B2CL;
import ibase.webitm.bean.gst.B2CLA; import ibase.webitm.bean.gst.B2CLA;
public class B2CLASerializer extends BaseSerializer<B2CLA> { public class B2CLASerializer extends BaseSerializer<B2CLA> {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment