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

用户管理功能调整

Browse Source
This commit is contained in:
wangwenrui
2018-10-23 17:25:29 +08:00
parent faefebe89a
commit ab59e338a1
8 changed files with 96 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,7 +234,15 @@ public class Constants {
public static final String NATION_ROLE;
public static final String DEPT_MK_ID;
public static final String PREFABRICATE_VIEW;
static {
if(rb.containsKey("prefabricate.view")){
PREFABRICATE_VIEW=rb.getString("prefabricate.view");
}else{
PREFABRICATE_VIEW="";
}
if(rb.containsKey("dept.mk.id")){
DEPT_MK_ID=rb.getString("dept.mk.id");
}else{

9
src/nis/nms/web/actions/detection/MonitorDataAction.java
View File

@@ -297,6 +297,9 @@ public class MonitorDataAction extends BaseAction {
if (ctn != null && !"".equals(ctn)) {
sqlBuffer.append(" and cti.id =" + ctn);
}
if(checkType!=null&&checkType!=-1){
sqlBuffer.append(" and cti.id="+checkType);
}
if (!this.getAdminMark()) {
sqlBuffer.append(" and (((( cti.view_level=1 and cti.user_id=");
sqlBuffer.append(this.getUserID());
@@ -519,6 +522,9 @@ public class MonitorDataAction extends BaseAction {
sqlBuffer.append(" and Upper(cti.Check_Type_Name1) like '%" + ctn.toUpperCase() + "%'");
}
if(checkType!=null&&checkType!=-1){
sqlBuffer.append(" and cti.id="+checkType);
}
if (StringUtils.isNotBlank(stateInfo)) {
sqlBuffer.append(" and din.detection_state_info like '%" + stateInfo + "%'");
}
@@ -646,6 +652,9 @@ public class MonitorDataAction extends BaseAction {
if (cip != null && !"".equals(cip) && !"null".equals(cip)) {
sqlBuffer.append(" and nt.node_ip like '%" + cip.trim() + "%'");
}
if(checkType!=null&&checkType!=-1){
sqlBuffer.append(" and cti.id="+checkType);
}
if (nodeIpRange != null && !"".equals(nodeIpRange) && !"null".equals(nodeIpRange)) {
sqlBuffer.append(" and nt.node_ip like '" + nodeIpRange + "%'");
}

22
src/nis/nms/web/actions/sysManage/SysPopedomManageAction.java
View File

@@ -5,10 +5,13 @@ import java.io.FileInputStream;
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import nis.nms.core.Constants;
import nis.nms.core.Resource;
import nis.nms.domains.NodeTable;
import nis.nms.domains.TableDepartment;
@@ -1194,6 +1197,16 @@ public class SysPopedomManageAction extends BaseAction
String sqlCondition = "where zxbz=0";// 将查询条件记录到操作日志中
// 将查询请求记入到操作日志表中
this.addDBOperationRpt(commonService, sqlCondition, "xt_js_jbxx");
//2018-10-22 新增，region role角色只能配置预制 视图（业务系统）
//从配置文件获取配置的预制视图
String preView=Constants.PREFABRICATE_VIEW;
if(!StringUtil.isBlank(preView)){
String[] split = preView.split(",");
List<String> preViewIds=Arrays.asList(split);
this.getRequest().setAttribute("preViewIds", preViewIds);
}
} catch (Exception e)
{
e.printStackTrace();
@@ -1299,6 +1312,15 @@ public class SysPopedomManageAction extends BaseAction
yhzList.add(role);
}
this.getRequest().setAttribute("yhzList", yhzList);
//2018-10-22 新增，region role角色只能配置预制 视图（业务系统）
//从配置文件获取配置的预制视图
String preView=Constants.PREFABRICATE_VIEW;
if(!StringUtil.isBlank(preView)){
String[] split = preView.split(",");
List<String> preViewIds=Arrays.asList(split);
this.getRequest().setAttribute("preViewIds", preViewIds);
}
} catch (Exception e)
{
e.printStackTrace();