Skip to content

B
business-java
Commit 699c6be0 authored by pborate's avatar pborate
Browse files
Options

Updated all sysout to baselogger 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@198696 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d5f1bfab
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 38 deletions
webitm-dashboard/ibase/dashboard/scm/ejb/SalesTrends.java
View file @ 699c6be0
...@@ -20,6 +20,7 @@ import org.w3c.dom.Node; ...@@ -20,6 +20,7 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import ibase.system.config.ConnDriver; import ibase.system.config.ConnDriver;
import ibase.utility.BaseLogger;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
...@@ -37,9 +38,10 @@ public class SalesTrends extends ValidatorEJB ...@@ -37,9 +38,10 @@ public class SalesTrends extends ValidatorEJB
@SuppressWarnings({ "null", "unchecked" }) @SuppressWarnings({ "null", "unchecked" })
public String getSalesSummary( String dataSourceName ) throws Exception public String getSalesSummary( String dataSourceName ) throws Exception
{ {
System.out.println("INSIDE SalesTrends ::::::::::::::: getSalesSummary ["+dataSourceName+"]"); BaseLogger.log("3",null,null,"INSIDE SalesTrends ::::::::::::::: getSalesSummary ["+dataSourceName+"]");
JSONObject dashboardConfig = (JSONObject) xmlToJson(dataSourceName); JSONObject dashboardConfig = (JSONObject) xmlToJson(dataSourceName);
System.out.println("Inside get sales Summary "+dashboardConfig); BaseLogger.log("3",null,null,"Inside get sales Summary "+dashboardConfig);
JSONObject growthValueArray=new JSONObject(); JSONObject growthValueArray=new JSONObject();
JSONObject group0=dashboardConfig.optJSONObject("group0"); JSONObject group0=dashboardConfig.optJSONObject("group0");
JSONObject Header0=group0.optJSONObject("Header0"); JSONObject Header0=group0.optJSONObject("Header0");
...@@ -55,21 +57,21 @@ public class SalesTrends extends ValidatorEJB ...@@ -55,21 +57,21 @@ public class SalesTrends extends ValidatorEJB
if(period =="" || period.equalsIgnoreCase("{}")) { if(period =="" || period.equalsIgnoreCase("{}")) {
period= simpleDateFormat.format(date); period= simpleDateFormat.format(date);
} }
System.out.println("Period:::::::::::::: "+period+" "+date); BaseLogger.log("3",null,null,"Period:::::::::::::: "+period+" "+date);
String period1=getPeriod(period); String period1=getPeriod(period);
Double growthValue=0.0; Double growthValue=0.0;
System.out.println("period >>>>"+period); BaseLogger.log("3",null,null,"period >>>>"+period);
if(period !="" && !period.equalsIgnoreCase("{}")) { if(period !="" && !period.equalsIgnoreCase("{}")) {
System.out.println("period >>>>Inside"); BaseLogger.log("3",null,null,"period >>>>Inside");
String year =period.substring(0, 4); String year =period.substring(0, 4);
String month =period.substring(4,6 ); String month =period.substring(4,6 );
JSONArray netSummary=getNetAvg(year); JSONArray netSummary=getNetAvg(year);
System.out.println("net netSummary "+netSummary); BaseLogger.log("3",null,null,"net netSummary "+netSummary);
Integer year1=Integer.parseInt(year)-1; Integer year1=Integer.parseInt(year)-1;
year=year1.toString(); year=year1.toString();
JSONArray netSummaryPrv=getNetAvg(year); JSONArray netSummaryPrv=getNetAvg(year);
System.out.println("net netSummaryPrv "+netSummaryPrv); BaseLogger.log("3",null,null,"net netSummaryPrv "+netSummaryPrv);
growthValueArray=calculateGross(netSummary, netSummaryPrv); growthValueArray=calculateGross(netSummary, netSummaryPrv);
} }
...@@ -98,10 +100,10 @@ public class SalesTrends extends ValidatorEJB ...@@ -98,10 +100,10 @@ public class SalesTrends extends ValidatorEJB
{ {
salesSummaryArr = new JSONArray(); salesSummaryArr = new JSONArray();
System.out.println("BEFORE CONN ESTBD"); BaseLogger.log("3",null,null,"BEFORE CONN ESTBD");
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB( getUserInfo().getTransDB() ); conn = connDriver.getConnectDB( getUserInfo().getTransDB() );
System.out.println("AFTER CONN ESTBD"); BaseLogger.log("3",null,null,"AFTER CONN ESTBD");
StringBuffer sqlCurrYear = new StringBuffer(); StringBuffer sqlCurrYear = new StringBuffer();
JSONObject rowData = null; JSONObject rowData = null;
...@@ -169,7 +171,7 @@ public class SalesTrends extends ValidatorEJB ...@@ -169,7 +171,7 @@ public class SalesTrends extends ValidatorEJB
.append(" AND DSS.SITE_CODE <= '"+SITE_CODE_TO+"' ") .append(" AND DSS.SITE_CODE <= '"+SITE_CODE_TO+"' ")
.append( period1); .append( period1);
System.out.println("SQL QUERY EXECUTED ::::::::::::::::: " + sqlCurrYear ); BaseLogger.log("3",null,null,"SQL QUERY EXECUTED ::::::::::::::::: " + sqlCurrYear );
pStmt = conn.prepareStatement( sqlCurrYear.toString() ); pStmt = conn.prepareStatement( sqlCurrYear.toString() );
rs = pStmt.executeQuery(); rs = pStmt.executeQuery();
...@@ -182,7 +184,7 @@ public class SalesTrends extends ValidatorEJB ...@@ -182,7 +184,7 @@ public class SalesTrends extends ValidatorEJB
String docMonth=rs.getString("DSS_MONTH"); String docMonth=rs.getString("DSS_MONTH");
String docYear=rs.getString("DSS_YEAR"); String docYear=rs.getString("DSS_YEAR");
docDate=genericUtility.getValidDateString(docDate, dbDate, applDate); docDate=genericUtility.getValidDateString(docDate, dbDate, applDate);
System.out.println("doc date "+docDate); BaseLogger.log("3",null,null,"doc date "+docDate);
rowData = new JSONObject(); rowData = new JSONObject();
rowData.put("DOC_DATE", docDate); rowData.put("DOC_DATE", docDate);
...@@ -221,18 +223,18 @@ public class SalesTrends extends ValidatorEJB ...@@ -221,18 +223,18 @@ public class SalesTrends extends ValidatorEJB
rowData.put("PRODUCT_LINE_DESCR", rs.getString("PRODUCT_LINE_DESCR")); rowData.put("PRODUCT_LINE_DESCR", rs.getString("PRODUCT_LINE_DESCR"));
rowData.put("NET SALES VALUE", rs.getInt("NET_SALES_VALUE")); rowData.put("NET SALES VALUE", rs.getInt("NET_SALES_VALUE"));
String formatDate=docYear+docMonth; String formatDate=docYear+docMonth;
System.out.println("format date "+formatDate); BaseLogger.log("3",null,null,"format date "+formatDate);
Double growth=0.0; Double growth=0.0;
System.out.println("growthValueArray.length() ["+growthValueArray+"]"); BaseLogger.log("3",null,null,"growthValueArray.length() ["+growthValueArray+"]");
String growth1=growthValueArray.optString(formatDate); String growth1=growthValueArray.optString(formatDate);
System.out.println("growthvalue growth "+growth1); BaseLogger.log("3",null,null,"growthvalue growth "+growth1);
if(growth1 != null ) { if(growth1 != null ) {
rowData.put("GROWTH",growth1); rowData.put("GROWTH",growth1);
System.out.println("growthvalue rowData if "+rowData); BaseLogger.log("3",null,null,"growthvalue rowData if "+rowData);
} }
else { else {
rowData.put("GROWTH",0.0); rowData.put("GROWTH",0.0);
System.out.println("growthvalue rowData else "+rowData); BaseLogger.log("3",null,null,"growthvalue rowData else "+rowData);
} }
...@@ -241,7 +243,7 @@ public class SalesTrends extends ValidatorEJB ...@@ -241,7 +243,7 @@ public class SalesTrends extends ValidatorEJB
} }
salesTrendsData = salesSummaryArr.toString(); salesTrendsData = salesSummaryArr.toString();
System.out.println("getSalesSummary DATA :::::::::::::: " + salesTrendsData); BaseLogger.log("3",null,null,"getSalesSummary DATA :::::::::::::: " + salesTrendsData);
if( pStmt != null ) if( pStmt != null )
{ {
...@@ -257,7 +259,7 @@ public class SalesTrends extends ValidatorEJB ...@@ -257,7 +259,7 @@ public class SalesTrends extends ValidatorEJB
catch(Exception e ) catch(Exception e )
{ {
System.err.println( "Exception :: SalesTrends : getSalesSummary : ["+ e.getMessage() +"]" ); BaseLogger.log("0",null,null, "Exception :: SalesTrends : getSalesSummary : ["+ e.getMessage() +"]" );
throw new ITMException(e); throw new ITMException(e);
} }
finally finally
...@@ -290,7 +292,7 @@ public class SalesTrends extends ValidatorEJB ...@@ -290,7 +292,7 @@ public class SalesTrends extends ValidatorEJB
private String getPeriod(String period) throws Exception { private String getPeriod(String period) throws Exception {
System.out.println("Get Period "+period); BaseLogger.log("3",null,null,"Get Period "+period);
String period1=""; String period1="";
PreparedStatement pStmt = null; PreparedStatement pStmt = null;
ResultSet rs = null; ResultSet rs = null;
...@@ -308,24 +310,24 @@ public class SalesTrends extends ValidatorEJB ...@@ -308,24 +310,24 @@ public class SalesTrends extends ValidatorEJB
String sqlCurrYear = "SELECT FR_DATE,TO_DATE FROM ACCTPRD WHERE CODE=(SELECT ACCT_PRD FROM PERIOD WHERE CODE='"+period+"')"; String sqlCurrYear = "SELECT FR_DATE,TO_DATE FROM ACCTPRD WHERE CODE=(SELECT ACCT_PRD FROM PERIOD WHERE CODE='"+period+"')";
System.out.println("SQL QUERY getPeriod ::::::::::::::::: " + sqlCurrYear ); BaseLogger.log("3",null,null,"SQL QUERY getPeriod ::::::::::::::::: " + sqlCurrYear );
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dbDate); SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dbDate);
pStmt = conn.prepareStatement( sqlCurrYear ); pStmt = conn.prepareStatement( sqlCurrYear );
rs = pStmt.executeQuery(); rs = pStmt.executeQuery();
while( rs.next() ) while( rs.next() )
{ {
System.out.println("date >>>>>>>>>>>>>["+rs.getDate("fr_date")+"] ["+rs.getDate("to_date")+"]"); BaseLogger.log("3",null,null,"date >>>>>>>>>>>>>["+rs.getDate("fr_date")+"] ["+rs.getDate("to_date")+"]");
Date frmDate=rs.getDate("FR_DATE"); Date frmDate=rs.getDate("FR_DATE");
Date toDate=rs.getDate("TO_DATE"); Date toDate=rs.getDate("TO_DATE");
String frmDate1=simpleDateFormat.format(frmDate); String frmDate1=simpleDateFormat.format(frmDate);
String toDate1=simpleDateFormat.format(toDate); String toDate1=simpleDateFormat.format(toDate);
System.out.println("date ::::::::::::::["+frmDate1+"] ["+toDate1+"]"); BaseLogger.log("3",null,null,"date ::::::::::::::["+frmDate1+"] ["+toDate1+"]");
period1=" and DSS.DOC_DATE between TO_DATE('"+ frmDate1+"','"+dbDate+"') AND TO_DATE('"+toDate1+"','"+dbDate+"')"; period1=" and DSS.DOC_DATE between TO_DATE('"+ frmDate1+"','"+dbDate+"') AND TO_DATE('"+toDate1+"','"+dbDate+"')";
System.out.println(">>>>>>>>>.. "+period1); BaseLogger.log("3",null,null,">>>>>>>>>.. "+period1);
} }
System.out.println("period :::::"+period1); BaseLogger.log("3",null,null,"period :::::"+period1);
if( pStmt != null ) if( pStmt != null )
...@@ -343,7 +345,7 @@ public class SalesTrends extends ValidatorEJB ...@@ -343,7 +345,7 @@ public class SalesTrends extends ValidatorEJB
catch(Exception e ) catch(Exception e )
{ {
System.err.println( "Exception :: SalesTrends : getSalesSummary : ["+ e.getMessage() +"]" ); BaseLogger.log("0",null,null, "Exception :: SalesTrends : getSalesSummary : ["+ e.getMessage() +"]" );
throw new ITMException(e); throw new ITMException(e);
} }
finally finally
...@@ -377,7 +379,7 @@ public class SalesTrends extends ValidatorEJB ...@@ -377,7 +379,7 @@ public class SalesTrends extends ValidatorEJB
private JSONArray getNetAvg(String year) throws ITMException { private JSONArray getNetAvg(String year) throws ITMException {
System.out.println("get net avg ["+year+"] "); BaseLogger.log("3",null,null,"get net avg ["+year+"] ");
PreparedStatement pStmt = null; PreparedStatement pStmt = null;
ResultSet rs = null; ResultSet rs = null;
Connection conn = null; Connection conn = null;
...@@ -398,7 +400,7 @@ public class SalesTrends extends ValidatorEJB ...@@ -398,7 +400,7 @@ public class SalesTrends extends ValidatorEJB
" group by DSS_YEAR, DSS_MONTH " + " group by DSS_YEAR, DSS_MONTH " +
" order by DSS_YEAR, DSS_MONTH "; " order by DSS_YEAR, DSS_MONTH ";
System.out.println("SQL QUERY EXECUTED ::::::::::::::::: " + sqlCurrYear ); BaseLogger.log("3",null,null,"SQL QUERY EXECUTED ::::::::::::::::: " + sqlCurrYear );
pStmt = conn.prepareStatement( sqlCurrYear ); pStmt = conn.prepareStatement( sqlCurrYear );
rs = pStmt.executeQuery(); rs = pStmt.executeQuery();
...@@ -426,7 +428,7 @@ public class SalesTrends extends ValidatorEJB ...@@ -426,7 +428,7 @@ public class SalesTrends extends ValidatorEJB
catch(Exception e ) catch(Exception e )
{ {
System.err.println( "Exception :: SalesTrends : getSalesSummary : ["+ e.getMessage() +"]" ); BaseLogger.log("0",null,null, "Exception :: SalesTrends : getSalesSummary : ["+ e.getMessage() +"]" );
throw new ITMException(e); throw new ITMException(e);
} }
finally finally
...@@ -454,7 +456,7 @@ public class SalesTrends extends ValidatorEJB ...@@ -454,7 +456,7 @@ public class SalesTrends extends ValidatorEJB
e.printStackTrace(); e.printStackTrace();
} }
} }
System.out.println("row data "+netAvg); BaseLogger.log("3",null,null,"row data "+netAvg);
return netAvg; return netAvg;
} }
...@@ -501,7 +503,7 @@ public class SalesTrends extends ValidatorEJB ...@@ -501,7 +503,7 @@ public class SalesTrends extends ValidatorEJB
} }
} }
} }
//System.out.println("jsonObj>>" + jsonObj); //BaseLogger.log("3",null,null,"jsonObj>>" + jsonObj);
// do children // do children
if (xmlObj.hasChildNodes()) { if (xmlObj.hasChildNodes()) {
...@@ -528,7 +530,7 @@ public class SalesTrends extends ValidatorEJB ...@@ -528,7 +530,7 @@ public class SalesTrends extends ValidatorEJB
} }
else if( !"#text".equalsIgnoreCase(childNodeName) ) else if( !"#text".equalsIgnoreCase(childNodeName) )
{ {
System.out.println(childNodeName + "<<childNodeValue>>" + childNodeValue); BaseLogger.log("3",null,null,childNodeName + "<<childNodeValue>>" + childNodeValue);
if( jsonObj.optJSONObject(childNodeName) != null ) if( jsonObj.optJSONObject(childNodeName) != null )
{ {
...@@ -549,7 +551,7 @@ public class SalesTrends extends ValidatorEJB ...@@ -549,7 +551,7 @@ public class SalesTrends extends ValidatorEJB
} }
} }
} }
//System.out.println(xmlObj.getNodeName() + ">>childNodeName>" + jsonObj); //BaseLogger.log("3",null,null,xmlObj.getNodeName() + ">>childNodeName>" + jsonObj);
return jsonObj; return jsonObj;
} }
//CURRENT : 10 PREV : 12 //CURRENT : 10 PREV : 12
...@@ -562,7 +564,7 @@ public class SalesTrends extends ValidatorEJB ...@@ -562,7 +564,7 @@ public class SalesTrends extends ValidatorEJB
private JSONObject calculateGross(JSONArray netSummary,JSONArray netSummaryPrv) throws JSONException{ private JSONObject calculateGross(JSONArray netSummary,JSONArray netSummaryPrv) throws JSONException{
JSONArray growthArray=new JSONArray(); JSONArray growthArray=new JSONArray();
JSONObject growthObject=new JSONObject(); JSONObject growthObject=new JSONObject();
System.out.println("netSummary "+netSummary.length()+" netSummaryPrv "+netSummaryPrv.length()); BaseLogger.log("3",null,null,"netSummary "+netSummary.length()+" netSummaryPrv "+netSummaryPrv.length());
for(int i = 0; i < netSummary.length(); i++) { for(int i = 0; i < netSummary.length(); i++) {
Double growthValue=0.0; Double growthValue=0.0;
...@@ -572,12 +574,12 @@ public class SalesTrends extends ValidatorEJB ...@@ -572,12 +574,12 @@ public class SalesTrends extends ValidatorEJB
Double netAmount=netSummaryObj.optDouble("NET_AVG"); Double netAmount=netSummaryObj.optDouble("NET_AVG");
for(int j = 0; j < netSummaryPrv.length(); j++) { for(int j = 0; j < netSummaryPrv.length(); j++) {
JSONObject netSummaryObjPvs=netSummaryPrv.optJSONObject(j); JSONObject netSummaryObjPvs=netSummaryPrv.optJSONObject(j);
System.out.println("first for loop i ["+i+"] j ["+j+"]"); BaseLogger.log("3",null,null,"first for loop i ["+i+"] j ["+j+"]");
String monthPvs=netSummaryObjPvs.optString("DSS_MONTH"); String monthPvs=netSummaryObjPvs.optString("DSS_MONTH");
if(monthPvs.equalsIgnoreCase(month)) { if(monthPvs.equalsIgnoreCase(month)) {
String yearPvs=netSummaryObjPvs.optString("DSS_YEAR"); String yearPvs=netSummaryObjPvs.optString("DSS_YEAR");
Double netAmountPvs=netSummaryObjPvs.optDouble("NET_AVG"); Double netAmountPvs=netSummaryObjPvs.optDouble("NET_AVG");
System.out.println("calculateGross1 monthPvs ["+monthPvs+"] yearPvs ["+yearPvs+"] netAmountPvs ["+netAmountPvs+"]" +"] netAmount ["+netAmount+"]"); BaseLogger.log("3",null,null,"calculateGross1 monthPvs ["+monthPvs+"] yearPvs ["+yearPvs+"] netAmountPvs ["+netAmountPvs+"]" +"] netAmount ["+netAmount+"]");
Double minusNet=netAmount-netAmountPvs; Double minusNet=netAmount-netAmountPvs;
// if(netAmount != 0.0) { // if(netAmount != 0.0) {
// growthValue=(minusNet/netAmount)*100; // growthValue=(minusNet/netAmount)*100;
...@@ -588,15 +590,15 @@ public class SalesTrends extends ValidatorEJB ...@@ -588,15 +590,15 @@ public class SalesTrends extends ValidatorEJB
else { else {
growthValue=0.0; growthValue=0.0;
} }
System.out.println("Inside ccount gross value "+growthValue); BaseLogger.log("3",null,null,"Inside ccount gross value "+growthValue);
growthObject.put(year+month, growthValue); growthObject.put(year+month, growthValue);
System.out.println("Inside ccount gross growthObject "+growthObject); BaseLogger.log("3",null,null,"Inside ccount gross growthObject "+growthObject);
// growthArray.put(growthObject); // growthArray.put(growthObject);
break; break;
} }
} }
} }
System.out.println("Inside ccount gross growthArray "+growthObject); BaseLogger.log("3",null,null,"Inside ccount gross growthArray "+growthObject);
return growthObject; return growthObject;
} }
......
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