gfwleak/nms-nmsweb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增rc系统只显示rc角色菜单

Browse Source
This commit is contained in:
wangwenrui
2018-10-26 19:12:31 +08:00
parent 0bec0e4071
commit c9eb4c4d15
7 changed files with 391 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WebRoot/i18n/globalMessages_zh_CN.properties
View File

@@ -19,7 +19,7 @@ main.message.stateInfo2=全部成功
main.message.stateInfo3=全部失败 main.message.stateInfo3=全部失败
main.message.stateInfo4=部分成功 main.message.stateInfo4=部分成功
main.message.info=下列任务已完成 main.message.info=下列任务已完成
main.text.logout=退出视图 main.text.logout=退出
main.text.systemSelect=视图切换 main.text.systemSelect=视图切换
main.text.welcome=您好 main.text.welcome=您好
main.text.systemName=当前视图 main.text.systemName=当前视图

11
src/conf/myconfig.properties
View File

@@ -11,8 +11,8 @@ email.password = wwr@intranet
email.host = 10.0.6.100 email.host = 10.0.6.100
#file save path #file save path
uploadServerPath=D:/Java/apache-tomcat-7.0.61-windows-x86/webapps/nmsweb/download/ uploadServerPath=D:/Java/apache-tomcat-7.0.61-windows-x86/webapps/nmsweb/download/
common.ssl.ks = D:/Java/apache-tomcat-7.0.61-windows-x86/webapps/nmsweb/WEB-INF/classes/ssl/client_ks common.ssl.ks = C:\\Users\\Administrator\\git\\nmsweb\\src\\conf\\ssl\\client_ks
common.ssl.ts = D:/Java/apache-tomcat-7.0.61-windows-x86/webapps/nmsweb/WEB-INF/classes/ssl/client_ts common.ssl.ts = C:\\Users\\Administrator\\git\\nmsweb\\src\\conf\\ssl\\client_ts
#-- #--
common.single.socket.port = 60702 common.single.socket.port = 60702
common.ssl.socket.port = 60703 common.ssl.socket.port = 60703
@@ -84,14 +84,19 @@ nextval_function_name=nextval
currval_function_name=currval currval_function_name=currval
nation.role.jsbh=224 nation.role.jsbh=224
#若系统为rc系统，配置此配置，菜单显示为rc的菜单 值为分中心角色id
#region.role.jsbh=21
dept.mk.id=280 dept.mk.id=280
#1:open 0:close #1:open 0:close
nms.report.open=1 nms.report.open=0
#unit:s #unit:s
nms.report.interval=20 nms.report.interval=20
nms.status.setId=7 nms.status.setId=7
nms.status.url=http\://192.168.11.64\:8080/galaxy-service/service/nms/v1/saveServerStatus nms.status.url=http\://192.168.11.64\:8080/galaxy-service/service/nms/v1/saveServerStatus
nms.port.url=http\://192.168.11.64\:8080/galaxy-service/service/nms/v1/rafficNetflowPortInfo nms.port.url=http\://192.168.11.64\:8080/galaxy-service/service/nms/v1/rafficNetflowPortInfo
nms.rule.url=http\://192.168.11.64\:8080/galaxy-service/service/nms/v1/saveNmsDiRule nms.rule.url=http\://192.168.11.64\:8080/galaxy-service/service/nms/v1/saveNmsDiRule
default.nodeGroupId=100000
prefabricate.view=100000,100003,100004,100005,100006,100007,100033,100035,100037

8
src/nis/nms/core/Constants.java
View File

