F17ABAS001 source code commit

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

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

@@ -70,15 +70,21 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 	@PostConstruct
 	public void postConstruct()
 	{
-		String sql = "";
+		String sql = "", gstnPublicKeyName = "";
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
 		try(java.util.Scanner sc = new java.util.Scanner(new java.net.URL("https://api.ipify.org").openStream(), "UTF-8").useDelimiter("\\A"))
 		{
 			System.out.println("GSTDataSubmitWizEJB PostConstruct called!");
-			InputStream pubKeyInpStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("ibase/webitm/resources/gst/GSTN_Public_Key.cer");
 			conn = getConnection();
 			FinCommon finCommon = new FinCommon();
+			gstnPublicKeyName = finCommon.getFinparams("999999", "GSTN_PUB_KEY_NAME", conn);
+			if("NULLFOUND".equalsIgnoreCase(gstnPublicKeyName))
+			{
+				gstnPublicKeyName = "GSTN_G2B_Prod_Public";
+			}
+			System.out.println("gstnPublicKeyName["+gstnPublicKeyName+"]");
+			InputStream pubKeyInpStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("ibase/webitm/resources/gst/"+gstnPublicKeyName+".cer");
 			clientId = finCommon.getFinparams("999999", "GST_CLIENT_ID", conn);
 			clientSecret = finCommon.getFinparams("999999", "GST_CLIENT_SECRET", conn);
 			aesEncryption = new AESEncryption();

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

@@ -123,15 +123,21 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 	@PostConstruct
 	public void postConstruct()
 	{
-		String sql = "";
+		String sql = "", gstnPublicKeyName = "";
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
 		try(java.util.Scanner sc = new java.util.Scanner(new java.net.URL("https://api.ipify.org").openStream(), "UTF-8").useDelimiter("\\A"))
 		{
 			System.out.println("GSTDataSubmitWizPos PostConstruct called!");
-			InputStream pubKeyInpStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("ibase/webitm/resources/gst/GSTN_Public_Key.cer");
 			conn = getConnection();
 			FinCommon finCommon = new FinCommon();
+			gstnPublicKeyName = finCommon.getFinparams("999999", "GSTN_PUB_KEY_NAME", conn);
+			if("NULLFOUND".equalsIgnoreCase(gstnPublicKeyName))
+			{
+				gstnPublicKeyName = "GSTN_G2B_Prod_Public";
+			}
+			System.out.println("gstnPublicKeyName["+gstnPublicKeyName+"]");
+			InputStream pubKeyInpStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("ibase/webitm/resources/gst/"+gstnPublicKeyName+".cer");
 			clientId = finCommon.getFinparams("999999", "GST_CLIENT_ID", conn);
 			clientSecret = finCommon.getFinparams("999999", "GST_CLIENT_SECRET", conn);
 			aesEncryption = new AESEncryption();
@@ -640,6 +646,8 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 		
 		try
 		{
+			Date payloadStartTime = new Date();
+			
 			sql = "SELECT * FROM GST_DATA_HDR WHERE PRD_CODE = ? AND SITE_CODE = ? AND SUBMIT_STATUS = 'P' AND REC_TYPE ='1'";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, periodCode);
@@ -1375,6 +1383,8 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 				String gspAuthString = "", gspAuthSignature = "", gspAuthStringRet = "", gspAuthSignatureRet = "";
 				APICallData apiRetStatsCallData = null;
 				List<APICallData> retStatAPICallList = new ArrayList<APICallData>();
+				int retStatusCallCnt = 0;
+				Date restSaveEndTime = null;
 				
 				loginCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
 				chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm");
@@ -1385,6 +1395,16 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 				
 				System.out.println("jsonPayload to SAVE GSTR1["+json+"]");
 				
+				Date payloadEndTime = new Date();
+				
+				long payloadDiff = payloadEndTime.getTime() - payloadStartTime.getTime();
+
+				long payloadDiffSeconds = payloadDiff / 1000 % 60;
+				long payloadDiffMinutes = payloadDiff / (60 * 1000) % 60;
+				long payloadDiffHours = payloadDiff / (60 * 60 * 1000);
+				
+				System.out.println("DIFFERANCE IN TIME FOR PAYLOAD CREATION GSTR1 IN HH:MM:SS ["+payloadDiffHours +":"+payloadDiffMinutes+":"+payloadDiffSeconds+"]");
+				
 				byte[] jsonBase64 = Base64.getEncoder().encode(json.getBytes());
 				String encryptedPayload = aesEncryption.encryptEK(jsonBase64, authSek);
 				 
@@ -1453,10 +1473,22 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 						
 						System.out.println("transId to getStatus["+transId+"]");
 						
+						restSaveEndTime = new Date();
+						
+						long retSaveDiff = restSaveEndTime.getTime() - startTime.getTime();
+
+						long retSaveDiffSeconds = retSaveDiff / 1000 % 60;
+						long retSaveDiffMinutes = retSaveDiff / (60 * 1000) % 60;
+						long retSaveDiffHours = retSaveDiff / (60 * 60 * 1000);
+						
+						System.out.println("DIFFERANCE IN TIME FOR RETSAVE GSTR1 IN HH:MM:SS ["+retSaveDiffHours +":"+retSaveDiffMinutes+":"+retSaveDiffSeconds+"]");
+						
 						boolean isRetStatusError = false;
 						
 						while(true)
 						{
+							Thread.sleep(noOfRecords);//TODO NEED TO REMOVE WITH BETTER OPTION
+							retStatusCallCnt++;
 							long timeStampRet = new Timestamp().getDateTime();
 					        gspAuthStringRet = clientId + ":" + transactionId + ":" + timeStampRet + ":" + gstin;
 							gspAuthSignatureRet = gspSignature.sign(gspAuthStringRet, aspPrivateKey);
@@ -1636,13 +1668,21 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 		        	retString = getError(errMsg, "GSTAPIERR", conn);
 	            }
 				
+				System.out.println("total retStatusCallCnt ["+retStatusCallCnt+"]");
 				Date endTime = new Date();
-				long diff = startTime.getTime() - endTime.getTime();
+				long diff = endTime.getTime() - startTime.getTime();
 
 				long diffSeconds = diff / 1000 % 60;
 				long diffMinutes = diff / (60 * 1000) % 60;
 				long diffHours = diff / (60 * 60 * 1000);
 				
+				long diffStatus = endTime.getTime() - restSaveEndTime.getTime();
+				
+				long diffStatsSeconds = diffStatus / 1000 % 60;
+				long diffStatsMinutes = diffStatus / (60 * 1000) % 60;
+				long diffStatsHours = diffStatus / (60 * 60 * 1000);
+				
+				System.out.println("DIFFERANCE IN TIME FOR RETSTATUS GSTR1 IN HH:MM:SS ["+diffStatsHours +":"+diffStatsMinutes+":"+diffStatsSeconds+"]");
 				System.out.println("DIFFERANCE IN TIME FOR SAVE GSTR1 IN HH:MM:SS ["+diffHours +":"+diffMinutes+":"+diffSeconds+"]");
 				
 				APICallData apiCallData = new APICallData();
@@ -4454,7 +4494,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 					detInsSql = " INSERT INTO GST_DATA_DET (TRAN_ID, LINE_NO, STATUS, SR_NO__OLD, LINE_TYPE, GS_CODE, TAXABLE_AMT, IGST_PERC,"
 							  + " IGST_AMT, CGST_PERC, CGST_AMT, SGST_PERC, SGST_AMT, GS_DESCR, UNIT, QUANTITY, SUPPLY_TYPE, CESS_PERC, CESS_AMT,"
 							  + " REMARKS, ITC_TYPE, ITC_IGST, ITC_CGST, ITC_SGST, ITC_CESS, GST_RATE)"
-							  + " VALUES ()";
+							  + " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 					
 					detInsPstmt = conn.prepareStatement(detInsSql);
 					
@@ -4985,7 +5025,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 					detInsSql = " INSERT INTO GST_DATA_DET (TRAN_ID, LINE_NO, STATUS, SR_NO__OLD, LINE_TYPE, GS_CODE, TAXABLE_AMT, IGST_PERC,"
 							  + " IGST_AMT, CGST_PERC, CGST_AMT, SGST_PERC, SGST_AMT, GS_DESCR, UNIT, QUANTITY, SUPPLY_TYPE, CESS_PERC, CESS_AMT,"
 							  + " REMARKS, ITC_TYPE, ITC_IGST, ITC_CGST, ITC_SGST, ITC_CESS, GST_RATE)"
-							  + " VALUES ()";
+							  + " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 					
 					detInsPstmt = conn.prepareStatement(detInsSql);
 					

webitm-gst/ibase/webitm/util/gst/BaseSerializer.java

@@ -47,7 +47,7 @@ abstract class BaseSerializer<T extends BaseData> extends JsonSerializer<T>
             	{
             		json.writeStringField("sbpcode",inv.shippingPortCode);
             	}
-                if(inv.shippingBillNum >= 0)
+                if(inv.shippingBillNum > 0)
                 {
                 	json.writeNumberField("sbnum", inv.shippingBillNum);
                 }

webitm-gst/ibase/webitm/util/gst/HSNSerializer.java

@@ -54,10 +54,22 @@ public class HSNSerializer extends BaseSerializer<HSN>
 			json.writeNumberField("qty", hsnDetails.quantity);
 			json.writeNumberField("val", hsnDetails.totalAmount);
 			json.writeNumberField("txval", hsnDetails.totalTaxableAmount);
-			json.writeNumberField("iamt", hsnDetails.totalIGSTAmount);
-			json.writeNumberField("camt", hsnDetails.totalCGSTAmount);
-			json.writeNumberField("samt", hsnDetails.totalSGSTAmount);
-			json.writeNumberField("csamt", hsnDetails.totalCESSAmount);
+			if(hsnDetails.totalIGSTAmount > 0)
+			{
+				json.writeNumberField("iamt", hsnDetails.totalIGSTAmount);
+			}
+			if(hsnDetails.totalCGSTAmount > 0)
+			{
+				json.writeNumberField("camt", hsnDetails.totalCGSTAmount);
+			}
+			if(hsnDetails.totalSGSTAmount > 0)
+			{
+				json.writeNumberField("samt", hsnDetails.totalSGSTAmount);
+			}
+			if(hsnDetails.totalCESSAmount > 0)
+			{
+				json.writeNumberField("csamt", hsnDetails.totalCESSAmount);
+			}
 			
 			json.writeEndObject();
 		}