Skip to content

B
business-java
Commit 0cc9e546 authored by ajadhav's avatar ajadhav
Browse files
Options

pass userId in processRequest() method 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@177453 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 04eb069b
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 32 deletions
webitm-fin/ibase/webitm/ejb/fin/AcctBalTransPrc.java
View file @ 0cc9e546
......@@ -702,7 +702,11 @@ conn = getConnection();
System.out.println("...............just before savdata() ");
String siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
System.out.println("== site code == @"+siteCode);
retString = saveData(siteCode,xmlString,conn);
//Changes and Commented By Ajay on 02-01-2018:START
String userId1 = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"); System.out.println("--login code--"+userId);
//retString = saveData(siteCode,xmlString,conn);
retString = saveData(siteCode,xmlString,userId1,conn);
//Changes and Commented By Ajay on 02-01-2018:END
System.out.println("@@@@@2: retString: @"+retString);
System.out.println("--retString finished--");
String finParm = finCom.getFinparams("999999","TRF_JV_CONF", conn);
......@@ -772,7 +776,7 @@ conn = getConnection();
}
return input;
}
private String saveData(String siteCode,String xmlString, Connection conn) throws ITMException
private String saveData(String siteCode,String xmlString,String userId1, Connection conn) throws ITMException
{
System.out.println("saving data...........");
InitialContext ctx = null;
......@@ -785,7 +789,9 @@ conn = getConnection();
masterStateful = (MasterStatefulLocal)ctx.lookup("ibase/MasterStatefulEJB/local");
System.out.println("-----------masterStateful------- " + masterStateful);
String [] authencate = new String[2];
authencate[0] = "";
//Changes By Ajay on 02-01-2018:START
authencate[0] = userId1;
//Changes By Ajay on 02-01-2018:END
authencate[1] = "";
System.out.println("xmlString to masterstateful [" + xmlString + "]");
retString = masterStateful.processRequest(authencate, siteCode, true, xmlString,true,conn);
......
webitm-fin/ibase/webitm/ejb/fin/AutoPmtGenPrc.java
View file @ 0cc9e546
......@@ -2094,7 +2094,11 @@ conn = getConnection();
System.out.println("-lineNo before commit--" + lineNo);
if (lineNo > 0)
{
retString = saveData(siteCode, xmlOutString, conn);
//Changes and Commented By Ajay on 02-01-2018:START
String userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"); System.out.println("--login code--"+userId);
//retString = saveData(siteCode, xmlOutString, conn);
retString = saveData(siteCode, xmlOutString,userId, conn);
//Changes and Commented By Ajay on 02-01-2018:END
System.out.println(">>>After saveData() AutoPmtGenPrc retString:" + retString);
if ((retString != null) && (retString.trim().length() > 0))
{
......@@ -2470,7 +2474,7 @@ conn = getConnection();
return str;
}
private String saveData(String siteCode, String xmlString, Connection conn)
private String saveData(String siteCode, String xmlString,String userId, Connection conn)
throws ITMException
{
System.out.println("saving data...........");
......@@ -2484,7 +2488,9 @@ conn = getConnection();
masterStateful = (MasterStatefulLocal)ctx.lookup("ibase/MasterStatefulEJB/local");
System.out.println("-----------masterStateful------- " + masterStateful);
String[] authencate = new String[2];
authencate[0] = "";
//Changes By Ajay on 02-01-2018:START
authencate[0] = userId;
//Changes By Ajay on 02-01-2018:END
authencate[1] = "";
System.out.println("xmlString to masterstateful [" + xmlString + "]");
retString = masterStateful.processRequest(authencate, siteCode, true, xmlString, true, conn);
......
webitm-fin/ibase/webitm/ejb/fin/EcollectionSchedule.java
View file @ 0cc9e546
......@@ -49,6 +49,7 @@ public class EcollectionSchedule implements Schedule {
java.util.Date startDate = new java.util.Date(System.currentTimeMillis());
Calendar calendar = Calendar.getInstance();
String startDateStr = null;
public static void main(String args[]) {
EcollectionSchedule ecs = new EcollectionSchedule();
......@@ -389,7 +390,12 @@ public class EcollectionSchedule implements Schedule {
xmlBuff.append("</DocumentRoot>");
xmlString = xmlBuff.toString();
System.out.println("xmlString " + xmlString);
errString = saveData(siteCode, xmlString, scheduleParamXML, conn);
//Changes and Commented By Ajay on 02-01-2018:START
String userId = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
System.out.println("--login code--"+userId);
//errString = saveData(siteCode, xmlString, scheduleParamXML, conn);
errString = saveData(siteCode, xmlString, scheduleParamXML, userId,conn);
//Changes and Commented By Ajay on 02-01-2018:END
System.out
.println("Passed xml in master State full errString "
+ errString);
......@@ -510,7 +516,7 @@ public class EcollectionSchedule implements Schedule {
return errString;
}
private String saveData(String siteCode, String xmlString, String scheduleParamXML, Connection conn) throws ITMException {
private String saveData(String siteCode, String xmlString, String scheduleParamXML,String userId, Connection conn) throws ITMException {
UserInfoBean userInfo = null;
System.out.println("saving data...........");
InitialContext ctx = null;
......@@ -524,7 +530,9 @@ public class EcollectionSchedule implements Schedule {
System.out.println("-----------masterStateful------- " + masterStateful);
masterStateful.setUserInfo(userInfo);
String[] authencate = new String[2];
authencate[0] = "";
//Changes By Ajay on 02-01-2018:START
authencate[0] = userId;
//Changes By Ajay on 02-01-2018:END
authencate[1] = "";
System.out.println("xmlString to masterstateful [" + xmlString + "]");
//retString = masterStateful.processRequest(userInfo, xmlString, true, conn);
......
webitm-fin/ibase/webitm/ejb/fin/MatchVoucherConfSch.java
View file @ 0cc9e546
......@@ -593,8 +593,13 @@ public class MatchVoucherConfSch implements Schedule
System.out.println("Going to save data method++++++++++++++++++++++++");
if(xmlString != null && xmlString.trim().length()>0)
{
retString = saveData(loginSiteCode,xmlString,conn);
//Changes and Commented By Ajay on 02-01-2018:START
String userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"); System.out.println("--login code--"+userId);
//retString = saveData(loginSiteCode,xmlString,conn);
retString = saveData(loginSiteCode,xmlString,userId,conn);
//Changes and Commented By Ajay on 02-01-2018:END
}
System.out.println("retString at SAVE data :-"+retString);
//Generate new TRAN_ID here
......@@ -647,7 +652,7 @@ public class MatchVoucherConfSch implements Schedule
}
return insertCnt;
}
private String saveData(String siteCode,String xmlString, Connection conn) throws ITMException
private String saveData(String siteCode,String xmlString, String userId, Connection conn) throws ITMException
{
//System.out.println("saving data...........");
InitialContext ctx = null;
......@@ -660,7 +665,10 @@ public class MatchVoucherConfSch implements Schedule
masterStateful = (MasterStatefulLocal)ctx.lookup("ibase/MasterStatefulEJB/local");
System.out.println("-----------masterStateful------- " + masterStateful);
String [] authencate = new String[2];
authencate[0] = "";
//Changes By Ajay on 02-01-2018:START
authencate[0] = userId;
//Changes By Ajay on 28-12-2018:END
authencate[1] = "";
System.out.println("xmlString to masterstateful [" + xmlString + "]");
retString = masterStateful.processRequest(authencate, siteCode, true, xmlString,true,conn);
......
webitm-fin/ibase/webitm/ejb/fin/StockRevaluationAdjPrc.java
View file @ 0cc9e546
......@@ -33,6 +33,7 @@ public class StockRevaluationAdjPrc extends ProcessEJB implements StockRevaluati
String stockRevalAdjTranID="",tranTypeG="";
boolean isError=false,saveRecord=false;
FinCommon finCommonObj=new FinCommon();
E12GenericUtility genericUtility = new E12GenericUtility();
public String process(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException,ITMException
{
......@@ -394,7 +395,10 @@ conn = getConnection();
//fgfgf
if (detail2Xml.length() > 0){
errorString =saveRecordStockRevAdj(conn,headerXml,detail2Xml,siteCode);
//Changes and Commented By Ajay on 02-01-2018:START
//errorString =saveRecordStockRevAdj(conn,headerXml,detail2Xml,siteCode);
errorString =saveRecordStockRevAdj(conn,headerXml,detail2Xml,xtraParams,siteCode);
//Changes and Commented By Ajay on 02-01-2018:START
System.out.println("After Saving record errorString--->>["+errorString+"]");
isRecordPrc=true;
if (errorString.indexOf("Success") > -1)
......@@ -766,14 +770,20 @@ private String getAcctCctrCodeFromStock(Connection conn,String siteCode,String i
}
return acctCode+":"+cctrCode;
}
private String saveRecordStockRevAdj(Connection conn,String headerXml,String detailXml,String siteCode)
private String saveRecordStockRevAdj(Connection conn,String headerXml,String detailXml,String xtraParams, String siteCode)
{
String retString="",dbTranID="",xmlString="";
xmlString=headerXml + detailXml +"</Header0></group0></DocumentRoot>";
System.out.println("All xml Header And detail--->>["+xmlString+"]");
try{
retString=saveData(siteCode, xmlString, conn);
System.out.println("Stock reval. adj. Data saved successfully. retString : [["+retString+"]]");
//Changes and Commented By Ajay on 02-01-2018:START
String userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
System.out.println("--login code--"+userId);
//retString=saveData(siteCode, xmlString, conn);
retString=saveData(siteCode, xmlString,userId, conn);
//Changes and Commented By Ajay on 02-01-2018:END
System.out.println("Stock reval. adj. Data saved successfully. retString : [["+retString+"]]");
if (retString.indexOf("Success") > -1)
{
System.out.println("retString.indexOf(Success) > -1)");
......@@ -800,7 +810,7 @@ private String saveRecordStockRevAdj(Connection conn,String headerXml,String det
}
return retString;
}
private String saveData(String siteCode, String xmlString, Connection conn) throws ITMException
private String saveData(String siteCode, String xmlString,String userId, Connection conn) throws ITMException
{
System.out.println("saving data...........");
......@@ -814,7 +824,9 @@ private String saveData(String siteCode, String xmlString, Connection conn) thro
masterStateful = (MasterStatefulLocal)ctx.lookup("ibase/MasterStatefulEJB/local");
String [] authencate = new String[2];
authencate[0] = "";
//Changes By Ajay on 02/01/2018:START
authencate[0] = userId;
//Changes By Ajay on 02/01/2018:END
authencate[1] = "";
System.out.println("xmlString in masterStateful :::: " + xmlString);
retString = masterStateful.processRequest(authencate, siteCode, true, xmlString, true, conn);
......
webitm-fin/ibase/webitm/ejb/fin/adv/CalculateCommission.java
View file @ 0cc9e546
......@@ -1515,7 +1515,12 @@ public class CalculateCommission
tranIdDrn = "";
xmlString = (String) drnList.get(ctr);
System.out.println("saveDataDrn [" + ctr + "] xmlString ["+xmlString + "]");
errString = saveDataDrn(siteCode,xmlString,conn);
//Changes and Commented By Ajay on 02-01-2018:START
String userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
System.out.println("--login code--"+userId);
//errString = saveDataDrn(siteCode,xmlString,conn);
errString = saveDataDrn(siteCode,xmlString,userId,conn);
//Changes and Commented By Ajay on 02-01-2018:END
if((errString == null || errString.trim().length() ==0) && ("Y".equals(post)) )
{
tranIdList.add(tranIdDrn);
......@@ -2168,7 +2173,7 @@ public class CalculateCommission
return errString;
}
private String saveDataDrn(String siteCode,String xmlString, Connection conn) throws ITMException
private String saveDataDrn(String siteCode,String xmlString,String userId, Connection conn) throws ITMException
{
System.out.println("saving data...........");
InitialContext ctx = null;
......@@ -2181,7 +2186,9 @@ public class CalculateCommission
masterStateful = (MasterStatefulLocal)ctx.lookup("ibase/MasterStatefulEJB/local");
System.out.println("-----------masterStateful------- " + masterStateful);
String [] authencate = new String[2];
authencate[0] = "";
//Changes By Ajay on 02-01-2018:START
authencate[0] = userId;
//Changes By Ajay on 02-01-2018:END
authencate[1] = "";
System.out.println("xmlString to masterstateful [" + xmlString + "]");
retString = masterStateful.processRequest(authencate, siteCode, true, xmlString,true,conn);
......
webitm-fin/ibase/webitm/ejb/fin/adv/MiscVchEmpIConf.java
View file @ 0cc9e546
......@@ -472,7 +472,12 @@ private String generateMiscVoucher(String tranId, String xtraParams, String forc
xmlString = xmlBuff.toString();
System.out.println("Final xmlString---->>["+xmlString+"]");
retString = saveData(siteCode,xmlString,conn);
//Changes and Commented By Ajay on 02-01-2018:START
String userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
System.out.println("--login code--"+userId);
//retString = saveData(siteCode,xmlString,conn);
retString = saveData(siteCode,xmlString,userId,conn);
//Changes and Commented By Ajay on 02-01-2018:END
System.out.println("After save retString1234---->>["+retString+"]");
if (retString.indexOf("Success") > -1)
{
......@@ -508,7 +513,7 @@ private String generateMiscVoucher(String tranId, String xtraParams, String forc
if((errorStringMisc.indexOf("CONFSUCCES") > -1 || errorStringMisc.indexOf("VTSUCC1") > -1 )){
//conn.commit();
String str=generateAutoPayment(miscVoucherTranID, payMode,siteCode,currCode,tranType,conn);
String str=generateAutoPayment(miscVoucherTranID, payMode,siteCode,currCode,tranType,xtraParams,conn);
System.out.println("after generateAutoPayment12355-->["+str+"]");
if (str.indexOf("Success") > -1)
{
......@@ -541,7 +546,7 @@ private String generateMiscVoucher(String tranId, String xtraParams, String forc
public String saveData(String siteCode,String xmlString, Connection conn) throws ITMException
public String saveData(String siteCode,String xmlString, String userId,Connection conn) throws ITMException
{
System.out.println("saving data...........");
InitialContext ctx = null;
......@@ -553,7 +558,7 @@ public String saveData(String siteCode,String xmlString, Connection conn) throws
ctx = new InitialContext(appConnect.getProperty());
masterStateful = (MasterStatefulLocal)ctx.lookup("ibase/MasterStatefulEJB/local");
String [] authencate = new String[2];
authencate[0] = "";
authencate[0] = userId;
authencate[1] = "";
System.out.println("xmlString :::: " + xmlString+"END END END");
retString = masterStateful.processRequest(authencate, siteCode, true, xmlString,true,conn);
......@@ -586,8 +591,9 @@ public String saveData(String siteCode,String xmlString, Connection conn) throws
e.printStackTrace();
}
}*/
private String generateAutoPayment(ArrayList<String> miscTranID,String payMode,String siteCode,String currCode,String tranType,Connection conn)
private String generateAutoPayment(ArrayList<String> miscTranID,String payMode,String siteCode,String currCode,String tranType,String xtraParams,Connection conn)
{
System.out.println("-----in generateAutoPayment method-----");
System.out.println("payMode ---->>["+payMode+"]");
System.out.println("Misc.voucher Tranid List----->>["+miscTranID+"]");
......@@ -604,6 +610,8 @@ private String generateAutoPayment(ArrayList<String> miscTranID,String payMode,S
TreeSet treeObj = new TreeSet();
int count=0,countRcd=0;
try{
String userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
System.out.println("--login code--"+userId);
SimpleDateFormat sdf=new SimpleDateFormat( genericUtility.getApplDateFormat());
Calendar currentDate = Calendar.getInstance();
String tranDate = sdf.format(currentDate.getTime());
......@@ -872,7 +880,10 @@ private String generateAutoPayment(ArrayList<String> miscTranID,String payMode,S
xmlString = xmlStringBuff.toString();
xmlStringBuff=null;
System.out.println("Final xmlString misc. payments---->>["+xmlString+"]");
retString = saveData(siteCodeL,xmlString,conn);
//Changes and Commented By Ajay on 02-01-2018:START
//retString = saveData(siteCodeL,xmlString,conn);
retString = saveData(siteCodeL,xmlString,userId,conn);
//Changes and Commented By Ajay on 02-01-2018:END
System.out.println("After save retString---->>["+retString+"]");
if (retString.indexOf("Success") > -1)
{
......@@ -907,7 +918,10 @@ private String generateAutoPayment(ArrayList<String> miscTranID,String payMode,S
xmlString = xmlStringBuff.toString();
System.out.println("Final xmlString misc. payments Eletronic Mode---->>["+xmlString+"]");
retString = saveData(siteCodeL,xmlString,conn);
//Changes and Commented By Ajay on 02-01-2018:START
//retString = saveData(siteCodeL,xmlString,conn);
retString = saveData(siteCodeL,xmlString,userId,conn);
//Changes and Commented By Ajay on 02-01-2018:END
System.out.println("After save retString---->>["+retString+"]");
if (retString.indexOf("Success") > -1)
{
......
webitm-fin/ibase/webitm/ejb/fin/adv/PayVoucherComPrc.java
View file @ 0cc9e546
......@@ -15,7 +15,7 @@ import java.sql.*;
import ibase.webitm.ejb.sys.UtilMethods;
import org.apache.poi.hssf.record.formula.functions.Trim;
//import org.apache.poi.hssf.record.formula.functions.Trim;
import org.w3c.dom.*;
import javax.xml.parsers.*;
......@@ -3604,7 +3604,11 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
String siteCode="";
siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
System.out.println("== site code =="+siteCode);
retString = saveData(siteCode,xmlString,conn);
//Changes and Commented By Ajay on 02-01-2018:START
String userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"); System.out.println("--login code--"+userId);
//retString = saveData(siteCode,xmlString,conn);
retString = saveData(siteCode,xmlString,userId,conn);
//Changes and Commented By Ajay on 02-01-2018:END
System.out.println("@@@@@2: retString:"+retString);
System.out.println("--retString finished--");
if (retString.indexOf("Success") > -1)
......@@ -3664,7 +3668,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
}
return input;
}
private String saveData(String siteCode,String xmlString, Connection conn) throws ITMException
private String saveData(String siteCode,String xmlString,String userId, Connection conn) throws ITMException
{
System.out.println("saving data...........");
InitialContext ctx = null;
......@@ -3677,7 +3681,9 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
masterStateful = (MasterStatefulLocal)ctx.lookup("ibase/MasterStatefulEJB/local");
System.out.println("-----------masterStateful------- " + masterStateful);
String [] authencate = new String[2];
authencate[0] = "";
//Changes By Ajay on 02-01-2018:START
authencate[0] = userId;
//Changes By Ajay on 02-01-2018:END
authencate[1] = "";
System.out.println("xmlString to masterstateful [" + xmlString + "]");
retString = masterStateful.processRequest(authencate, siteCode, true, xmlString,true,conn);
......
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