@@ -236,7 +236,15 @@ public class Constants {
public static final String DEPT_MK_ID; public static final String DEPT_MK_ID;
public static final String PREFABRICATE_VIEW; public static final String PREFABRICATE_VIEW;
public static final String REGION_ROLE;
static { static {
if(rb.containsKey("region.role.jsbh")){
REGION_ROLE=rb.getString("region.role.jsbh");
}else{
REGION_ROLE="-1";
}
if(rb.containsKey("prefabricate.view")){ if(rb.containsKey("prefabricate.view")){
PREFABRICATE_VIEW=rb.getString("prefabricate.view"); PREFABRICATE_VIEW=rb.getString("prefabricate.view");
}else{ }else{

70
src/nis/nms/web/Test.java
View File

@@ -2,66 +2,48 @@ package nis.nms.web;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader; import java.io.FileReader;
import java.io.InputStream; import java.util.HashSet;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
public class Test { public class Test {
static Logger logger = Logger.getLogger(Test.class); static Logger logger = Logger.getLogger(Test.class);
public static void main(String[] args) { public static void main(String[] args) {
File zh=new File("D:\\Workspaces\\wwrWork\\nmsweb\\WebRoot\\i18n\\globalMessages_zh_CN.properties");
File ru=new File("D:\\Workspaces\\wwrWork\\nmsweb\\WebRoot\\i18n\\globalMessages_ru_RU.properties"); File out = new File("D:\\wwr\\ru.txt");
if(!zh.exists()||!ru.exists()){ File ru = new File("D:\\wwr\\ru翻译-181017.txt");
logger.error("文件未找到");
return ;
}
try { try {
BufferedReader zhReader=new BufferedReader(new FileReader(zh));
BufferedReader ruReader = new BufferedReader(new FileReader(ru)); BufferedReader ruReader = new BufferedReader(new FileReader(ru));
BufferedReader outReader = new BufferedReader(new FileReader(out));
Properties ruProp = new Properties();
ruProp.load(ruReader);
Properties outProp = new Properties();
outProp.load(outReader);
String zhLine=null; Set<Entry<Object, Object>> entrySet = ruProp.entrySet();
String ruLine=null; for (Entry<Object, Object> entry : entrySet) {
String key = (String) entry.getKey();
String zhValue = outProp.getProperty(key);
String ruValue = ruProp.getProperty(key);
if (zhValue != null) {
System.out.println("#########" + zhValue + "#############");
Set<Entry<Object, Object>> outEntrySet = outProp.entrySet();
for (Entry<Object, Object> entry2 : outEntrySet) {
String temp = (String) entry2.getValue();
int rowNum=0; if (zhValue.equals(temp)) {
System.out.println((String) entry2.getKey() + "--> " + ruValue);
while((zhLine=zhReader.readLine())!=null&&(ruLine=ruReader.readLine())!=null){
if(zhLine.startsWith("#")||ruLine.startsWith("#")){
rowNum++;
continue;
}
rowNum++;
if(rowNum==4348){
System.out.println("bug点");
}
String[] zhSplit=zhLine.split("=");
String[] ruSplit=ruLine.split("=");
if((zhSplit==null||zhSplit.length<2)||(ruSplit==null||ruSplit.length<2)){
if(zhLine.equals(ruLine)){
continue;
}else{
logger.error("此行不匹配："+rowNum);
return ;
} }
} }
String zhKey=zhSplit[0];
String ruKey=ruSplit[0];
if(zhKey.equals(ruKey)){
continue;
}else{
logger.error("行不匹配："+rowNum);
return ;
} }
} }
} catch (Exception e) { } catch (Exception e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();

217
src/nis/nms/web/actions/LoginAction.java
View File

@@ -30,20 +30,14 @@ import nis.nms.util.Constant;
import nis.nms.util.MD5; import nis.nms.util.MD5;
import nis.nms.util.OnlineListener; import nis.nms.util.OnlineListener;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Results( { @Results({ @Result(name = "ok", value = "/main.jsp"),
@Result(name="ok", value = "/main.jsp"),
// updateUserPassword.jsp // updateUserPassword.jsp
/// modifyPwd.jsp /// modifyPwd.jsp
@Result(name = "modifyPwd", value = "/page/system/fourceModifyUserPwd.jsp"), @Result(name = "modifyPwd", value = "/page/system/fourceModifyUserPwd.jsp"),
@Result(name="systemSelect", value = "systemSelect.jsp"), @Result(name = "systemSelect", value = "systemSelect.jsp"), @Result(name = "back", value = "/login.jsp"),
@Result(name="back", value = "/login.jsp"), @Result(name = "logout", value = "/login.jsp?i18n_lang=${i18n_lang}"), @Result(name = "test", value = "2.jsp"),
@Result(name="logout", value = "/login.jsp?i18n_lang=${i18n_lang}"), @Result(name = "error", value = "/error.jsp") })
@Result(name="test", value = "2.jsp"),
@Result(name = "error", value = "/error.jsp")
})
public class LoginAction extends BaseAction { public class LoginAction extends BaseAction {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@@ -51,7 +45,6 @@ public class LoginAction extends BaseAction {
private XtYhJbxx logInInfo; private XtYhJbxx logInInfo;
private List<XtYhJbxx> userInfoList = new ArrayList(); private List<XtYhJbxx> userInfoList = new ArrayList();
public String executeAction() throws Exception { public String executeAction() throws Exception {
return login(); return login();
} }
@@ -61,12 +54,14 @@ public class LoginAction extends BaseAction {
if (logInInfo != null) { if (logInInfo != null) {
MD5 md5 = new MD5(); MD5 md5 = new MD5();
// 用户使用用户代码和用户密码登陆 // 用户使用用户代码和用户密码登陆
String sql = " from XtYhJbxx where yhbh = '" + logInInfo.getYhmc().trim() + "' and yhmm = '" + md5.getMD5Code(logInInfo.getYhmm().trim()) +"' "; String sql = " from XtYhJbxx where yhbh = '" + logInInfo.getYhmc().trim() + "' and yhmm = '"
+ md5.getMD5Code(logInInfo.getYhmm().trim()) + "' ";
userInfoList = this.commonService.find(sql); userInfoList = this.commonService.find(sql);
if (userInfoList != null && userInfoList.size() > 0) { if (userInfoList != null && userInfoList.size() > 0) {
XtYhJbxx userInfo = (XtYhJbxx) userInfoList.get(0); XtYhJbxx userInfo = (XtYhJbxx) userInfoList.get(0);
if (userInfo.getZxbz().equals("1")) { if (userInfo.getZxbz().equals("1")) {
outHtmlString("<script type=\"text/javascript\">alert('i18n_LoginAction.login.userLocked_n81i');this.location='login.jsp'</script>"); outHtmlString(
"<script type=\"text/javascript\">alert('i18n_LoginAction.login.userLocked_n81i');this.location='login.jsp'</script>");
return null; return null;
} }
@@ -90,7 +85,6 @@ public class LoginAction extends BaseAction {
System.out.println("get dept flag faild" + e); System.out.println("get dept flag faild" + e);
} }
if (!"admin".equalsIgnoreCase(userInfo.getYhbh()) && deptflag == 0) { if (!"admin".equalsIgnoreCase(userInfo.getYhbh()) && deptflag == 0) {
XtYhJbxx checkDeptUser = this.getYhJbxx(userInfo); XtYhJbxx checkDeptUser = this.getYhJbxx(userInfo);
List ll = checkDeptUser.getUserDeptList(); List ll = checkDeptUser.getUserDeptList();
@@ -106,12 +100,12 @@ public class LoginAction extends BaseAction {
} }
if (!isDeptstate) {// false说明此用户所在部门全部无效，故禁止登录 if (!isDeptstate) {// false说明此用户所在部门全部无效，故禁止登录
outHtmlString("<script type=\"text/javascript\">alert('i18n_LoginAction.login.deptLocked_n81i');this.location='login.jsp'</script>"); outHtmlString(
"<script type=\"text/javascript\">alert('i18n_LoginAction.login.deptLocked_n81i');this.location='login.jsp'</script>");
return null; return null;
} }
} }
HttpSession session = getRequest().getSession(true); // true HttpSession session = getRequest().getSession(true); // true
this.getRequest().getSession().removeAttribute(Constant.SESSION_SYSTEM_LOGIN); this.getRequest().getSession().removeAttribute(Constant.SESSION_SYSTEM_LOGIN);
this.getRequest().getSession().removeAttribute(Constant.SESSION_SYSTEM_LOGIN_NAME); this.getRequest().getSession().removeAttribute(Constant.SESSION_SYSTEM_LOGIN_NAME);
@@ -139,24 +133,21 @@ public class LoginAction extends BaseAction {
/* 2018-09-12新增配置属性NATION_ROLE，标识管理角色 */ /* 2018-09-12新增配置属性NATION_ROLE，标识管理角色 */
this.getRequest().getSession().setAttribute("nationRole", Constants.NATION_ROLE); this.getRequest().getSession().setAttribute("nationRole", Constants.NATION_ROLE);
// 判断重复登陆 // 判断重复登陆
if (XtYhJbxx.LONGIN_USER != null) if (XtYhJbxx.LONGIN_USER != null) {// 存在在线用户
{// 存在在线用户
boolean isLogin = false; boolean isLogin = false;
if (XtYhJbxx.LONGIN_USER.contains(userInfo.getYhid())) if (XtYhJbxx.LONGIN_USER.contains(userInfo.getYhid()))
isLogin = true; isLogin = true;
if (isLogin)// 在线用户中包括正在登陆的用户 if (isLogin)// 在线用户中包括正在登陆的用户
{ {
// if(this.getIsSingleLogin()==0){//启用单点登录 // if(this.getIsSingleLogin()==0){//启用单点登录
// outHtmlString("<script type=\"text/javascript\">alert('此用户已登录,请选择其他用户登录');this.location='login.html'</script>"); // outHtmlString("<script
// type=\"text/javascript\">alert('此用户已登录,请选择其他用户登录');this.location='login.html'</script>");
// this.saveLoginRpt("重复登录,失败","登入",userInfo.getYhmc());//记录登陆日志 // this.saveLoginRpt("重复登录,失败","登入",userInfo.getYhmc());//记录登陆日志
// return null; // return null;
// } // }
HttpSession sessionold = (HttpSession) XtYhJbxx.LOGIN_SESSION HttpSession sessionold = (HttpSession) XtYhJbxx.LOGIN_SESSION.get(userInfo.getYhid());// 如果用户已经登录，则取出之前登录的session信息
.get(userInfo.getYhid());// 如果用户已经登录，则取出之前登录的session信息 try {
try if (sessionold != null) {
{
if (sessionold != null)
{
if (!session.getId().equals(sessionold.getId())) {// 如果新的sessionid不等于旧的sessionid(新打开浏览器) if (!session.getId().equals(sessionold.getId())) {// 如果新的sessionid不等于旧的sessionid(新打开浏览器)
if (this.getIsSingleLogin() == 0) {// 启用单点登录 if (this.getIsSingleLogin() == 0) {// 启用单点登录
sessionold.invalidate();// 将旧的session信息销毁 sessionold.invalidate();// 将旧的session信息销毁
@@ -191,8 +182,7 @@ public class LoginAction extends BaseAction {
XtYhJbxx.LOGIN_SESSION.remove(userInfo.getYhid());// 从session列表信息中移除 XtYhJbxx.LOGIN_SESSION.remove(userInfo.getYhid());// 从session列表信息中移除
XtYhJbxx.LONGIN_USER.remove(userInfo.getYhid());// 将之前的用户信息从登录用户信息列表中移除 XtYhJbxx.LONGIN_USER.remove(userInfo.getYhid());// 将之前的用户信息从登录用户信息列表中移除
// } // }
} catch (Exception e) } catch (Exception e) {
{
e.printStackTrace(); e.printStackTrace();
System.out.println("sessionold已经过期"); System.out.println("sessionold已经过期");
XtYhJbxx.LOGIN_SESSION.remove(userInfo.getYhid());// 从session列表信息中移除 XtYhJbxx.LOGIN_SESSION.remove(userInfo.getYhid());// 从session列表信息中移除
@@ -200,8 +190,7 @@ public class LoginAction extends BaseAction {
} }
} }
XtYhJbxx.LONGIN_USER.add(userInfo.getYhid());// 将新用户写入在线用户信息中 XtYhJbxx.LONGIN_USER.add(userInfo.getYhid());// 将新用户写入在线用户信息中
} else } else {// 没有在线用户
{// 没有在线用户
XtYhJbxx.LONGIN_USER = new ArrayList(); XtYhJbxx.LONGIN_USER = new ArrayList();
XtYhJbxx.LONGIN_USER.add(userInfo.getYhid());// 将新用户写入在线用户信息中 XtYhJbxx.LONGIN_USER.add(userInfo.getYhid());// 将新用户写入在线用户信息中
} }
@@ -220,9 +209,11 @@ public class LoginAction extends BaseAction {
// 把session加入监听器 // 把session加入监听器
OnlineListener.createsession(new HttpSessionEvent(session)); OnlineListener.createsession(new HttpSessionEvent(session));
session.setAttribute("treeList", this.getYhJsMk(userInfo.getYhbh())); session.setAttribute("treeList", this.getYhJsMk(userInfo.getYhbh()));
//System.out.println("sessionid = " + this.getRequest().getSession().getId()); // System.out.println("sessionid = " +
// this.getRequest().getSession().getId());
// 记录登陆日志 // 记录登陆日志
this.saveLoginRpt("i18n_LoginAction.login.success_n81i","i18n_LoginAction.login.in_n81i",userInfo.getYhmc()); this.saveLoginRpt("i18n_LoginAction.login.success_n81i", "i18n_LoginAction.login.in_n81i",
userInfo.getYhmc());
// 查询菜单树 // 查询菜单树
QueryMenuTreeAction query = new QueryMenuTreeAction(commonService); QueryMenuTreeAction query = new QueryMenuTreeAction(commonService);
List<Map<String, Object>> userfunctionList = null; List<Map<String, Object>> userfunctionList = null;
@@ -236,18 +227,27 @@ public class LoginAction extends BaseAction {
} }
} }
if (userfunctionList == null || userfunctionList.size() == 0) { if (userfunctionList == null || userfunctionList.size() == 0) {
this.saveLoginRpt("i18n_LoginAction.login.noPermission_n81i","i18n_LoginAction.login.in_n81i",logInInfo.getYhmc());//记录登陆日志 this.saveLoginRpt("i18n_LoginAction.login.noPermission_n81i", "i18n_LoginAction.login.in_n81i",
outHtmlString("<script type=\"text/javascript\">alert('i18n_LoginAction.login.noPermission_n81i');this.location='login.jsp'</script>"); logInInfo.getYhmc());// 记录登陆日志
//outHtmlString("<script type='text/javascript' src='js/ymPrompt.js'></script><link rel='stylesheet' href='js/ski/qq/ymPrompt.css' type='text/css'></link><script type=\"text/javascript\">ymPrompt.alert('操作失败');</script>"); outHtmlString(
"<script type=\"text/javascript\">alert('i18n_LoginAction.login.noPermission_n81i');this.location='login.jsp'</script>");
// outHtmlString("<script type='text/javascript'
// src='js/ymPrompt.js'></script><link rel='stylesheet'
// href='js/ski/qq/ymPrompt.css'
// type='text/css'></link><script
// type=\"text/javascript\">ymPrompt.alert('操作失败');</script>");
return null; return null;
} }
// 用户所要功能权限 add by ghh // 用户所要功能权限 add by ghh
session.setAttribute("userfunctionList", userfunctionList); session.setAttribute("userfunctionList", userfunctionList);
LinkedList<Map<String, Object>> userfunctionList2 = new LinkedList<Map<String, Object>>(); LinkedList<Map<String, Object>> userfunctionList2 = new LinkedList<Map<String, Object>>();
userfunctionList2.addAll(userfunctionList); userfunctionList2.addAll(userfunctionList);
// List<Map<String, Object>> userfunctionList2 = (List<Map<String, Object>>) ((LinkedList<Map<String,Object>>)userfunctionList).clone(); // List<Map<String, Object>> userfunctionList2 =
// (List<Map<String, Object>>)
// ((LinkedList<Map<String,Object>>)userfunctionList).clone();
String treeStr = query.makeMenuTree(userfunctionList2); String treeStr = query.makeMenuTree(userfunctionList2);
//System.out.println(userInfoTemp.getNickname()+":treeXML\t" + treeStr); // System.out.println(userInfoTemp.getNickname()+":treeXML\t"
// + treeStr);
if (session.getAttribute("treeStr") != null) { if (session.getAttribute("treeStr") != null) {
session.removeAttribute("treeStr"); session.removeAttribute("treeStr");
} }
@@ -278,17 +278,28 @@ public class LoginAction extends BaseAction {
} catch (Exception e) { } catch (Exception e) {
// e.printStackTrace(); // e.printStackTrace();
// outHtmlString("<script type=\"text/javascript\">alert('操作失败');this.location='index.jsp'</script>"); // outHtmlString("<script
this.saveLoginRpt("i18n_LoginAction.login.unpredictableErr_n81i","i18n_LoginAction.login.in_n81i",logInInfo.getYhmc());//记录登陆日志 // type=\"text/javascript\">alert('操作失败');this.location='index.jsp'</script>");
outHtmlString("<script type=\"text/javascript\">alert('i18n_LoginAction.checkPwdState.faild_n81i');this.location='login.jsp'</script>"); this.saveLoginRpt("i18n_LoginAction.login.unpredictableErr_n81i", "i18n_LoginAction.login.in_n81i",
//outHtmlString("<script type='text/javascript' src='js/ymPrompt.js'></script><link rel='stylesheet' href='js/ski/qq/ymPrompt.css' type='text/css'></link><script type=\"text/javascript\">ymPrompt.alert('操作失败');</script>"); logInInfo.getYhmc());// 记录登陆日志
outHtmlString(
"<script type=\"text/javascript\">alert('i18n_LoginAction.checkPwdState.faild_n81i');this.location='login.jsp'</script>");
// outHtmlString("<script type='text/javascript'
// src='js/ymPrompt.js'></script><link rel='stylesheet'
// href='js/ski/qq/ymPrompt.css' type='text/css'></link><script
// type=\"text/javascript\">ymPrompt.alert('操作失败');</script>");
return null; return null;
} }
this.saveLoginRpt("用户名或密码错误", "i18n_LoginAction.login.in_n81i", logInInfo.getYhmc());// 记录登陆日志 this.saveLoginRpt("用户名或密码错误", "i18n_LoginAction.login.in_n81i", logInInfo.getYhmc());// 记录登陆日志
outHtmlString("<script type=\"text/javascript\">alert('i18n_LoginAction.login.usernameOrPwdErr_n81i');this.location='login.jsp'</script>"); outHtmlString(
//outHtmlString("<script type='text/javascript' src='js/ymPrompt.js'></script><link rel='stylesheet' href='js/ski/qq/ymPrompt.css' type='text/css'></link><script type=\"text/javascript\">ymPrompt.alert('操作失败');</script>"); "<script type=\"text/javascript\">alert('i18n_LoginAction.login.usernameOrPwdErr_n81i');this.location='login.jsp'</script>");
// outHtmlString("<script type='text/javascript'
// src='js/ymPrompt.js'></script><link rel='stylesheet'
// href='js/ski/qq/ymPrompt.css' type='text/css'></link><script
// type=\"text/javascript\">ymPrompt.alert('操作失败');</script>");
return null; return null;
} }
private String toSystemSelect(String yhbh) { private String toSystemSelect(String yhbh) {
try { try {
List<Object[]> stList = new ArrayList<Object[]>(); List<Object[]> stList = new ArrayList<Object[]>();
@@ -299,17 +310,16 @@ public class LoginAction extends BaseAction {
return "ok"; return "ok";
} else { } else {
stList = this.commonService stList = this.commonService.executeSQL(
.executeSQL("select DISTINCT(st.system_Id),st.system_Name,st.is_master " + "select DISTINCT(st.system_Id),st.system_Name,st.is_master " + "from system_table st "
"from system_table st " + + "left join Gorup_System_Table gst on gst.system_Id = st.system_Id "
"left join Gorup_System_Table gst on gst.system_Id = st.system_Id " + + "left join Xt_Yh_Js_Index xyji on xyji.jsbh = gst.user_Group_Id "
"left join Xt_Yh_Js_Index xyji on xyji.jsbh = gst.user_Group_Id " + + "left join XT_JS_JBXX xjj on xjj.jsbh = xyji.jsbh " + "where xyji.yhbh='"
"left join XT_JS_JBXX xjj on xjj.jsbh = xyji.jsbh " + + yhbh.trim() + "' and st.system_state = 0 and xyji.type=1 and xjj.zxbz=0 " + // 业务系统启用+角色类型为用户组+用户组有效
"where xyji.yhbh='" + yhbh.trim() +
"' and st.system_state = 0 and xyji.type=1 and xjj.zxbz=0 " +//业务系统启用+角色类型为用户组+用户组有效
"order by st.system_Id"); "order by st.system_Id");
// 国家中心人员具有 查看所有业务系统 数据的权限 // 国家中心人员具有 查看所有业务系统 数据的权限
List<String> list = this.commonService.executeSQL("SELECT jsbh FROM xt_yh_js_index where yhbh = ?", yhbh.trim()); List<String> list = this.commonService.executeSQL("SELECT jsbh FROM xt_yh_js_index where yhbh = ?",
yhbh.trim());
if (list != null && list.size() > 0) { if (list != null && list.size() > 0) {
for (String obj : list) { for (String obj : list) {
if (StringUtils.isNotBlank(obj)) { if (StringUtils.isNotBlank(obj)) {
@@ -327,10 +337,14 @@ public class LoginAction extends BaseAction {
if (stList != null && stList.size() == 1) { if (stList != null && stList.size() == 1) {
this.getRequest().getSession().setAttribute(Constant.SESSION_SYSTEM_LOGIN, Long.parseLong(stList.get(0)[0].toString())); this.getRequest().getSession().setAttribute(Constant.SESSION_SYSTEM_LOGIN,
this.getRequest().getSession().setAttribute(Constant.SESSION_SYSTEM_LOGIN_NAME, stList.get(0)[1].toString()); Long.parseLong(stList.get(0)[0].toString()));
this.getRequest().getSession().setAttribute(Constant.SESSION_SYSTEM_LOGIN_NAME,
stList.get(0)[1].toString());
// System.out.println(stList.get(0)[1]+"-=-=-=-=-=-=--=-=-=-=-=-==============--- Only One "+this.getRequest().getSession().getAttribute(Constant.SESSION_SYSTEM_LOGIN)); // System.out.println(stList.get(0)[1]+"-=-=-=-=-=-=--=-=-=-=-=-==============---
// Only One
// "+this.getRequest().getSession().getAttribute(Constant.SESSION_SYSTEM_LOGIN));
return "ok"; return "ok";
} }
} }
@@ -341,8 +355,10 @@ public class LoginAction extends BaseAction {
} }
return "systemSelect"; return "systemSelect";
} }
/** /**
* 判断用户是否首次使用密码如果是首次返回到密码修改页面 * 判断用户是否首次使用密码如果是首次返回到密码修改页面
*
* @param yhbh * @param yhbh
* @return 0要修改密码；1无需修改密码继续；2用户不存在 * @return 0要修改密码；1无需修改密码继续；2用户不存在
*/ */
@@ -352,16 +368,18 @@ public class LoginAction extends BaseAction {
try { try {
List<Object[]> stList = new ArrayList<Object[]>(); List<Object[]> stList = new ArrayList<Object[]>();
if (yhbh != null && !"".equals(yhbh)) { if (yhbh != null && !"".equals(yhbh)) {
stList = this.commonService stList = this.commonService.executeSQL(
.executeSQL("select xyj.PWDSTATE from xt_yh_jbxx xyj where xyj.yhbh = '"+yhbh+"' AND xyj.ZXBZ = 0 "); "select xyj.PWDSTATE from xt_yh_jbxx xyj where xyj.yhbh = '" + yhbh + "' AND xyj.ZXBZ = 0 ");
if (stList == null) { if (stList == null) {
outHtmlString("<script type=\"text/javascript\">alert('i18n_LoginAction.checkPwdState.userIsNotExists_n81i！');this.location='login.jsp'</script>"); outHtmlString(
"<script type=\"text/javascript\">alert('i18n_LoginAction.checkPwdState.userIsNotExists_n81i！');this.location='login.jsp'</script>");
ischeck = 2; ischeck = 2;
} else if (stList.size() == 1) {// && stList.size()==1 } else if (stList.size() == 1) {// && stList.size()==1
// 如果密码正常状态则直接放行 // 如果密码正常状态则直接放行
ischeck = Integer.parseInt(String.valueOf(stList.get(0))); ischeck = Integer.parseInt(String.valueOf(stList.get(0)));
} else { } else {
outHtmlString("<script type=\"text/javascript\">alert('i18n_LoginAction.checkPwdState.userInfoErr_n81i');this.location='login.jsp'</script>"); outHtmlString(
"<script type=\"text/javascript\">alert('i18n_LoginAction.checkPwdState.userInfoErr_n81i');this.location='login.jsp'</script>");
ischeck = 2; ischeck = 2;
} }
} }
@@ -378,15 +396,13 @@ public class LoginAction extends BaseAction {
String yhbh = this.getRequest().getParameter("yhbh"); String yhbh = this.getRequest().getParameter("yhbh");
try { try {
MD5 md5 = new MD5(); MD5 md5 = new MD5();
XtYhJbxx userNew = (XtYhJbxx) this.commonService.get( XtYhJbxx userNew = (XtYhJbxx) this.commonService.get(XtYhJbxx.class, Long.parseLong(yhid.trim()));
XtYhJbxx.class, Long.parseLong(yhid.trim()));
userNew.setYhmm(md5.getMD5Code(logInInfo.getYhmm().trim())); userNew.setYhmm(md5.getMD5Code(logInInfo.getYhmm().trim()));
// 让管理员重置密码之后，修改密码状态未必须修改状态0 // 让管理员重置密码之后，修改密码状态未必须修改状态0
userNew.setPwdState("1"); userNew.setPwdState("1");
this.commonService.update(userNew); this.commonService.update(userNew);
// //将删除操作写到操作日志中 // //将删除操作写到操作日志中
this.addDBOperationRpt(commonService, "XT_YH_JBXX", "UPDATE", this.addDBOperationRpt(commonService, "XT_YH_JBXX", "UPDATE", userNew.getYhid());
userNew.getYhid());
this.getRequest().setAttribute("MSG", 1); this.getRequest().setAttribute("MSG", 1);
} catch (Exception e) { } catch (Exception e) {
this.getRequest().setAttribute("MSG", 2); this.getRequest().setAttribute("MSG", 2);
@@ -394,16 +410,19 @@ public class LoginAction extends BaseAction {
} }
return toSystemSelect(yhbh); return toSystemSelect(yhbh);
} }
public String systemSelect() { public String systemSelect() {
if ("yes".equals(this.getRequest().getParameter("SytemChange"))) { if ("yes".equals(this.getRequest().getParameter("SytemChange"))) {
if (this.getRequest().getSession().getAttribute("YHBH") != null) { if (this.getRequest().getSession().getAttribute("YHBH") != null) {
return toSystemSelect(this.getRequest().getSession().getAttribute("YHBH").toString()); return toSystemSelect(this.getRequest().getSession().getAttribute("YHBH").toString());
} else { } else {
outHtmlString("<script type=\"text/javascript\">alert('i18n_LoginAction.checkPwdState.selectSys_n81i');window.history.go(-1);</script>"); outHtmlString(
"<script type=\"text/javascript\">alert('i18n_LoginAction.checkPwdState.selectSys_n81i');window.history.go(-1);</script>");
return null; return null;
} }
} else { } else {
if(this.getRequest().getParameter("systemId")!=null && !"".equals(this.getRequest().getParameter("systemId"))){ if (this.getRequest().getParameter("systemId") != null
&& !"".equals(this.getRequest().getParameter("systemId"))) {
Long systemId = Long.parseLong(this.getRequest().getParameter("systemId")); Long systemId = Long.parseLong(this.getRequest().getParameter("systemId"));
this.getRequest().getSession().setAttribute(Constant.SESSION_SYSTEM_LOGIN, systemId); this.getRequest().getSession().setAttribute(Constant.SESSION_SYSTEM_LOGIN, systemId);
if (systemId == -1) {// 管理员权限，查看所有数据 if (systemId == -1) {// 管理员权限，查看所有数据
@@ -413,9 +432,12 @@ public class LoginAction extends BaseAction {
this.getRequest().getSession().setAttribute(Constant.ADMIN_FLAG, false); this.getRequest().getSession().setAttribute(Constant.ADMIN_FLAG, false);
List<Object> stList = new ArrayList<Object>(); List<Object> stList = new ArrayList<Object>();
try { try {
stList = this.commonService.executeSQL("select st.system_Name from system_table st where st.system_Id = "+Long.parseLong(this.getRequest().getParameter("systemId"))); stList = this.commonService
.executeSQL("select st.system_Name from system_table st where st.system_Id = "
+ Long.parseLong(this.getRequest().getParameter("systemId")));
if (stList != null && stList.size() == 1) { if (stList != null && stList.size() == 1) {
this.getRequest().getSession().setAttribute(Constant.SESSION_SYSTEM_LOGIN_NAME, stList.get(0).toString()); this.getRequest().getSession().setAttribute(Constant.SESSION_SYSTEM_LOGIN_NAME,
stList.get(0).toString());
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@@ -427,30 +449,42 @@ public class LoginAction extends BaseAction {
userfunctionList = query.queryMenuTree(null, this.getUser().getYhbh()); userfunctionList = query.queryMenuTree(null, this.getUser().getYhbh());
if (userfunctionList == null || userfunctionList.size() == 0) { if (userfunctionList == null || userfunctionList.size() == 0) {
this.saveLoginRpt("i18n_LoginAction.login.noPermission_n81i","i18n_LoginAction.login.in_n81i",logInInfo.getYhmc());//记录登陆日志 this.saveLoginRpt("i18n_LoginAction.login.noPermission_n81i", "i18n_LoginAction.login.in_n81i",
outHtmlString("<script type=\"text/javascript\">alert('i18n_LoginAction.login.noPermission_n81i');this.location='login.jsp'</script>"); logInInfo.getYhmc());// 记录登陆日志
//outHtmlString("<script type='text/javascript' src='js/ymPrompt.js'></script><link rel='stylesheet' href='js/ski/qq/ymPrompt.css' type='text/css'></link><script type=\"text/javascript\">ymPrompt.alert('操作失败');</script>"); outHtmlString(
"<script type=\"text/javascript\">alert('i18n_LoginAction.login.noPermission_n81i');this.location='login.jsp'</script>");
// outHtmlString("<script type='text/javascript'
// src='js/ymPrompt.js'></script><link rel='stylesheet'
// href='js/ski/qq/ymPrompt.css'
// type='text/css'></link><script
// type=\"text/javascript\">ymPrompt.alert('操作失败');</script>");
return null; return null;
} }
// 用户所要功能权限 add by ghh // 用户所要功能权限 add by ghh
this.getRequest().getSession().setAttribute("userfunctionList", userfunctionList); this.getRequest().getSession().setAttribute("userfunctionList", userfunctionList);
LinkedList<Map<String, Object>> userfunctionList2 = new LinkedList<Map<String, Object>>(); LinkedList<Map<String, Object>> userfunctionList2 = new LinkedList<Map<String, Object>>();
userfunctionList2.addAll(userfunctionList); userfunctionList2.addAll(userfunctionList);
// List<Map<String, Object>> userfunctionList2 = (List<Map<String, Object>>) ((LinkedList<Map<String,Object>>)userfunctionList).clone(); // List<Map<String, Object>> userfunctionList2 =
// (List<Map<String, Object>>)
// ((LinkedList<Map<String,Object>>)userfunctionList).clone();
String treeStr = query.makeMenuTree(userfunctionList2); String treeStr = query.makeMenuTree(userfunctionList2);
//System.out.println(userInfoTemp.getNickname()+":treeXML\t" + treeStr); // System.out.println(userInfoTemp.getNickname()+":treeXML\t" +
// treeStr);
if (this.getRequest().getSession().getAttribute("treeStr") != null) { if (this.getRequest().getSession().getAttribute("treeStr") != null) {
this.getRequest().getSession().removeAttribute("treeStr"); this.getRequest().getSession().removeAttribute("treeStr");
} }
this.getRequest().getSession().setAttribute("treeStr", treeStr); this.getRequest().getSession().setAttribute("treeStr", treeStr);
//---------------------------2013-1-8 新增--------end------------- // ---------------------------2013-1-8
// 新增--------end-------------
return "ok"; return "ok";
} else { } else {
outHtmlString("<script type=\"text/javascript\">alert('i18n_LoginAction.checkPwdState.selectSys_n81i');window.history.go(-1);</script>"); outHtmlString(
"<script type=\"text/javascript\">alert('i18n_LoginAction.checkPwdState.selectSys_n81i');window.history.go(-1);</script>");
return null; return null;
} }
} }
} }
public String logout() { public String logout() {
System.out.println("用户退出@@@@@@@@@@@@@@@@@@@@@@"); System.out.println("用户退出@@@@@@@@@@@@@@@@@@@@@@");
HttpSession session = this.getRequest().getSession(false); HttpSession session = this.getRequest().getSession(false);
@@ -466,26 +500,40 @@ public class LoginAction extends BaseAction {
// online.sessionDestroyed(new HttpSessionEvent(session)); // online.sessionDestroyed(new HttpSessionEvent(session));
// 使用户session失效 // 使用户session失效
session.invalidate(); session.invalidate();
this.saveLoginRpt("i18n_LoginAction.login.success_n81i","i18n_LoginAction.checkPwdState.out_n81i",user.getYhmc());//记录登陆日志 this.saveLoginRpt("i18n_LoginAction.login.success_n81i", "i18n_LoginAction.checkPwdState.out_n81i",
user.getYhmc());// 记录登陆日志
} else { } else {
System.out.println("从session中没有取得人员信息！"); System.out.println("从session中没有取得人员信息！");
this.saveLoginRpt("i18n_LoginAction.checkPwdState.sessionOutTime_n81i","i18n_LoginAction.checkPwdState.out_n81i",user.getYhmc());//记录登陆日志 this.saveLoginRpt("i18n_LoginAction.checkPwdState.sessionOutTime_n81i",
"i18n_LoginAction.checkPwdState.out_n81i", user.getYhmc());// 记录登陆日志
} }
} }
return "logout"; return "logout";
} }
public List getYhJsMk(String yhbh) { public List getYhJsMk(String yhbh) {
List treeList = new ArrayList(); List treeList = new ArrayList();
try { try {
// String sql="select substr(mkbh,0,length(mkbh)-5) as pid,mkbh,mkmc,mkms,mkurl,mktb from XtMkJbxx where mkbh in " + String sql = "";
String regionRoleId = Constants.REGION_ROLE;
if (!"admin".equals(yhbh)&&StringUtils.isNotBlank(regionRoleId) && !regionRoleId.equals("-1")) {
sql = "SELECT pid,id,mkmc,mkms,mkurl,mktb,iconimage,mktype FROM XtMkJbxx WHERE id IN(SELECT mkbh FROM XtJsMkIndex WHERE jsbh = "
+ regionRoleId + ")";
} else {
// String sql="select substr(mkbh,0,length(mkbh)-5) as
// pid,mkbh,mkmc,mkms,mkurl,mktb from XtMkJbxx where mkbh in " +
// "(select mkbh from XtJsMkIndex where jsbh in" + // "(select mkbh from XtJsMkIndex where jsbh in" +
// "(select a.jsbh from XtJsJbxx a where a.jsbh in(" + // "(select a.jsbh from XtJsJbxx a where a.jsbh in(" +
// "select jsbh from XtYhJsIndex where yhbh = '"+yhbh+"') and a.zxbz='0')) and zxbz='0'"; // "select jsbh from XtYhJsIndex where yhbh = '"+yhbh+"') and
String sql="select pid,id,mkmc,mkms,mkurl,mktb,iconimage,mktype from XtMkJbxx where id in " + // a.zxbz='0')) and zxbz='0'";
"(select mkbh from XtJsMkIndex where jsbh in" + sql = "select pid,id,mkmc,mkms,mkurl,mktb,iconimage,mktype from XtMkJbxx where id in "
"(select a.jsbh from XtJsJbxx a where a.jsbh in(" + + "(select mkbh from XtJsMkIndex where jsbh in"
"select jsbh from XtYhJsIndex where yhbh = '"+yhbh+"') and a.zxbz='0')) and zxbz='0' order by showlevel,showorder"; + "(select a.jsbh from XtJsJbxx a where a.jsbh in("
+ "select jsbh from XtYhJsIndex where yhbh = '" + yhbh
+ "') and a.zxbz='0')) and zxbz='0' order by showlevel,showorder";
}
List menuList = this.commonService.find(sql); List menuList = this.commonService.find(sql);
for (int i = 0; i < menuList.size(); i++) { for (int i = 0; i < menuList.size(); i++) {
Object[] obj = (Object[]) menuList.get(i);// 0为pid,1为mkbh,2为mkmc,3为mkms,4为mkurl,5为mktb Object[] obj = (Object[]) menuList.get(i);// 0为pid,1为mkbh,2为mkmc,3为mkms,4为mkurl,5为mktb
@@ -505,6 +553,7 @@ public class LoginAction extends BaseAction {
return treeList; return treeList;
} }
public XtYhJbxx getYhJbxx(XtYhJbxx user) { public XtYhJbxx getYhJbxx(XtYhJbxx user) {
try { try {
List userRoleList = this.commonService.find("from XtYhJsIndex where yhbh=?", user.getYhbh()); List userRoleList = this.commonService.find("from XtYhJsIndex where yhbh=?", user.getYhbh());
@@ -539,6 +588,7 @@ public class LoginAction extends BaseAction {
} }
return user; return user;
} }
/** /**
* @param status,login状态 * @param status,login状态
* @param event,login行为 * @param event,login行为
@@ -556,6 +606,7 @@ public class LoginAction extends BaseAction {
e.printStackTrace(); e.printStackTrace();
} }
} }
public CommonService getCommonService() { public CommonService getCommonService() {
return commonService; return commonService;
} }
@@ -563,15 +614,19 @@ public class LoginAction extends BaseAction {
public void setCommonService(CommonService commonService) { public void setCommonService(CommonService commonService) {
this.commonService = commonService; this.commonService = commonService;
} }
public XtYhJbxx getLogInInfo() { public XtYhJbxx getLogInInfo() {
return logInInfo; return logInInfo;
} }
public void setLogInInfo(XtYhJbxx logInInfo) { public void setLogInInfo(XtYhJbxx logInInfo) {
this.logInInfo = logInInfo; this.logInInfo = logInInfo;
} }
public List<XtYhJbxx> getUserInfoList() { public List<XtYhJbxx> getUserInfoList() {
return userInfoList; return userInfoList;
} }
public void setUserInfoList(List<XtYhJbxx> userInfoList) { public void setUserInfoList(List<XtYhJbxx> userInfoList) {
this.userInfoList = userInfoList; this.userInfoList = userInfoList;
} }

5
src/nis/nms/web/actions/QueryMenuTreeAction.java
View File

@@ -11,6 +11,7 @@ import org.jdom.Document;
import org.jdom.Element; import org.jdom.Element;
import org.jdom.input.SAXBuilder; import org.jdom.input.SAXBuilder;
import nis.nms.core.Constants;
import nis.nms.domains.XtYhJbxx; import nis.nms.domains.XtYhJbxx;
import nis.nms.service.CommonService; import nis.nms.service.CommonService;
import nis.nms.util.Common; import nis.nms.util.Common;
@@ -39,6 +40,8 @@ public class QueryMenuTreeAction {
public List<Map<String, Object>> queryMenuTree(String yhmc,String yhbh) { public List<Map<String, Object>> queryMenuTree(String yhmc,String yhbh) {
// 查询用户下的所以功能节点 // 查询用户下的所以功能节点
List<Map<String, Object>> userfunctionList = null; List<Map<String, Object>> userfunctionList = null;
String regionRoleId=Constants.REGION_ROLE;
try { try {
StringBuffer hql = new StringBuffer(); StringBuffer hql = new StringBuffer();
if (yhmc != null if (yhmc != null
@@ -47,6 +50,8 @@ public class QueryMenuTreeAction {
.append("select n.Id,n.ZXBZ,n.PID,n.HANDLER,n.MKURL," .append("select n.Id,n.ZXBZ,n.PID,n.HANDLER,n.MKURL,"
+ "n.MKMC,n.MKTYPE from xt_mk_jbxx n where ZXBZ=0"); + "n.MKMC,n.MKTYPE from xt_mk_jbxx n where ZXBZ=0");
}else if(StringUtils.isNotBlank(regionRoleId)&&!regionRoleId.equals("-1")){
hql.append("SELECT n.id ,n.ZXBZ,n.PID,n. HANDLER,n.MKURL,n.MKMC,n.MKTYPE FROM xt_mk_jbxx n WHERE ZXBZ = 0 AND n.id IN( SELECT r.MKBH FROM xt_js_mk_index r WHERE r.JSBH ="+regionRoleId+")");
}else { }else {
if (yhbh != null) { if (yhbh != null) {
if(Constant.F_BUTTON_AUTHER){ if(Constant.F_BUTTON_AUTHER){

20
src/nis/nms/web/actions/detection/DetectionSetAction.java
View File

@@ -30,6 +30,7 @@ import nis.nms.service.CommonService;
import nis.nms.util.BaseAction; import nis.nms.util.BaseAction;
import nis.nms.util.ExportUtils; import nis.nms.util.ExportUtils;
import nis.nms.util.Page; import nis.nms.util.Page;
import nis.nms.util.StringUtil;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.FalseFileFilter; import org.apache.commons.io.filefilter.FalseFileFilter;
@@ -1803,19 +1804,36 @@ public class DetectionSetAction extends BaseAction {
// } // }
setInfo2.setId(setInfo.getId()); setInfo2.setId(setInfo.getId());
// setInfo2.setNodegroup(setInfo.getNodegroup()); // setInfo2.setNodegroup(setInfo.getNodegroup());
if(StringUtils.isBlank(setInfo.getNodeGroupsId())){
setInfo2.setNodeGroupsId(null);
}else{
setInfo2.setNodeGroupsId(setInfo.getNodeGroupsId());// 设置节点组id（多个用逗号连接） setInfo2.setNodeGroupsId(setInfo.getNodeGroupsId());// 设置节点组id（多个用逗号连接）
}
setInfo2.setCheckTypeInfo(typeInfo); setInfo2.setCheckTypeInfo(typeInfo);
setInfo2.setProcessIden(setInfo.getProcessIden()); setInfo2.setProcessIden(setInfo.getProcessIden());
// setInfo2.setNodeIp(setInfo.getNodeIp()); // setInfo2.setNodeIp(setInfo.getNodeIp());
if(StringUtils.isBlank(setInfo.getNodeIpsId())){
setInfo2.setNodeIpsId(setInfo.getNodeIpsId());
}else{
setInfo2.setNodeIpsId(setInfo.getNodeIpsId());// 设置节点id（多个逗号连接） setInfo2.setNodeIpsId(setInfo.getNodeIpsId());// 设置节点id（多个逗号连接）
}
setInfo2.setCheckWay(setInfo.getCheckWay()); setInfo2.setCheckWay(setInfo.getCheckWay());
setInfo2.setDetectionSetState(setInfo.getDetectionSetState()); setInfo2.setDetectionSetState(setInfo.getDetectionSetState());
setInfo2.setCheckTypeInfo(typeInfo); setInfo2.setCheckTypeInfo(typeInfo);
setInfo.setCheckTypeInfo(typeInfo); setInfo.setCheckTypeInfo(typeInfo);
setInfo.setNodeIp(detectionSetInfo.getNodeIpsName()); setInfo.setNodeIp(detectionSetInfo.getNodeIpsName());
setInfo.setNodeIpsId(detectionSetInfo.getNodeIpsId());// 设置节点id if(StringUtils.isBlank(detectionSetInfo.getNodeIpsId())){
setInfo.setNodeIpsId(null);// 设置节点id
}else{
setInfo.setNodeIpsId(detectionSetInfo.getNodeIpsId());
}
if(StringUtils.isBlank(detectionSetInfo.getNodeGroupsId())){
setInfo.setNodeGroupsId(null);// 设置节点组id，之前没有设置此信息
}else{
setInfo.setNodeGroupsId(detectionSetInfo.getNodeGroupsId());// 设置节点组id，之前没有设置此信息 setInfo.setNodeGroupsId(detectionSetInfo.getNodeGroupsId());// 设置节点组id，之前没有设置此信息
}
setInfo.setDetectionSetState(detectionSetInfo setInfo.setDetectionSetState(detectionSetInfo
.getDetectionSetState()); .getDetectionSetState());
setInfo.setCheckWay(detectionSetInfo.getCheckWay()); setInfo.setCheckWay(detectionSetInfo.getCheckWay());