Skip to content

B
business-java
Commit 97837b8e authored by mchaudhari's avatar mchaudhari
Browse files
Options

add two Acc_Filt an Def_Filt column in brow window and update them 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95286 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8616efa0
Show whitespace changes
Inline Side-by-side
Showing with 1530 additions and 1496 deletions
webitm-sys/ibase/webitm/ejb/sys/UserRightsPrc.java
View file @ 97837b8e
......@@ -238,25 +238,21 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U
userRightsMap = new HashMap();
winNameMap = new HashMap();
menuNameMap = new HashMap();
// Change in query by mahesh on 16-06-2014 Add USER_RIGHTS.ACC_FILT and USER_RIGHTS.DEF_FILT columns.
sqlStr = " SELECT ITM2MENU.APPLICATION, " +
" ITM2MENU.LEVEL_1, " +
" ITM2MENU.LEVEL_2, " +
" ITM2MENU.LEVEL_3, " +
" ITM2MENU.LEVEL_4, " +
" ITM2MENU.LEVEL_5, " +
" ITM2MENU.WIN_NAME, " +
" ITM2MENU.DESCR, " +
" (SELECT USER_RIGHTS.RIGHTS FROM USER_RIGHTS " +
" WHERE USER_RIGHTS.PROFILE_ID = ? " +
" AND USER_RIGHTS.APPLICATION = ITM2MENU.APPLICATION " +
" AND USER_RIGHTS.MENU_ROW = ITM2MENU.LEVEL_1 " +
" AND USER_RIGHTS.MENU_COL = ITM2MENU.LEVEL_2 " +
" AND USER_RIGHTS.MENU_SUBCOL = ITM2MENU.LEVEL_3 " +
" AND USER_RIGHTS.LEVEL_4 = ITM2MENU.LEVEL_4 " +
" AND USER_RIGHTS.LEVEL_5 = ITM2MENU.LEVEL_5 " +
" ) AS RIGHTS " +
" FROM ITM2MENU " ;
" ITM2MENU.DESCR, USER_RIGHTS.RIGHTS, COALESCE(USER_RIGHTS.ACC_FILT,' ') AS ACC_FILT, COALESCE(USER_RIGHTS.DEF_FILT,' ') AS DEF_FILT , ITM2MENU.WIN_NAME" +
" FROM ITM2MENU LEFT OUTER JOIN USER_RIGHTS ON USER_RIGHTS.PROFILE_ID = ? " +
" AND USER_RIGHTS.APPLICATION = ITM2MENU.APPLICATION "+
" AND USER_RIGHTS.MENU_ROW = ITM2MENU.LEVEL_1 "+
" AND USER_RIGHTS.MENU_COL = ITM2MENU.LEVEL_2 "+
" AND USER_RIGHTS.MENU_SUBCOL = ITM2MENU.LEVEL_3 "+
" AND USER_RIGHTS.LEVEL_4 = ITM2MENU.LEVEL_4 "+
" AND USER_RIGHTS.LEVEL_5 = ITM2MENU.LEVEL_5 " ;
if (usrLev > 0 )
{
sqlStr = sqlStr + " where exists (select 1 from user_rights u "
......@@ -266,7 +262,7 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U
+ " and u.menu_col = ITM2MENU.level_2 "
+ " and u.menu_subcol = ITM2MENU.level_3 "
+ " and u.level_4 = ITM2MENU.level_4 "
+ " and u.level_5 = ITM2MENU.level_5) " ;
+ " and u.level_5 = ITM2MENU.level_5)" ;
}
sqlStr = sqlStr + " ORDER BY ITM2MENU.APPLICATION, ITM2MENU.LEVEL_1, ITM2MENU.LEVEL_2, ITM2MENU.LEVEL_3, ITM2MENU.LEVEL_4, ITM2MENU.LEVEL_5 ";
......@@ -277,7 +273,6 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U
rs = pstmt.executeQuery();
while (rs.next())
{
tApplication = rs.getString(1);
if(tApplication != null)
......@@ -323,7 +318,12 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U
retTabSepStrBuff.append("<descr>").append("<![CDATA[" + (rs.getString("DESCR")==null?"":rs.getString("DESCR")) +"]]>").append("</descr>");
//RIGHTS
//retTabSepStrBuff.append(rs.getString(9)==null?"":rs.getString(9)).append("\t");
retTabSepStrBuff.append("<rights>").append("<![CDATA[" + (rs.getString("RIGHTS")==null?"":rs.getString("RIGHTS")) +"]]>").append("</rights>");
retTabSepStrBuff.append("<rights>").append("<![CDATA[" + (rs.getString("RIGHTS")==null?" ":rs.getString("RIGHTS")) +"]]>").append("</rights>");
// Added by mahesh on 16-06-2014
retTabSepStrBuff.append("<acc_filt>").append("<![CDATA[" + rs.getString("ACC_FILT") +"]]>").append("</acc_filt>");
retTabSepStrBuff.append("<def_filt>").append("<![CDATA[" + rs.getString("DEF_FILT") +"]]>").append("</def_filt>");
// End of code added by mahesh
//WIN_NAME
tWinName = rs.getString("WIN_NAME");
......@@ -462,14 +462,16 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U
profileId = genericUtility.getColumnValue("profile_id", headerDom);
System.out.println("profileId..............."+profileId);
String batchInesertSql = "INSERT INTO USER_RIGHTS ( PROFILE_ID, APPLICATION, MENU_ROW, MENU_COL, MENU_SUBCOL, LEVEL_4, LEVEL_5, MENU_NAME, RIGHTS, OBJ_NAME)"
+ " VALUES ( '" + profileId + "' , ?, ?, ?, ?, ?, ?, ?, ?,? )";
String batchInesertSql = "INSERT INTO USER_RIGHTS ( PROFILE_ID, APPLICATION, MENU_ROW, MENU_COL, MENU_SUBCOL, LEVEL_4, LEVEL_5, MENU_NAME, RIGHTS, OBJ_NAME, ACC_FILT, DEF_FILT)"
+ " VALUES ( '" + profileId + "' , ?, ?, ?, ?, ?, ?, ?, ?,?, ?, ? )";
System.out.println("Insert Sql :: " + batchInesertSql);
String batchUpdateSql = "UPDATE USER_RIGHTS SET " +
" RIGHTS = ?, " +
" OBJ_NAME = ? " +
" OBJ_NAME = ?, " +
" ACC_FILT = ?, " +
" DEF_FILT = ? " +
" WHERE PROFILE_ID = '" + profileId + "' " +
" AND APPLICATION = ? " +
" AND MENU_ROW = ? " +
......@@ -629,6 +631,31 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U
rights ="";
}
}
// added by mahesh on 16-06-2014
if (childNodeName.equals("acc_filt"))
{
if (childNode.getFirstChild() != null )
{
accFilt = (childNode.getFirstChild().getNodeValue());
}
else
{
accFilt ="";
}
}
if (childNodeName.equals("def_filt"))
{
if (childNode.getFirstChild() != null )
{
defFilt = (childNode.getFirstChild().getNodeValue());
}
else
{
defFilt ="";
}
}
// end Of Code added by mahesh
}
//winName=this.genericUtility.getColumnValue("win_name", detailDom);
winName = genericUtility.getColumnValueFromNode("win_name",detailDom.getElementsByTagName("Detail2").item(selectedRow));// added by akhilesh on 22/nov/12
......@@ -808,6 +835,9 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U
pInsertStmt.setString(7, menuName);
pInsertStmt.setString(8, rights.trim());
pInsertStmt.setString(9, objName);
// Added by mahesh on 16-06-2014
pInsertStmt.setString(10, accFilt);
pInsertStmt.setString(11, defFilt);
insertCount++;
pInsertStmt.addBatch();
}
......@@ -816,12 +846,16 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U
pUpdateStmt.setString(1, rights.trim());
//pUpdateStmt.setString(2, profileId);
pUpdateStmt.setString(2, objName);
pUpdateStmt.setString(3, application);
pUpdateStmt.setInt(4, Integer.parseInt(level1));
pUpdateStmt.setInt(5, Integer.parseInt(level2));
pUpdateStmt.setInt(6, Integer.parseInt(level3));
pUpdateStmt.setInt(7, Integer.parseInt(level4));
pUpdateStmt.setInt(8, Integer.parseInt(level5));
// Added by mahesh on 16-06-2014
pUpdateStmt.setString(3, accFilt);
pUpdateStmt.setString(4, defFilt);
// End of code added by mahesh
pUpdateStmt.setString(5, application);
pUpdateStmt.setInt(6, Integer.parseInt(level1));
pUpdateStmt.setInt(7, Integer.parseInt(level2));
pUpdateStmt.setInt(8, Integer.parseInt(level3));
pUpdateStmt.setInt(9, Integer.parseInt(level4));
pUpdateStmt.setInt(10, Integer.parseInt(level5));
updateCount++;
pUpdateStmt.addBatch();
}
......
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