gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户管理与snat管理无更改；

Browse Source 
批量下发增加app相关配置表状态变更
This commit is contained in:
DuanDongmei
2018-12-04 09:13:20 +08:00
parent 7e52c1f4ca
commit 534b38fa4e
4 changed files with 34 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
View File

@@ -1519,16 +1519,19 @@ public class ConfigSynchronizationService extends BaseService{
List newList = new ArrayList();
if(entity.getServiceId().equals(3)){//ip drop回调类配置用了主表和子表关系
list = configSynchronizationDao.getCfgIndexList(entity);
List<Integer> compileIds = Lists.newArrayList();
for(int i=0;i<list.size();i++){
CfgIndexInfo cfg = (CfgIndexInfo) list.get(i);
compileIds.add(cfg.getCompileId());
}
List subList = configSynchronizationDao.getIpDropList("ip_port_cfg", compileIds);
for(int i=0;i<subList.size();i++){
IpPortCfg cfg = (IpPortCfg) subList.get(i);
newList.add(convertCallBackIp(cfg,cfg.getGroupId()));
if(!StringUtil.isEmpty(list)){
List<Integer> compileIds = Lists.newArrayList();
for(int i=0;i<list.size();i++){
CfgIndexInfo cfg = (CfgIndexInfo) list.get(i);
compileIds.add(cfg.getCompileId());
}
List subList = configSynchronizationDao.getIpDropList("ip_port_cfg", compileIds);
for(int i=0;i<subList.size();i++){
IpPortCfg cfg = (IpPortCfg) subList.get(i);
newList.add(convertCallBackIp(cfg,cfg.getGroupId()));
}
}
}else{
if(className.equals("AvFileSampleCfg")){
list = configSynchronizationDao.getAvFileCfgList(entity);

17
src/main/java/com/nis/web/service/configuration/UserManageService.java
View File

@@ -41,7 +41,7 @@ public class UserManageService extends BaseService{
protected UserManageDao userManageDao;
public Page<UserManage> findPage(Page<UserManage> page, UserManage entity) {
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page);
List<UserManage> list=userManageDao.findList(entity);
page.setList(list);
@@ -194,22 +194,15 @@ public class UserManageService extends BaseService{
}
//根据vpn服务器ip获取用户vpn服务器ip信息
public Map<String,String> getUser(String serverIp,String userName){
public String getUser(String serverIp,String userName){
Map<String, Object> params = new HashMap<String, Object>();
params.put("cmd", Constants.NTC_IP_REUSE_USER_GET);
params.put("server_ip", serverIp);
params.put("user_name", userName);
Map<String,String> map=new HashMap<String,String>();
try{
String url =Constants.IP_REUSE_CALL_CGI_URL;
String recv = ConfigServiceUtil.getCGI(url, params);
if (StringUtils.isNotBlank(recv)) {
map=(Map<String,String>)JSON.parse(recv);
}
} catch (Exception e) {
logger.error("查询失败", e);
}
return map;
String url =Constants.IP_REUSE_CALL_CGI_URL;
String recv = ConfigServiceUtil.getCGI(url, params);
return recv;
}

26
src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
View File

@@ -90,15 +90,6 @@
}
});
//批量审核
function approveAll(isAudit,isValid){
//设置检索url为审核路径
var auditUrl=$("#audit").val();
auditUrl=auditUrl+"?isAudit="+isAudit;
auditUrl=auditUrl+"&isValid="+isValid;
$("#searchForm").attr("action",auditUrl);
$("#searchForm").submit();
}
</script>
</head>
@@ -111,17 +102,6 @@
onClick="javascript:window.location='${ctx}/ntc/iplist/form?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
<!--
<button type="button" class="btn btn-primary"
onClick="approveAll(1,1)">
<i class="fa fa-plus"></i>
<spring:message code="arrpoved_all"></spring:message></button>
<button type="button" class="btn btn-primary"
onClick="approveAll(3,0)">
<i class="fa fa-plus"></i>
<spring:message code="cancle_all"></spring:message></button>
--!>
<c:set var="serviceImport" value="false"></c:set>
<c:set var="regionImport" value="false"></c:set>
<c:forEach items="${serviceList}" var="service" >
@@ -153,7 +133,7 @@
<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/iplist/list?functionId=${cfg.functionId}" method="post" class="form-search">
<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
<input id="audit" name="audit" type="hidden" value="${ctx}/ntc/iplist/audit"/>
<input id="audit" name="audit" type="hidden" value="${audit}"/>
<input id="exportType" type="hidden" value="${cfg.seltype}"/>
<input id="exportValue" type="hidden" value=""/>
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
@@ -378,7 +358,7 @@
<th><spring:message code="ratelimit"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="do_log"/></th>
<%-- <th><spring:message code="log_total"/></th> --%>
<th><spring:message code="log_total"/></th>
<th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th>
@@ -433,7 +413,7 @@
</c:if>
</c:forEach>
</td>
<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
<c:if test="${indexCfg.isAreaEffective==1}">

35
src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp
View File

@@ -100,7 +100,6 @@
<form:option value="userName"><spring:message code="user"></spring:message></form:option>
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
<form:option value="addrPoolName"><spring:message code="address_pool"></spring:message></form:option>
<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
</form:select>
@@ -108,13 +107,7 @@
<input id="intype" class="form-control input-medium" type="text" value="">
<div class="input-group-btn">
<form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${serviceList}" var="service">
<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
</c:forEach>
</form:select>
<form:select path="isValid" class="selectpicker select2 input-small" >
<form:select path="isValid" class="selectpicker select2 input-small" >
<form:option value=""><spring:message code="select"/></form:option>
<form:option value="1"><spring:message code="yes"/></form:option>
<form:option value="0"><spring:message code="no"/></form:option>
@@ -131,7 +124,7 @@
<shiro:hasPermission name="snat_policy:config">
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/snatPolicyForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/snatDelete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/exportSnat?functionId=${cfg.functionId }" searchUrl="${ctx}/manipulation/ipmulitiplex/snatPolicyList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<%-- <sys:delRow url="${ctx}/manipulation/ipmulitiplex/exportSnat?functionId=${cfg.functionId }" searchUrl="${ctx}/manipulation/ipmulitiplex/snatPolicyList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow> --%>
</shiro:hasPermission>
<shiro:hasPermission name="snat_policy:confirm">
<div class="btn-group">
@@ -285,26 +278,26 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column r.cfg_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="address_pool"/></th>
<th><spring:message code="user"/></th>
<th class="sort-column a.action"><spring:message code="block_type"/></th>
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<%-- <th class="sort-column a.action"><spring:message code="block_type"/></th> --%>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="do_log"/></th>
<%-- <th><spring:message code="do_log"/></th> --%>
<%-- <th><spring:message code="whether_area_block"/></th> --%>
<th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="creator"/></th>
<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>
<th class="sort-column a.edit_time"><spring:message code="edit_time"/></th>
<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
<th><spring:message code="auditor"/></th>
<th class="sort-column a.audit_time"><spring:message code="audit_time"/></th>
<th class="sort-column r.audit_time"><spring:message code="audit_time"/></th>
</tr>
</thead>
<tbody>
@@ -330,13 +323,13 @@
</c:forEach>
</td>
<td>
<%-- <td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.action }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td>
</td> --%>
<td>
<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
@@ -350,13 +343,13 @@
<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
</c:choose>
</td>
<td>
<%-- <td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doLog }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td>
</td> --%>
<%-- <td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
<c:if test="${indexCfg.isAreaEffective==1}">