F17ABAS001 source code commit

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

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

@@ -342,7 +342,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					long timeStamp = new Timestamp().getDateTime();
 					byte[] authSEK = null;
 					String loginCode = "", chgTerm = "", callStatus = "", responseId = "", responseJsonStr= "", recType = "";
-					String signDataXML = "";
+					String signDataXML = "", summaryDataJsonStr = "";
 					
 					System.out.println(" -------- Inside itemchange case 2222222 ------------ ");
 					if( currentColumn.trim().equalsIgnoreCase( "itm_default" ))
@@ -447,9 +447,9 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 						
 						transactionId = UUID.randomUUID().toString().replaceAll("-", "");
 
-						appKey = checkNull(e12GenericUtility.getColumnValue("app_key", dom1));
-						appKeyInBytes = aesEncryption.decodeBase64StringTOByte(appKey);
-						appKeyEncryptedAndCoded = pubKeyEncryption.encrypt(appKeyInBytes);
+						//appKey = checkNull(e12GenericUtility.getColumnValue("app_key", dom1));
+						//appKeyInBytes = aesEncryption.decodeBase64StringTOByte(appKey);
+						//appKeyEncryptedAndCoded = pubKeyEncryption.encrypt(appKeyInBytes);
 						
 						gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstinNo;
 						gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey);
@@ -555,20 +555,25 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 				        	{
 				        		if("SUBMIT".equalsIgnoreCase(action))
 				        		{
-				        			retXML += getGstr1Summary(authToken, stateCode, userName, gstinNo, periodCode, authSEK, appKeyEncryptedAndCoded, xtraParams, conn);
+				        			summaryDataJsonStr += getGstr1Summary(authToken, stateCode, userName, gstinNo, periodCode, authSEK, appKeyEncryptedAndCoded, xtraParams, conn);
+				        			if(summaryDataJsonStr!= null && summaryDataJsonStr.trim().length() > 0)
+				        			{
+				        				retXML += "<summary_data>" + XML.toString(new JSONObject(summaryDataJsonStr)) + "</summary_data>";
+				        			}
 				        			retXML += downloadGstr1Data(gstinNo, periodCode, authToken, userName, stateCode, appKeyEncryptedAndCoded, xtraParams, authSEK);
 				        		}
 				        		else if("FILE".equalsIgnoreCase(action))
 				        		{
-				        			retXML += getGstr1Summary(authToken, stateCode, userName, gstinNo, periodCode, authSEK, appKeyEncryptedAndCoded, xtraParams, conn);
+				        			summaryDataJsonStr += getGstr1Summary(authToken, stateCode, userName, gstinNo, periodCode, authSEK, appKeyEncryptedAndCoded, xtraParams, conn);
+				        			retXML = "<summary_data>" + XML.toString(new JSONObject(summaryDataJsonStr)) + "</summary_data>";
 				        		}
 				        	}
 				        }
 				        
-						
 				        valueXmlString.append("<Detail2 domID='1'>");
 				        valueXmlString.append("<auth_token><![CDATA["+ authToken +"]]></auth_token>");
 				        valueXmlString.append("<auth_sek><![CDATA["+ sek +"]]></auth_sek>");
+				        valueXmlString.append("<summary_data><![CDATA["+ summaryDataJsonStr +"]]></summary_data>");
 				        valueXmlString.append(signDataXML);
 				        valueXmlString.append("</Detail2>" );
 				        valueXmlString.append("<Detail2 domID='2'>");
@@ -782,6 +787,29 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 						}
 						if("SUBMIT".equalsIgnoreCase(action))
 						{
+							sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = '1' AND SUBMIT_STATUS = 'S' 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( "VTSUBALRDY" );
+									errFields.add("returns_type");
+								}
+							}
+							if(pstmt!=null)
+							{
+								pstmt.close();
+								pstmt = null;
+							}
+							if(rs!=null)
+							{
+								rs.close();
+								rs = null;
+							}
 							sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = '1' AND SUBMIT_STATUS = 'T' AND PRD_CODE = ? AND SITE_CODE = ?";
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1, periodCode);
@@ -1389,7 +1417,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					
 					JSONObject gstr1SumryJsonObj = new JSONObject(new String(respJsonInBytes));
 
-					retString = "<summary_data>" + XML.toString(gstr1SumryJsonObj) + "</summary_data>";
+					//retString = "<summary_data>" + XML.toString(gstr1SumryJsonObj) + "</summary_data>";
+					retString = gstr1SumryJsonObj.toString();
 					
 					System.out.println("retString in getGstr1Summary["+retString+"]");
 				}

webitm-gst/ibase/webitm/servlet/gst/GSTDataSubmitWizServlet.java

@@ -45,9 +45,34 @@ public class GSTDataSubmitWizServlet extends HttpServlet
 			action = request.getParameter("action");
 			System.out.println("GSTDataSubmitWizServlet ACTION ["+action+"]");
 			
-			if("".equalsIgnoreCase(action))
+			if("SAVE_HTML_DATA".equalsIgnoreCase(action))
 			{
+				String prevHTMLData = request.getParameter("HTML_DATA");
+				request.getSession().setAttribute( "GST_WIZ_HTML_DATA", prevHTMLData);
+			}
+			else if("DISPLAY_HTML_DATA".equalsIgnoreCase(action))
+			{
+				String htmlDataErr = (String) request.getSession().getAttribute( "GST_WIZ_HTML_DATA");
+				request.getSession().removeAttribute( "GST_WIZ_HTML_DATA");
 				
+				response.setContentType("text/html");
+		         
+		        if(CommonConstants.CONTENT_ENCODING != null && CommonConstants.CONTENT_ENCODING.equalsIgnoreCase("gzip"))
+				{
+					response.setHeader("Content-Encoding", "gzip");
+					GZIPOutputStream gzOutStream = new GZIPOutputStream(response.getOutputStream());
+					gzOutStream.write(htmlDataErr.getBytes());
+					gzOutStream.flush();
+					gzOutStream.close();
+				}
+				else
+				{
+					response.setHeader("Content-Encoding", CommonConstants.CONTENT_ENCODING);
+					OutputStream outStream = response.getOutputStream();
+					outStream.write(htmlDataErr.getBytes());
+					outStream.flush();
+					outStream.close();
+				}
 			}
 			else
 			{