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

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

Browse Source
This commit is contained in:
zhanghongqing
2018-10-17 10:06:26 +08:00
parent 6f10ac027e 6b610bf665
commit 5dd4f4b239
36 changed files with 1118 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/main/java/com/nis/domain/configuration/GroupAreaInfo.java Normal file
View File

@@ -0,0 +1,47 @@
package com.nis.domain.configuration;
import java.io.Serializable;
import java.util.Date;
/**
* 分组地理信息
*/
public class GroupAreaInfo extends BaseCfg<GroupAreaInfo> implements Serializable{
private static final long serialVersionUID = 3312689200711339511L;
private Long id;
private Integer groupId;
private Integer areaCode;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Integer getGroupId() {
return groupId;
}
public void setGroupId(Integer groupId) {
this.groupId = groupId;
}
public Integer getAreaCode() {
return areaCode;
}
public void setAreaCode(Integer areaCode) {
this.areaCode = areaCode;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getEditTime() {
return editTime;
}
public void setEditTime(Date editTime) {
this.editTime = editTime;
}
}

14
src/main/java/com/nis/domain/configuration/template/IpAllTemplate.java
View File

@@ -8,6 +8,7 @@
*/
package com.nis.domain.configuration.template;
import com.google.gson.JsonObject;
import com.nis.util.excel.ExcelField;
/**
@@ -38,14 +39,14 @@ public class IpAllTemplate {
public void setCfgDesc(String cfgDesc) {
this.cfgDesc = cfgDesc;
}
@ExcelField(title="client_ip",align=2,sort=2)
@ExcelField(title="client_ip",align=2,sort=11)
public String getSrcIpAddress() {
return srcIpAddress;
}
public void setSrcIpAddress(String srcIpAddress) {
this.srcIpAddress = srcIpAddress;
}
@ExcelField(title="server_ip",align=2,sort=3)
@ExcelField(title="server_ip",align=2,sort=12)
public String getDestIpAddress() {
return destIpAddress;
}
@@ -53,14 +54,14 @@ public class IpAllTemplate {
this.destIpAddress = destIpAddress;
}
@ExcelField(title="client_port",align=2,sort=4)
@ExcelField(title="client_port",align=2,sort=13)
public String getSrcPort() {
return srcPort;
}
public void setSrcPort(String srcPort) {
this.srcPort = srcPort;
}
@ExcelField(title="server_port",align=2,sort=5)
@ExcelField(title="server_port",align=2,sort=14)
public String getDestPort() {
return destPort;
}
@@ -68,18 +69,19 @@ public class IpAllTemplate {
this.destPort = destPort;
}
@ExcelField(title="protocol",align=2,sort=6)
@ExcelField(title="protocol",align=2,sort=15)
public Integer getProtocol() {
return protocol;
}
public void setProtocol(Integer protocol) {
this.protocol = protocol;
}
@ExcelField(title="direction",align=2,sort=7)
@ExcelField(title="direction",align=2,sort=16)
public Integer getDirection() {
return direction;
}
public void setDirection(Integer direction) {
this.direction = direction;
}
}

36
src/main/java/com/nis/domain/configuration/template/IpPayloadTemplate.java Normal file
View File

@@ -0,0 +1,36 @@
package com.nis.domain.configuration.template;
import com.nis.util.excel.ExcelField;
/**
* EXCEL IPPayload导入替换模板
*
*/
public class IpPayloadTemplate extends IpAllTemplate {
private String userRegion1;
private String userRegion2;
private String userRegion3;
@ExcelField(title="replace_zone",dictType="INTERCEPT_REPLACE_ZONE",align=2,sort=2)
public String getUserRegion1() {
return userRegion1;
}
public void setUserRegion1(String userRegion1) {
this.userRegion1 = userRegion1;
}
@ExcelField(title="replaced_content",align=2,sort=2)
public String getUserRegion2() {
return userRegion2;
}
public void setUserRegion2(String userRegion1) {
this.userRegion2 = userRegion2;
}
@ExcelField(title="replace_content",align=2,sort=2)
public String getUserRegion3() {
return userRegion3;
}
public void setUserRegion3(String userRegion1) {
this.userRegion3 = userRegion3;
}
}

25
src/main/java/com/nis/domain/configuration/template/IpRateLimitTemplate.java
View File

@@ -1,24 +1,19 @@
package com.nis.domain.configuration.template;
import com.nis.util.excel.ExcelField;
/**
* wx 将部分字段的标题改变，或者不需要的字段隐藏
* 隐藏方法，对于不需要的字段或者方法，Override该字段方法，但是@ExcelField注解不需要加上了
* @author dell
* EXCEL IP导入限速模板
*
*/
public class IpRateLimitTemplate extends IpCfgTemplate {
public class IpRateLimitTemplate extends IpAllTemplate {
@Override
public Integer getIrType() {
// TODO Auto-generated method stub
return super.getIrType();
private String userRegion1;
@ExcelField(title="rate_limte",align=2,sort=2)
public String getUserRegion1() {
return userRegion1;
}
@Override
public Integer getDnsStrategyId() {
// TODO Auto-generated method stub
return super.getDnsStrategyId();
public void setUserRegion1(String userRegion1) {
this.userRegion1 = userRegion1;
}
}

69
src/main/java/com/nis/domain/configuration/template/IpWhitelistTemplate.java Normal file
View File

@@ -0,0 +1,69 @@
/**
*@Title: BaseStringConfig.java
*@Package com.nis.domain.restful
*@Description TODO
*@author dell
*@date 2018年2月5日 下午5:26:02
*@version 版本号
*/
package com.nis.domain.configuration.template;
import com.nis.util.excel.ExcelField;
/**
* @Description: excel导入IP白名单配置模板
*/
public class IpWhitelistTemplate {
/**
* @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
*
* @since 1.0.0
*/
private String cfgDesc;
private String srcIpAddress;
private String destIpAddress;
private String srcPort;
private String destPort;
@ExcelField(title="config_describe",align=2,sort=1)
public String getCfgDesc() {
return cfgDesc;
}
public void setCfgDesc(String cfgDesc) {
this.cfgDesc = cfgDesc;
}
@ExcelField(title="client_ip",align=2,sort=11)
public String getSrcIpAddress() {
return srcIpAddress;
}
public void setSrcIpAddress(String srcIpAddress) {
this.srcIpAddress = srcIpAddress;
}
@ExcelField(title="server_ip",align=2,sort=12)
public String getDestIpAddress() {
return destIpAddress;
}
public void setDestIpAddress(String destIpAddress) {
this.destIpAddress = destIpAddress;
}
@ExcelField(title="client_port",align=2,sort=13)
public String getSrcPort() {
return srcPort;
}
public void setSrcPort(String srcPort) {
this.srcPort = srcPort;
}
@ExcelField(title="server_port",align=2,sort=14)
public String getDestPort() {
return destPort;
}
public void setDestPort(String destPort) {
this.destPort = destPort;
}
}

11
src/main/java/com/nis/domain/maat/GroupReuseCfg.java
View File

@@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.List;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
import com.nis.domain.maat.MaatCfg.IpCfg;
import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
import com.nis.domain.maat.MaatCfg.StringCfg;
@@ -13,7 +14,15 @@ import com.nis.domain.maat.MaatCfg.StringCfg;
*
*/
public class GroupReuseCfg implements Serializable {
@Expose
@SerializedName("service")
private Integer serviceId;
public Integer getServiceId() {
return serviceId;
}
public void setServiceId(Integer serviceId) {
this.serviceId = serviceId;
}
/**
*
*/

9
src/main/java/com/nis/domain/maat/MaatCfg.java
View File

@@ -258,6 +258,15 @@ public class MaatCfg implements Serializable {
@Expose
@SerializedName("opTime")
private Date auditTime;
@Expose
private String userRegion;
public String getUserRegion() {
return userRegion;
}
public void setUserRegion(String userRegion) {
this.userRegion = userRegion;
}
public Integer getRegionId() {
return regionId;
}

3
src/main/java/com/nis/util/Constants.java
View File

@@ -686,4 +686,7 @@ public final class Constants {
// 区域/运营商配置下发时tag值
public static final String AREA_TAG=Configurations.getStringProperty("area_tag","location");
public static final String ISP_TAG=Configurations.getStringProperty("isp_tag","isp");
//音视频样例时长限制，单位秒
public static final int AV_DURATION_LIMIT=Configurations.getIntProperty("av_duration_limit", 120);
}

62
src/main/java/com/nis/util/excel/ExportExcel.java
View File

@@ -43,6 +43,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.Lists;
import com.nis.domain.FunctionRegionDict;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.SysDataDictionaryItem;
import com.nis.domain.basics.ServiceDictInfo;
import com.nis.util.DictUtils;
@@ -130,7 +131,7 @@ public class ExportExcel {
getFields(list,cls.getSuperclass());
}
}
public String[] validRegionFieldAndSetComment(String headerStr,String commentStr,FunctionRegionDict region,Properties msgProp){
public String[] validRegionFieldAndSetComment(String headerStr,String commentStr,FunctionRegionDict region,FunctionServiceDict service,Properties msgProp){
String[] titleInfo=new String[2];
if(region.getIsMaat().equals(1)){//maat
if(region.getRegionType().equals(1)){//IP配置
@@ -237,21 +238,54 @@ public class ExportExcel {
}
//导入的Protocol
if("protocol".equals(headerStr)){
if(StringUtil.isEmpty(region.getConfigProtocol())){
headerStr="";
commentStr="";
}else{
if(service.getFunctionId().equals(5) ){
commentStr="";
List<SysDataDictionaryItem> protocol=DictUtils.getDictList("PROTOCOL");
if(protocol !=null && protocol.size()>0){
for (SysDataDictionaryItem sysDataDictionaryItem : protocol) {
if((","+region.getConfigProtocol()+",").indexOf(","+sysDataDictionaryItem.getItemCode()+",") >0){
if(StringUtil.isEmpty(msgProp.getProperty(sysDataDictionaryItem.getItemValue()))){
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+":"+sysDataDictionaryItem.getItemValue()+"\n";
}else{
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+":"+msgProp.getProperty(sysDataDictionaryItem.getItemValue())+"\n";
if(service.getAction().equals(16) && sysDataDictionaryItem.getItemCode().equals(6)){
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+":"+sysDataDictionaryItem.getItemValue()+"\n";
}
if(service.getAction().equals(1) &&
(sysDataDictionaryItem.getItemCode().equals(6)
|| sysDataDictionaryItem.getItemCode().equals(17)
|| sysDataDictionaryItem.getItemCode().equals(0) )){
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+":"+sysDataDictionaryItem.getItemValue()+"\n";
}
if(service.getAction().equals(32) &&
(sysDataDictionaryItem.getItemCode().equals(6)
|| sysDataDictionaryItem.getItemCode().equals(17)
|| sysDataDictionaryItem.getItemCode().equals(1)
|| sysDataDictionaryItem.getItemCode().equals(15)
|| sysDataDictionaryItem.getItemCode().equals(51)
|| sysDataDictionaryItem.getItemCode().equals(50))){
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+":"+sysDataDictionaryItem.getItemValue()+"\n";
}
if(service.getAction().equals(64) &&
(sysDataDictionaryItem.getItemCode().equals(6)
|| sysDataDictionaryItem.getItemCode().equals(17) )){
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+":"+sysDataDictionaryItem.getItemValue()+"\n";
}
}
}
}else{
if(StringUtil.isEmpty(region.getConfigProtocol())){
headerStr="";
commentStr="";
}else{
commentStr="";
List<SysDataDictionaryItem> protocol=DictUtils.getDictList("PROTOCOL");
if(protocol !=null && protocol.size()>0){
for (SysDataDictionaryItem sysDataDictionaryItem : protocol) {
if((","+region.getConfigProtocol()+",").indexOf(","+sysDataDictionaryItem.getItemCode()+",") >0){
if(StringUtil.isEmpty(msgProp.getProperty(sysDataDictionaryItem.getItemValue()))){
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+":"+sysDataDictionaryItem.getItemValue()+"\n";
}else{
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+":"+msgProp.getProperty(sysDataDictionaryItem.getItemValue())+"\n";
}
}
}
}
}
@@ -419,7 +453,7 @@ public class ExportExcel {
* @param type 导出类型（1:导出数据；2：导出模板）
* @param groups 导入分组
*/
public ExportExcel(FunctionRegionDict region,Properties msgProp,String title, Class<?> cls, int type, int... groups){
public ExportExcel(FunctionServiceDict service,FunctionRegionDict region,Properties msgProp,String title, Class<?> cls, int type, int... groups){
List<Field> list=new ArrayList<Field>();
// Get annotation field
//递归获取cls实体对象及父级对象的属性
@@ -496,7 +530,7 @@ public class ExportExcel {
commentStr="";
}else{
//判断此业务导出模板内容，设置导入提示信息
String[] titleInfo=validRegionFieldAndSetComment(titleStr,commentStr,region,msgProp);
String[] titleInfo=validRegionFieldAndSetComment(titleStr,commentStr,region,service,msgProp);
titleStr=titleInfo[0];
commentStr=titleInfo[1];
}
@@ -1180,7 +1214,7 @@ public class ExportExcel {
List<Field> list=new ArrayList<Field>();
// Get annotation field
//递归获取cls实体对象及父级对象的属性
getFields(list, clsMap.get(title));
getFields(list, clsMap.get(title).getClass());
if(!StringUtil.isEmpty(list)){
for (Field f : list){
ExcelField ef = f.getAnnotation(ExcelField.class);

177
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -1,6 +1,7 @@
package com.nis.web.controller;
import java.beans.PropertyEditorSupport;
import java.io.IOException;
import java.lang.reflect.Field;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -49,6 +50,7 @@ import com.nis.domain.configuration.RequestInfo;
import com.nis.domain.configuration.StringCfgTemplate;
import com.nis.domain.configuration.template.IpAllTemplate;
import com.nis.domain.configuration.template.IpCfgTemplate;
import com.nis.domain.configuration.template.IpRateLimitTemplate;
import com.nis.domain.log.BaseLogEntity;
import com.nis.domain.log.SearchReport;
import com.nis.exceptions.MaatConvertException;
@@ -614,17 +616,17 @@ public class BaseController {
if(dict.getRegionType()==1){
List<IpCfgTemplate> list = Lists.newArrayList();
list.add(new IpCfgTemplate());
new ExportExcel(new FunctionRegionDict(),msgProp,null, IpCfgTemplate.class, 2).setDataList(msgProp,list,null).
new ExportExcel(new FunctionServiceDict(),new FunctionRegionDict(),msgProp,null, IpCfgTemplate.class, 2).setDataList(msgProp,list,null).
write(request,response, fileName).dispose();
}else if(dict.getRegionType()==2){
List<StringCfgTemplate> list = Lists.newArrayList();
list.add(new StringCfgTemplate());
new ExportExcel(new FunctionRegionDict(),msgProp,null, StringCfgTemplate.class, 2).setDataList(msgProp,list,null).
new ExportExcel(new FunctionServiceDict(),new FunctionRegionDict(),msgProp,null, StringCfgTemplate.class, 2).setDataList(msgProp,list,null).
write(request,response, fileName).dispose();
}else if(dict.getRegionType()==3){
List<ComplexStringCfgTemplate> list = Lists.newArrayList();
list.add(new ComplexStringCfgTemplate());
new ExportExcel(new FunctionRegionDict(),msgProp,null, ComplexStringCfgTemplate.class, 2).setDataList(msgProp,list,null).
new ExportExcel(new FunctionServiceDict(),new FunctionRegionDict(),msgProp,null, ComplexStringCfgTemplate.class, 2).setDataList(msgProp,list,null).
write(request,response, fileName).dispose();
}
}
@@ -646,17 +648,17 @@ public class BaseController {
if(dict.getRegionType()==1){
List<IpCfgTemplate> list = Lists.newArrayList();
list.add((IpCfgTemplate)clazz.newInstance());
new ExportExcel(new FunctionRegionDict(),msgProp,null, clazz, 2).setDataList(msgProp,list,null).
new ExportExcel(new FunctionServiceDict(),new FunctionRegionDict(),msgProp,null, clazz, 2).setDataList(msgProp,list,null).
write(request,response, fileName).dispose();
}else if(dict.getRegionType()==2){
List<StringCfgTemplate> list = Lists.newArrayList();
list.add(new StringCfgTemplate());
new ExportExcel(new FunctionRegionDict(),msgProp,null, clazz, 2).setDataList(msgProp,list,null).
new ExportExcel(new FunctionServiceDict(),new FunctionRegionDict(),msgProp,null, clazz, 2).setDataList(msgProp,list,null).
write(request,response, fileName).dispose();
}else if(dict.getRegionType()==3){
List<ComplexStringCfgTemplate> list = Lists.newArrayList();
list.add(new ComplexStringCfgTemplate());
new ExportExcel(new FunctionRegionDict(),msgProp,null, clazz, 2).setDataList(msgProp,list,null).
new ExportExcel(new FunctionServiceDict(),new FunctionRegionDict(),msgProp,null, clazz, 2).setDataList(msgProp,list,null).
write(request,response, fileName).dispose();
}
}
@@ -788,53 +790,51 @@ public class BaseController {
}
}
public List<BaseIpCfg> checkIpCfg(FunctionServiceDict serviceDict,FunctionRegionDict regionDict,List<IpAllTemplate> list) throws ServiceException{
public List<BaseIpCfg> checkIpCfg(FunctionServiceDict serviceDict,FunctionRegionDict regionDict,List<?> list) throws ServiceException{
List<BaseIpCfg> ipList=new ArrayList<BaseIpCfg>();
Properties prop=this.getMsgProp();
for (int i = 0; i < list.size(); i++) {
IpAllTemplate ipCfg=list.get(i);
IpPortCfg baseIpCfg=new IpPortCfg();
baseIpCfg.setCfgDesc(ipCfg.getCfgDesc());
if(regionDict.getIsMaat().equals(1)){
BeanUtils.copyProperties(list.get(i), baseIpCfg);
if(regionDict.getRegionType().equals(1)){
boolean srcIpEmpty=false;
boolean srcPortEmpty=false;
if(StringUtil.isEmpty(ipCfg.getSrcIpAddress())){
if(StringUtil.isEmpty(baseIpCfg.getSrcIpAddress())){
srcIpEmpty=true;
}
if(StringUtil.isEmpty(ipCfg.getDestIpAddress())){
if(StringUtil.isEmpty(baseIpCfg.getDestIpAddress())){
if(srcIpEmpty){
baseIpCfg.setSrcIpAddress("0.0.0.0");
baseIpCfg.setDestIpAddress("0.0.0.0");
baseIpCfg.setIpPattern(3);
baseIpCfg.setIpType(4);
}else{
if(ipCfg.getSrcIpAddress().indexOf(":") > -1){
if(ipCfg.getSrcIpAddress().indexOf("-") > -1){
baseIpCfg.setSrcIpAddress(ipCfg.getSrcIpAddress());
if(baseIpCfg.getSrcIpAddress().indexOf(":") > -1){
if(baseIpCfg.getSrcIpAddress().indexOf("-") > -1){
baseIpCfg.setSrcIpAddress(baseIpCfg.getSrcIpAddress());
baseIpCfg.setDestIpAddress("::-::");
baseIpCfg.setIpPattern(2);
}else if(ipCfg.getSrcIpAddress().indexOf("/") > -1){
baseIpCfg.setSrcIpAddress(ipCfg.getSrcIpAddress());
}else if(baseIpCfg.getSrcIpAddress().indexOf("/") > -1){
baseIpCfg.setSrcIpAddress(baseIpCfg.getSrcIpAddress());
baseIpCfg.setDestIpAddress("::/128");
baseIpCfg.setIpPattern(1);
}else{
baseIpCfg.setSrcIpAddress(ipCfg.getSrcIpAddress());
baseIpCfg.setSrcIpAddress(baseIpCfg.getSrcIpAddress());
baseIpCfg.setDestIpAddress("::");
baseIpCfg.setIpPattern(3);
}
baseIpCfg.setIpType(6);
}else{
if(ipCfg.getSrcIpAddress().indexOf("-") > -1){
baseIpCfg.setSrcIpAddress("0.0.0.0-"+ipCfg.getSrcIpAddress().split("-")[0].substring(0,ipCfg.getSrcIpAddress().indexOf("-")+1)+ipCfg.getSrcIpAddress().split("-")[1]);
if(baseIpCfg.getSrcIpAddress().indexOf("-") > -1){
baseIpCfg.setSrcIpAddress("0.0.0.0-"+baseIpCfg.getSrcIpAddress().split("-")[0].substring(0,baseIpCfg.getSrcIpAddress().indexOf("-")+1)+baseIpCfg.getSrcIpAddress().split("-")[1]);
baseIpCfg.setDestIpAddress("0.0.0.0-0.0.0.0");
baseIpCfg.setIpPattern(2);
}else if(ipCfg.getSrcIpAddress().indexOf("/") > -1){
baseIpCfg.setSrcIpAddress(ipCfg.getSrcIpAddress());
}else if(baseIpCfg.getSrcIpAddress().indexOf("/") > -1){
baseIpCfg.setSrcIpAddress(baseIpCfg.getSrcIpAddress());
baseIpCfg.setDestIpAddress("0.0.0.0/16");
baseIpCfg.setIpPattern(1);
}else{
baseIpCfg.setSrcIpAddress(ipCfg.getSrcIpAddress());
baseIpCfg.setSrcIpAddress(baseIpCfg.getSrcIpAddress());
baseIpCfg.setDestIpAddress("0.0.0.0");
baseIpCfg.setIpPattern(3);
}
@@ -843,48 +843,50 @@ public class BaseController {
}
} else{
if(srcIpEmpty){
if(ipCfg.getDestIpAddress().indexOf(":") > -1){
if(ipCfg.getDestIpAddress().indexOf("-") > -1){
baseIpCfg.setDestIpAddress(ipCfg.getDestIpAddress());
if(baseIpCfg.getDestIpAddress().indexOf(":") > -1){
if(baseIpCfg.getDestIpAddress().indexOf("-") > -1){
baseIpCfg.setDestIpAddress(baseIpCfg.getDestIpAddress());
baseIpCfg.setSrcIpAddress("::-::");
baseIpCfg.setIpPattern(2);
}else if(ipCfg.getDestIpAddress().indexOf("/") > -1){
baseIpCfg.setDestIpAddress(ipCfg.getDestIpAddress());
}else if(baseIpCfg.getDestIpAddress().indexOf("/") > -1){
baseIpCfg.setDestIpAddress(baseIpCfg.getDestIpAddress());
baseIpCfg.setSrcIpAddress("::/128");
baseIpCfg.setIpPattern(1);
}else{
baseIpCfg.setDestIpAddress(ipCfg.getDestIpAddress());
baseIpCfg.setDestIpAddress(baseIpCfg.getDestIpAddress());
baseIpCfg.setSrcIpAddress("::");
baseIpCfg.setIpPattern(3);
}
baseIpCfg.setIpType(6);
}else{
if(ipCfg.getDestIpAddress().indexOf("-") > -1){
baseIpCfg.setDestIpAddress("0.0.0.0-"+ipCfg.getDestIpAddress().split("-")[0].substring(0,ipCfg.getDestIpAddress().indexOf("-")+1)+ipCfg.getDestIpAddress().split("-")[1]);
if(baseIpCfg.getDestIpAddress().indexOf("-") > -1){
baseIpCfg.setDestIpAddress("0.0.0.0-"+baseIpCfg.getDestIpAddress().split("-")[0]
.substring(0,baseIpCfg.getDestIpAddress().indexOf("-")+1)
+baseIpCfg.getDestIpAddress().split("-")[1]);
baseIpCfg.setSrcIpAddress("0.0.0.0-0.0.0.0");
baseIpCfg.setIpPattern(2);
}else if(ipCfg.getDestIpAddress().indexOf("/") > -1){
baseIpCfg.setDestIpAddress(ipCfg.getDestIpAddress());
}else if(baseIpCfg.getDestIpAddress().indexOf("/") > -1){
baseIpCfg.setDestIpAddress(baseIpCfg.getDestIpAddress());
baseIpCfg.setSrcIpAddress("0.0.0.0/16");
baseIpCfg.setIpPattern(1);
}else{
baseIpCfg.setDestIpAddress(ipCfg.getDestIpAddress());
baseIpCfg.setDestIpAddress(baseIpCfg.getDestIpAddress());
baseIpCfg.setSrcIpAddress("0.0.0.0");
baseIpCfg.setIpPattern(3);
}
baseIpCfg.setIpType(4);
}
}else{
baseIpCfg.setSrcIpAddress(ipCfg.getSrcIpAddress());
baseIpCfg.setDestIpAddress(ipCfg.getDestIpAddress());
if(ipCfg.getSrcIpAddress().indexOf(":") > -1){
baseIpCfg.setSrcIpAddress(baseIpCfg.getSrcIpAddress());
baseIpCfg.setDestIpAddress(baseIpCfg.getDestIpAddress());
if(baseIpCfg.getSrcIpAddress().indexOf(":") > -1){
baseIpCfg.setIpType(6);
}else{
baseIpCfg.setIpType(4);
}
if(ipCfg.getSrcIpAddress().indexOf("-") > -1){
if(baseIpCfg.getSrcIpAddress().indexOf("-") > -1){
baseIpCfg.setIpPattern(2);
}else if(ipCfg.getSrcIpAddress().indexOf("/") > -1){
}else if(baseIpCfg.getSrcIpAddress().indexOf("/") > -1){
baseIpCfg.setIpPattern(1);
}else{
baseIpCfg.setIpPattern(3);
@@ -895,49 +897,49 @@ public class BaseController {
//TODO 判断源IP和目的IP的值
//TODO 判断源IP和目的IP格式
if(StringUtil.isEmpty(ipCfg.getSrcPort())){
if(StringUtil.isEmpty(baseIpCfg.getSrcPort())){
srcPortEmpty=true;
}
if(StringUtil.isEmpty(ipCfg.getDestPort())){
if(StringUtil.isEmpty(baseIpCfg.getDestPort())){
if(srcPortEmpty){
baseIpCfg.setSrcPort("0");
baseIpCfg.setDestPort("0");
baseIpCfg.setPortPattern(1);
}else{
if(ipCfg.getSrcPort().indexOf("/") > -1){
if(baseIpCfg.getSrcPort().indexOf("/") > -1){
baseIpCfg.setDestPort("0/0");
baseIpCfg.setPortPattern(2);
}else{
baseIpCfg.setDestPort("0");
baseIpCfg.setPortPattern(1);
}
baseIpCfg.setSrcPort(ipCfg.getSrcPort());
baseIpCfg.setSrcPort(baseIpCfg.getSrcPort());
}
}else{
if(srcPortEmpty){
if(ipCfg.getDestPort().indexOf("/") > -1){
if(baseIpCfg.getDestPort().indexOf("/") > -1){
baseIpCfg.setSrcPort("0/0");
baseIpCfg.setPortPattern(2);
}else{
baseIpCfg.setSrcPort("0");
baseIpCfg.setPortPattern(1);
}
baseIpCfg.setDestPort(ipCfg.getSrcPort());
baseIpCfg.setDestPort(baseIpCfg.getSrcPort());
}else{
if(ipCfg.getSrcPort().indexOf("/") > -1){
if(baseIpCfg.getSrcPort().indexOf("/") > -1){
baseIpCfg.setPortPattern(2);
}else{
baseIpCfg.setPortPattern(1);
}
baseIpCfg.setSrcPort(ipCfg.getSrcPort());
baseIpCfg.setDestPort(ipCfg.getDestPort());
baseIpCfg.setSrcPort(baseIpCfg.getSrcPort());
baseIpCfg.setDestPort(baseIpCfg.getDestPort());
}
}
//TODO 判断源端口和目的端口格式
//TODO 判断源和目的端口的值
if(StringUtil.isEmpty(ipCfg.getProtocol())){
if(StringUtil.isEmpty(baseIpCfg.getProtocol())){
if(StringUtil.isEmpty(regionDict.getConfigProtocol())){
baseIpCfg.setProtocol(0);
}else{
@@ -945,24 +947,23 @@ public class BaseController {
}
baseIpCfg.setProtocolId(serviceDict.getProtocolId());
}else{
baseIpCfg.setProtocol(ipCfg.getProtocol());
baseIpCfg.setProtocol(baseIpCfg.getProtocol());
baseIpCfg.setProtocolId(serviceDict.getProtocolId());
}
//TODO 判断Protocol的值
if(StringUtil.isEmpty(ipCfg.getDirection())){
if(StringUtil.isEmpty(baseIpCfg.getDirection())){
if(StringUtil.isEmpty(regionDict.getConfigDirection())){
baseIpCfg.setDirection(0);
}else{
baseIpCfg.setDirection(Integer.parseInt(regionDict.getConfigDirection().split(",")[0]));
}
}else{
baseIpCfg.setDirection(ipCfg.getDirection());
baseIpCfg.setDirection(baseIpCfg.getDirection());
}
//TODO 判断Direction的值
}
}
ipList.add(baseIpCfg);
}
return ipList;
@@ -2159,40 +2160,48 @@ public class BaseController {
ImportExcel ei = new ImportExcel(file, 0, 0);
FunctionRegionDict regionDict=DictUtils.getFunctionRegionDict(Integer.parseInt(regionDictIds.split(",")[i]));
if(regionDict.getIsMaat().equals(1)){
if(regionDict.getRegionType().equals(1)){
List<IpAllTemplate> list = ei.getDataList(IpAllTemplate.class);
ipPortCfgs=this.checkIpCfg(serviceDict,regionDict,list);
Date date=new Date();
for(BaseIpCfg cfg : ipPortCfgs){
CfgIndexInfo cfgIndexInfo=new CfgIndexInfo();
cfg.setAction(serviceDict.getAction());
cfg.setAuditorId(UserUtils.getUser().getId());
cfg.setAuditTime(date);
cfg.setCfgRegionCode(regionDict.getConfigRegionCode());
cfg.setCfgType(regionDict.getConfigRegionValue());
cfg.setCreateTime(date);
cfg.setCreatorId(UserUtils.getUser().getId());
cfg.setDoLog(1);
cfg.setFunctionId(regionDict.getFunctionId());
cfg.setIsAudit(0);
cfg.setIsValid(0);
cfg.setIsAreaEffective(0);
cfg.setAttribute("0");
cfg.setClassify("0");
cfg.setLable("0");
cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0:requestId);
cfg.setServiceId(serviceDict.getServiceId());
cfg.setTableName("ip_port_cfg");
cfg.setCompileId(ipCfgService.getCompileId());
BeanUtils.copyProperties(cfg, cfgIndexInfo);
cfgIndexInfos.add(cfgIndexInfo);
if(regionDict.getFunctionId().equals(5) ){
if(serviceDict.getAction().equals(64)){//ip
if(regionDict.getRegionType().equals(1)){
List<IpRateLimitTemplate> list = ei.getDataList(IpRateLimitTemplate.class);
ipPortCfgs=this.checkIpCfg(serviceDict,regionDict,list);
}
}else{
if(regionDict.getRegionType().equals(1)){
List<IpAllTemplate> list = ei.getDataList(IpAllTemplate.class);
ipPortCfgs=this.checkIpCfg(serviceDict,regionDict,list);
}
}
}else if(regionDict.getRegionType().equals(1)){
List<IpAllTemplate> list = ei.getDataList(IpAllTemplate.class);
ipPortCfgs=this.checkIpCfg(serviceDict,regionDict,list);
}
Date date=new Date();
for(BaseIpCfg cfg : ipPortCfgs){
CfgIndexInfo cfgIndexInfo=new CfgIndexInfo();
cfg.setAction(serviceDict.getAction());
cfg.setAuditorId(UserUtils.getUser().getId());
cfg.setAuditTime(date);
cfg.setCfgRegionCode(regionDict.getConfigRegionCode());
cfg.setCfgType(regionDict.getConfigRegionValue());
cfg.setCreateTime(date);
cfg.setCreatorId(UserUtils.getUser().getId());
cfg.setDoLog(1);
cfg.setFunctionId(regionDict.getFunctionId());
cfg.setIsAudit(0);
cfg.setIsValid(0);
cfg.setIsAreaEffective(0);
cfg.setAttribute("0");
cfg.setClassify("0");
cfg.setLable("0");
cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0:requestId);
cfg.setServiceId(serviceDict.getServiceId());
cfg.setTableName("ip_port_cfg");
cfg.setCompileId(ipCfgService.getCompileId());
BeanUtils.copyProperties(cfg, cfgIndexInfo);
cfgIndexInfos.add(cfgIndexInfo);
}
ipCfgService.saveBatch(ipPortCfgs, IpCfgDao.class);
ipCfgService.saveCfgIndexOf(cfgIndexInfos);
}

89
src/main/java/com/nis/web/controller/configuration/GroupAreaController.java Normal file
View File

@@ -0,0 +1,89 @@
package com.nis.web.controller.configuration;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.configuration.GroupAreaInfo;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.service.configuration.GroupAreaService;
/**
* 分组地理信息管理
*
*/
@Controller
@RequestMapping(value = "${adminPath}/cfg/groupArea")
public class GroupAreaController extends BaseController {
@Autowired
private GroupAreaService groupAreaService;
@RequestMapping(value = { "/groupAreaList", "" })
public String policyGroupList(GroupAreaInfo cfg, HttpServletRequest request, HttpServletResponse response,
Model model) {
if (cfg == null)cfg = new GroupAreaInfo();
Page<GroupAreaInfo> pageCondition = new Page<GroupAreaInfo>(request, response, "r");
Page page = groupAreaService.findGroupAreaInfoList(pageCondition, cfg);
// 获取策略分组信息
List<PolicyGroupInfo> policyGroups = policyGroupInfoService.findNatPolicyGroups();
// 获取区域信息
initFormCondition(model);
model.addAttribute("cfg", cfg);
model.addAttribute("page", page);
model.addAttribute("policyGroups", policyGroups);
return "/cfg/manipulation/ipmulitiplex/groupAreaList";
}
@RequestMapping(value={"/groupAreaForm"})
public String form(String ids,Model model,String doAction,RedirectAttributes redirectAttributes) {
GroupAreaInfo groupArea=new GroupAreaInfo();
// 获取未使用的策略分组
List<PolicyGroupInfo> groups = policyGroupInfoService.findNatPolicyGroups();
groups = groupAreaService.getNotUsedPolicyGroups(groups);
if(!StringUtil.isEmpty(ids)){
groupArea=groupAreaService.getInfoById(Integer.parseInt(ids));
groups.add(policyGroupInfoService.getById(groupArea.getGroupId()));
}
// 获取区域信息
initFormCondition(model);
model.addAttribute("_cfg", groupArea);
model.addAttribute("policyGroups", groups);
return "/cfg/manipulation/ipmulitiplex/groupAreaForm";
}
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(GroupAreaInfo cfg,Model model,RedirectAttributes redirectAttributes) {
try {
groupAreaService.saveOrUpdate(cfg);
addMessage(redirectAttributes, "save_success");
} catch (Exception e) {
logger.error("新增失败",e);
addMessage(redirectAttributes, "save_failed");
}
return "redirect:" + adminPath + "/cfg/groupArea/groupAreaList";
}
@RequestMapping(value={"delete"})
public String delete(RedirectAttributes redirectAttributes, String ids,int isValid) {
try {
groupAreaService.deldete(ids,isValid);
addMessage(redirectAttributes, "delete_success");
} catch (Exception e) {
logger.error("删除失败",e);
addMessage(redirectAttributes, "delete_failed");
}
return "redirect:" + adminPath + "/cfg/groupArea/groupAreaList";
}
}

27
src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
View File

@@ -38,6 +38,11 @@ import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
import it.sauronsoftware.jave.AudioInfo;
import it.sauronsoftware.jave.Encoder;
import it.sauronsoftware.jave.MultimediaInfo;
import it.sauronsoftware.jave.VideoInfo;
/**
* 处理音视频业务
* @author zhangwei
@@ -157,11 +162,33 @@ public class AvController extends BaseController {
// entity.setSrcMd5(srcMd5);
// entity.setSampleMd5(sampleMd5);
//验证音视频文件时长
Encoder encoder = new Encoder();
String length = "";
try {
MultimediaInfo m = encoder.getInfo(uploadSrcFile);
long ls = m.getDuration()/1000;
int hour = (int) (ls/3600);
int minute = (int) (ls%3600)/60;
int second = (int) (ls-hour*3600-minute*60);
length = hour+"'"+minute+"''"+second+"'''";
logger.info(uploadSrcFile.getName()+"时长："+length);
if(ls>0 && second>Constants.AV_DURATION_LIMIT){
addMessage(redirectAttributes,"exceeds_duration_limit");
logger.error("The duration of uploaded files exceeds the limit("+Constants.AV_DURATION_LIMIT+"s).");
return "redirect:" + adminPath +"/ntc/av/sample/fileSampleList?functionId="+entity.getFunctionId();
}
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes,"save_failed");
return "redirect:" + adminPath +"/ntc/av/sample/fileSampleList?functionId="+entity.getFunctionId();
}
}
avCfgService.saveOrUpdateAvFileSample(entity, srcFile);
addMessage(redirectAttributes,"save_success");
}catch(Exception e){
logger.error("文件上传失败",e);
e.printStackTrace();

38
src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
View File

@@ -28,6 +28,7 @@ import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.domain.configuration.template.IpAllTemplate;
import com.nis.domain.configuration.template.IpRateLimitTemplate;
import com.nis.domain.specific.ConfigGroupInfo;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
@@ -226,32 +227,41 @@ public class IpController extends BaseController{
,FunctionRegionDict regionDict
,FunctionServiceDict serviceDict
,Integer requestId) throws Exception{
String fileName = "test.xlsx";
//maat导入模板
if(regionDict.getIsMaat().equals(1)){
String fileName = "template.xlsx";
//ip类模板
if(regionDict.getRegionType().equals(1)){
if(regionDict.getFunctionId().equals(5)){
if(regionDict.getRegionType().equals(1)){
if(serviceDict.getAction().equals(64)){//ip限速
List<IpRateLimitTemplate> classList=new ArrayList<IpRateLimitTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpRateLimitTemplate.class, 2);
excel.setDataList(this.getMsgProp(),classList,null).
write(request,response, fileName).dispose();
}else{
List<IpAllTemplate> classList=new ArrayList<IpAllTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpAllTemplate.class, 2);
excel.setDataList(this.getMsgProp(),classList,null).
write(request,response, fileName).dispose();
}
}
}else if(regionDict.getRegionType().equals(1)){
List<IpAllTemplate> classList=new ArrayList<IpAllTemplate>();
ExportExcel excel=new ExportExcel(regionDict,this.getMsgProp(),null, IpAllTemplate.class, 2);
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpAllTemplate.class, 2);
excel.setDataList(this.getMsgProp(),classList,null).
write(request,response, fileName).dispose();
}
//str类模板
/*//str类模板
if(regionDict.getRegionType().equals(2)){
/*List<IpAllTemplate> classList=new ArrayList<IpAllTemplate>();
List<IpAllTemplate> classList=new ArrayList<IpAllTemplate>();
ExportExcel excel=new ExportExcel(this.getMsgProp(),null, IpAllTemplate.class, 2,regionDict);
excel.setDataList(this.getMsgProp(),classList,null).
write(request,response, fileName).dispose();*/
write(request,response, fileName).dispose();
}
//district类模板
if(regionDict.getRegionType().equals(2)){
/*ExportExcel excel=new ExportExcel(this.getMsgProp(),null, IpAllTemplate.class, 2,regionDict);
ExportExcel excel=new ExportExcel(this.getMsgProp(),null, IpAllTemplate.class, 2,regionDict);
excel.setDataList(this.getMsgProp(),classList,null).
write(request,response, fileName).dispose();*/
}
}else{
//非maat导入模板
}
write(request,response, fileName).dispose();
}*/
}
//ip配置导入

2
src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java
View File

@@ -15,5 +15,5 @@ public interface PolicyGroupInfoDao extends CrudDao<PolicyGroupInfo> {
List<PolicyGroupInfo> findHasIPPolicyGroupInfosByType(int groupType);
List<PolicyGroupInfo> findPolicyGroupInfosHasIpRegionByType(int groupType);
PolicyGroupInfo getById(int id);
List<PolicyGroupInfo> findNatPolicyGroups();
}

6
src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml
View File

@@ -67,6 +67,12 @@
FROM policy_group_info r
where r.is_valid=1
</select>
<select id="findNatPolicyGroups" resultMap="PolicyGroupInfoMap">
SELECT
<include refid="PolicyGroupInfoColumns"/>
FROM policy_group_info r
where r.is_valid=1 AND r.group_type = 2 OR r.group_type = 3
</select>
<select id="findPolicyGroupInfosByType" resultMap="PolicyGroupInfoMap">
SELECT
<include refid="PolicyGroupInfoColumns"/>

17
src/main/java/com/nis/web/dao/configuration/GroupAreaDao.java Normal file
View File

@@ -0,0 +1,17 @@
package com.nis.web.dao.configuration;
import java.util.List;
import com.nis.domain.configuration.GroupAreaInfo;
import com.nis.web.dao.CrudDao;
import com.nis.web.dao.MyBatisDao;
@MyBatisDao
public interface GroupAreaDao extends CrudDao<GroupAreaInfo>{
List<GroupAreaInfo> findGroupAreaInfoList(GroupAreaInfo entity);
GroupAreaInfo getInfoById(int groupId);
}

127
src/main/java/com/nis/web/dao/configuration/GroupAreaDao.xml Normal file
View File

@@ -0,0 +1,127 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.nis.web.dao.configuration.GroupAreaDao">
<resultMap id="GroupAreaInfoMap" type="com.nis.domain.configuration.GroupAreaInfo" >
<id column="id" property="id" jdbcType="INTEGER" />
<result column="group_id" property="groupId" jdbcType="INTEGER" />
<result column="area_code" property="areaCode" jdbcType="INTEGER" />
<result column="is_valid" property="isValid" jdbcType="INTEGER" />
<result column="creator_id" property="creatorId" jdbcType="INTEGER" />
<result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
<result column="editor_id" property="editorId" jdbcType="INTEGER" />
<result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
</resultMap>
<sql id="GroupAreaInfoColumns">
r.id,
r.group_id,
r.area_code,
r.is_valid,
r.creator_id,
r.create_time,
r.editor_id,
r.edit_time
</sql>
<!-- 查出所有 有效数据-->
<select id="findGroupAreaInfoList" resultMap="GroupAreaInfoMap">
SELECT
<include refid="GroupAreaInfoColumns"/>
<trim prefix="," prefixOverrides=",">
, s.name as creator_name
,e.name as editor_name
</trim>
FROM group_area_info r
left join sys_user s on r.creator_id=s.id
left join sys_user e on r.editor_id=e.id
<trim prefix="WHERE" prefixOverrides="AND |OR ">
<if test="page !=null and page.where != null and page.where != ''">
AND ${page.where}
</if>
<if test="groupId != null">
AND r.group_id =#{groupId }
</if>
<if test="areaCode != null">
AND r.area_code =#{areaCode }
</if>
AND r.IS_VALID =1
<if test="creatorName != null and creatorName != ''">
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
</if>
<if test="editorName != null and editorName != ''">
AND r.EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
</if>
<!-- 数据范围过滤 -->
<!-- ${sqlMap.dsf} -->
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
</when>
<otherwise>
ORDER BY r.id desc
</otherwise>
</choose>
</select>
<select id="getInfoById" resultType="com.nis.domain.configuration.GroupAreaInfo">
SELECT
<include refid="GroupAreaInfoColumns"/>
FROM
group_area_info r
WHERE
r.id = #{Id}
</select>
<insert id="insert" parameterType="com.nis.domain.configuration.GroupAreaInfo" >
insert into group_area_info(
ID,
GROUP_ID,
AREA_CODE,
IS_VALID,
CREATOR_ID,
CREATE_TIME
)values (
#{id,jdbcType=INTEGER},
#{groupId,jdbcType=INTEGER},
#{areaCode,jdbcType=INTEGER},
#{isValid,jdbcType=INTEGER},
#{creatorId,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}
)
</insert>
<update id="update" parameterType="com.nis.domain.configuration.GroupAreaInfo" >
update group_area_info
<set >
<trim suffixOverrides=",">
<if test="id != null" >
id = #{id,jdbcType=INTEGER},
</if>
<if test="groupId != null" >
group_Id = #{groupId,jdbcType=INTEGER},
</if>
<if test="areaCode != null" >
area_code = #{areaCode,jdbcType=INTEGER},
</if>
<if test="isValid != null" >
is_valid = #{isValid,jdbcType=INTEGER},
</if>
<if test="editorId != null" >
editor_id = #{editorId,jdbcType=INTEGER},
</if>
<if test="editTime != null and editTime != ''" >
edit_time = #{editTime,jdbcType=TIMESTAMP},
</if>
</trim>
</set>
<where>
<if test="id != null" >
and id = #{id,jdbcType=INTEGER}
</if>
</where>
</update>
</mapper>

2
src/main/java/com/nis/web/service/BaseService.java
View File

@@ -758,6 +758,8 @@ public abstract class BaseService {
BeanUtils.copyProperties(baseIpCfg, cfg);
cfg.setGroupId(groupId);
cfg.setRegionId(Integer.parseInt(appIpCfg.getUserRegion1()));
String userRegion = "APP_ID=" + appIpCfg.getAppCode();
cfg.setUserRegion(userRegion);
}
cfg.setIsValid(isValid);
cfg = ipConvert(cfg,baseIpCfg);

4
src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java
View File

@@ -45,6 +45,10 @@ public class PolicyGroupInfoService extends BaseService{
List<PolicyGroupInfo> list=policyGroupInfoDao.findPolicyGroupInfos();
return list;
}
public List<PolicyGroupInfo> findNatPolicyGroups() {
List<PolicyGroupInfo> list=policyGroupInfoDao.findNatPolicyGroups();
return list;
}
public List<PolicyGroupInfo> findPolicyGroupInfosByType(int type) {
List<PolicyGroupInfo> list=policyGroupInfoDao.findPolicyGroupInfosByType(type);
return list;

2
src/main/java/com/nis/web/service/configuration/AppCfgService.java
View File

@@ -1161,6 +1161,8 @@ public class AppCfgService extends BaseService {
GroupReuseAddBean maatBean = new GroupReuseAddBean();
List<GroupReuseCfg> groupReuseList=new ArrayList<>();
GroupReuseCfg groupReuseCfg=new GroupReuseCfg();
/*groupReuseCfg.setUserRegion(userRegion);*/
groupReuseCfg.setServiceId(entitys.get(0).getServiceId());
ipRegionList.addAll(groupReuseCfgAddRemoveConvert(entitys,Constants.VALID_YES,groupId));
groupReuseCfg.setIpRegionList(ipRegionList);
groupReuseCfg.setStrRegionList(strRegionList);

83
src/main/java/com/nis/web/service/configuration/GroupAreaService.java Normal file
View File

@@ -0,0 +1,83 @@
package com.nis.web.service.configuration;
import java.util.Date;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.nis.domain.Page;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.configuration.GroupAreaInfo;
import com.nis.util.StringUtil;
import com.nis.web.dao.configuration.GroupAreaDao;
import com.nis.web.security.UserUtils;
import com.nis.web.service.BaseService;
@Service
public class GroupAreaService extends BaseService{
@Autowired
private GroupAreaDao groupAreaDao;
public Page<GroupAreaInfo> findGroupAreaInfoList(Page<GroupAreaInfo> page, GroupAreaInfo entity) {
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
entity.setPage(page);
List<GroupAreaInfo> list=groupAreaDao.findGroupAreaInfoList(entity);
page.setList(list);
return page;
}
public GroupAreaInfo getInfoById(int groupId) {
GroupAreaInfo GroupAreaInfo=groupAreaDao.getInfoById(groupId);
return GroupAreaInfo;
}
public void saveOrUpdate(GroupAreaInfo entity) {
entity.setIsValid(1);
if(entity.getId()==null){//新增
Date createTime=new Date();
entity.setCreatorId(UserUtils.getUser().getId());
entity.setCreateTime(createTime);
groupAreaDao.insert(entity);
}else{//修改
Date editTime=new Date();
entity.setEditorId(UserUtils.getUser().getId());
entity.setEditTime(editTime);
groupAreaDao.update(entity);
}
}
public void deldete(String ids, int isValid) {
if(!StringUtil.isEmpty(ids)){
GroupAreaInfo entity=new GroupAreaInfo();
Date editTime=new Date();
entity.setEditorId(UserUtils.getUser().getId());
entity.setEditTime(editTime);
entity.setIsValid(isValid);
for (String id : ids.split(",")) {
if(!StringUtil.isEmpty(id)){
entity.setId(Long.parseLong(id));
groupAreaDao.update(entity);
}
}
}
}
// 获取未使用的策略分组
public List<PolicyGroupInfo> getNotUsedPolicyGroups(List<PolicyGroupInfo> policyGroups) {
List<GroupAreaInfo> groupAreas=groupAreaDao.findGroupAreaInfoList(new GroupAreaInfo());
for (GroupAreaInfo groupArea : groupAreas) {
for (int i = 0; i < policyGroups.size(); i++) {
Integer groupId = policyGroups.get(i).getGroupId();
if(groupArea.getGroupId().equals(groupId)){
policyGroups.remove(i);
i--;
}
}
}
return policyGroups;
}
}

24
src/main/resources/messages/message_en.properties
View File

@@ -85,8 +85,8 @@ ssl_control=SSL
ssl_feature_control=SSL Cert Control
ssl_sni_control=SSL SNI Control
ssl_address_control=SSL IP Control
https_website_content_replace=HTTPS Content Replace
https_website_control=HTTPS Website Replace
HTTP(s)_website_content_replace=HTTPS Website Replace
https_website_control=HTTP(s) Website Replace
rtp_ip_control=RTP IP Control
mms_ip_control=MMS IP Control
rtsp_ip_control=RTSP IP Control
@@ -864,9 +864,9 @@ replace_zone=Search in
replaced_content=Find
http_req_uri=HTTP Request URI
http_req_header=HTTP Request Header
http_req_body=HTTP Request Content
http_req_body=HTTP Request Body
http_resp_header=HTTP Response Header
http_resp_body=HTTP Response Content
http_resp_body=HTTP Response Body
#=============region_value,config form title=================
#=============userregions===============
userregion1=Customized Region 1
@@ -950,8 +950,8 @@ domain_monit=Domain Intercepter
ip_intercepter_whitelist=IP White List
domain_monit_whitelist=Domain White List
dns_strategy_reject=DNS Response Strategy Control
proxy_http_req_body_replace=HTTP Request Content Replace
proxy_http_res_body_replace=HTTP Response Content Replace
proxy_http_req_body_replace=HTTP Request Body Replace
proxy_http_res_body_replace=HTTP Response Body Replace
dns_fake_ip_reject=DNS Spoofing IP Control
app_strategy_reject=APP Strategy Control
app_strategy_ratelimit=APP Strategy Ratelimit
@@ -1102,8 +1102,8 @@ new=New
basic_protocol_business_type=Basic Identify business classification
tunnel_behavior_business_type=Behavior Identify business classification
app_business_type=Application business classification
pxy_intercept_monit_keyring=Certificate Strategy
intercept_file_strategy=Certificate Strategy
pxy_intercept_monit_keyring=Key Ring
intercept_file_strategy=Key Ring
root=Root Certificate
intermediate=Intermediate Certificate
end_entity=End-entity Certificate
@@ -1219,7 +1219,7 @@ NTC_VOIP_ACCOUNT=VoIP Account
export_failed=Export Failed
user_manage=Client Account Manage
ip_reuse_policy_object=IP Reuse Policy Object
area_group_manage=Group Area Manage
area_group_manage=Grouping Area Manage
stream_media_protocol=Stream Media Protocol
new_link=New Link
active_link=Active Link
@@ -1245,7 +1245,5 @@ mail_address_whitelist=Mail Address Whitelist
mail_address_monit=Mail Address Monit
mail_address_reject=Mail Address Reject
ipsec_protocol=IPSEC Protocol
intercept_intensity=Intercept Intensity
weak_intensity=Weak
stronger_intensity=Strong
strong_intensity=Stronger
intercept_intensity=Intercept Related Domains
exceeds_duration_limit=File upload failure,The duration of uploaded files exceeds the limit.

6
src/main/resources/messages/message_ru.properties
View File

@@ -1265,7 +1265,5 @@ mail_address_whitelist=Mail Address Whitelist
mail_address_monit=Mail Address Monit
mail_address_reject=Mail Address Reject
ipsec_protocol=IPSEC Protocol
intercept_intensity=Intercept Intensity
weak_intensity=Weak
stronger_intensity=Strong
strong_intensity=Stronger
intercept_intensity=Intercept Related Domains
exceeds_duration_limit=File upload failure,The duration of uploaded files exceeds the limit.

5
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1240,7 +1240,4 @@ mail_address_monit=\u90AE\u4EF6\u5730\u5740\u76D1\u6D4B
mail_address_reject=\u90AE\u4EF6\u5730\u5740\u7BA1\u63A7
ipsec_protocol=IPSEC\u534F\u8BAE
intercept_intensity=\u62E6\u622A\u5F3A\u5EA6
weak_intensity=\u5F31
stronger_intensity=\u8F83\u5F3A
strong_intensity=\u5F3A
exceeds_duration_limit=\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25,\u6587\u4EF6\u65F6\u957F\u8D85\u51FA\u9650\u5236.

4
src/main/resources/nis.properties
View File

@@ -528,4 +528,6 @@ log_time_end=2018-10-01 00:00:00
area_tag=location
isp_tag=isp
mmFileDigestLog=mmFileDigestLogs
ntcStreamMediaLog=ntcStreamMediaLogs
ntcStreamMediaLog=ntcStreamMediaLogs
#音视频样例限制时长，单位秒
av_duration_limit=10

4
src/main/resources/sql/20181016/alert_table_id_length.sql Normal file
View File

@@ -0,0 +1,4 @@
alter table cfg_num_statistics modify column id bigint;
alter table request_num_statistics modify column id bigint;
alter table proc_exec_log modify column id bigint;
alter table sys_log modify column id bigint;

55
src/main/webapp/WEB-INF/include/excel/importModal.jsp
View File

@@ -32,29 +32,58 @@ $(function(){
<div class="col-md-6">
<c:forEach items="${serviceList}" var="service"
varStatus="satus">
<label class="radio-inline">
<c:if test="${cfg.functionId eq service.functionId}">
<c:forEach items="${fns:getDictList('MAAT_SERVICE')}" var="serviceC">
<c:if test="${service.serviceId==serviceC.itemCode}">
<span class="${serviceC.itemValue}">
<input type="radio" name="serviceDictId" <c:if test="${serviceList.size() eq 1}">checked</c:if>
<c:if test="${(37 ne service.functionId)&& (149 ne service.functionId)}">
<label class="radio-inline">
<c:if test="${cfg.functionId eq service.functionId}">
<c:forEach items="${fns:getDictList('MAAT_SERVICE')}" var="serviceC" >
<c:if test="${service.serviceId==serviceC.itemCode }">
<span class="${serviceC.itemValue}">
<input type="radio" name="serviceDictId" <c:if test="${serviceList.size() eq 1}">checked</c:if>
serviceId="${service.serviceId }"
functionId="${service.functionId }"
cfgRegionCodeS="${service.regionCode }"
protocolId="${service.protocolId }"
action="${service.action }"
value="${service.dictId }"
class="required action"
<c:if test="${status.index eq 0 }">checked='true'</c:if>
>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict" >
<c:if test="${dict.itemCode eq service.action }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</span>
</c:if>
</c:forEach>
</c:if>
</label>
</c:if>
</c:forEach>
<c:forEach items="${serviceList}" var="service"
varStatus="satus">
<c:if test="${(service.serviceId ne 37) || (service.serviceId ne 149)}">
<label class="radio-inline"> <c:if
test="${cfg.functionId eq service.functionId}">
<input type="radio" name="serviceDictId"
serviceId="${service.serviceId }"
functionId="${service.functionId }"
cfgRegionCodeS="${service.regionCode }"
protocolId="${service.protocolId }"
action="${service.action }"
value="${service.dictId }" class="required action">
value="${service.dictId }"
class="required action"
<c:if test="${satus.index eq 0}">checked</c:if>>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq service.action}">
<c:if test="${dict.itemCode eq service.action }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</span>
</c:if>
</c:forEach>
</c:if>
</label>
</c:forEach>
</label>
</c:if>
</c:forEach>
</div>
<div for="action"></div>
</div>

2
src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp
View File

@@ -198,7 +198,7 @@
<select name="userRegion1"
class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('CONTROL_REPLACE_ZONE')}" var="replaceZoneC">
<option value="${replaceZoneC.itemCode}" <c:if test="${_cfg.userRegion1==replaceZoneC.itemCode || _cfg.userRegion1==null}">selected</c:if>><spring:message code="${replaceZoneC.itemValue}"/></option>
<option value="${replaceZoneC.itemCode}" <c:if test="${_cfg.userRegion1==replaceZoneC.itemCode || (_cfg.userRegion1==null && replaceZoneC.itemCode eq 'http_resp_body')}">selected</c:if>><spring:message code="${replaceZoneC.itemValue}"/></option>
</c:forEach>
</select>
</div>

11
src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
View File

@@ -88,10 +88,10 @@ function hiddenlevel(){
var action=$("input[name='action']:checked").val();
if(action==16){
$(".leveL").addClass("hidden");
$("input[name='level']").val(0);
$("select[name='level']").val(0);
}else {
$(".leveL").removeClass("hidden");
$("input[name='level']").val(0);
$("select[name='level']").val(0);
}
}
</script>
@@ -215,7 +215,12 @@ function hiddenlevel(){
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="harm_level"/></label>
<div class="col-md-6">
<input class="form-control required number" range="[75,99]" type="text" name="level" value="${_cfg.level }">
<select name="level" data-live-search="true" class="selectpicker form-control required">
<option value="0" ><spring:message code="selected"/></option>
<c:forEach items="${fns:getDictList('CONFIDENCE_INTERVAL')}" var="configdenceC">
<option value="${configdenceC.itemCode}" <c:if test="${_cfg.level==configdenceC.itemCode || (_cfg.level==null && configdenceC.itemCode eq 100)}">selected</c:if>><spring:message code="${configdenceC.itemValue}"/></option>
</c:forEach>
</select>
</div>
<div for="level"></div>
</div>

9
src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
View File

@@ -76,7 +76,7 @@
$(".bandwith").find("input[name='userRegion3']").attr("disabled",true);
}
if(rateLimitType == 1){//带宽
$(".droprate").find("input[name='userRegion2']").attr("disabled",true);
$(".droprate").find("select[name='userRegion2']").attr("disabled",true);
}
}else if(action==80){//替换
$(".monitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
@@ -317,7 +317,12 @@
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
<div class="col-md-6">
<input class="form-control required number" range="[0,1]" type="text" placeholder="0.001" name="userRegion2" value="${_cfg.userRegion2 }">
<select name="userRegion2" data-live-search="true" class="selectpicker form-control required">
<option value="" ><spring:message code="selected"/></option>
<c:forEach items="${fns:getDictList('RATE_LIMIT')}" var="ratelimitC">
<option value="${ratelimitC.itemCode}" <c:if test="${_cfg.userRegion2==ratelimitC.itemCode || (_cfg.userRegion2==null && ratelimitC.itemCode eq '0.001')}">selected</c:if>><spring:message code="${ratelimitC.itemValue}"/></option>
</c:forEach>
</select>
</div>
<div for="userRegion2"></div>
</div>

6
src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
View File

@@ -375,7 +375,11 @@
<c:if test="${cfg.functionId ne 212 }">
<td>
<c:if test="${indexCfg.action eq 64}">
${indexCfg.userRegion2 }
<c:forEach items="${fns:getDictList('RATE_LIMIT')}" var="ratelimitC">
<c:if test="${indexCfg.userRegion2==ratelimitC.itemCode}">
<spring:message code="${ratelimitC.itemValue}"/>
</c:if>
</c:forEach>
</c:if>
</td>
<%-- <td>

13
src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
View File

@@ -337,11 +337,13 @@ var processAction=function(configType,obj){
var rateLimitType=$("input[name='userRegion1']:checked").val();
if(rateLimitType == 0){//丢包率
$(".bandwith").find("input[name='userRegion3']").attr("disabled",true);
$(".droprate").find("input[name='userRegion2']").removeAttr("disabled");
$(".droprate").find("select[name='userRegion2']").removeAttr("disabled");
$(".droprate").find("select[name='userRegion2']").selectpicker("refresh");
}
if(rateLimitType == 1){//带宽
$(".bandwith").find("input[name='userRegion3']").removeAttr("disabled");
$(".droprate").find("input[name='userRegion2']").attr("disabled",true);
$(".droprate").find("select[name='userRegion2']").attr("disabled",true);
$(".droprate").find("select[name='userRegion2']").selectpicker("refresh");
}
}else if(action==1){
//先清空，再添加
@@ -545,7 +547,12 @@ var showHideIPSECProtocol=function(obj){
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
<div class="col-md-6">
<input class="form-control required number" range="[0,1]" type="text" placeholder="0.001" name="userRegion2" value="${_cfg.userRegion2 }">
<select name="userRegion2" data-live-search="true" class="selectpicker form-control required">
<option value="" ><spring:message code="selected"/></option>
<c:forEach items="${fns:getDictList('RATE_LIMIT')}" var="ratelimitC">
<option value="${ratelimitC.itemCode}" <c:if test="${_cfg.userRegion2==ratelimitC.itemCode || (_cfg.userRegion2==null && ratelimitC.itemCode eq '0.001')}">selected</c:if>><spring:message code="${ratelimitC.itemValue}"/></option>
</c:forEach>
</select>
</div>
<div for="userRegion2"></div>
</div>

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

@@ -85,12 +85,17 @@
<body>
<div class="page-content">
<!-- 模板导入，start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
<div class="theme-panel hidden-xs hidden-sm">
<shiro:hasPermission name="iplist:config">
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/ntc/iplist/form?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
<spring:message code="add"></spring:message></button>
<button type="button" class="btn btn-primary import" >
<i class="fa fa-plus"></i>
<spring:message code="import"></spring:message></button>
</shiro:hasPermission>
</div>
@@ -166,7 +171,7 @@
<shiro:hasPermission name="iplist:config">
<sys:delRow url="${ctx}/ntc/iplist/form" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/iplist/updateValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<%-- <sys:delRow url="${ctx}/ntc/iplist/exportIpAddr?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/iplist/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow> --%>
<sys:delRow url="${ctx}/ntc/iplist/exportIpAddr?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/iplist/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="iplist:confirm">
<div class="btn-group">
@@ -357,7 +362,13 @@
</c:if>
</c:forEach>
</td>
<td>${indexCfg.userRegion2 }</td>
<td>
<c:forEach items="${fns:getDictList('RATE_LIMIT')}" var="ratelimitC">
<c:if test="${indexCfg.userRegion2==ratelimitC.itemCode}">
<spring:message code="${ratelimitC.itemValue}"/>
</c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doLog }">

102
src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/groupAreaForm.jsp Normal file
View File

@@ -0,0 +1,102 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<title><spring:message code="${cfgName}"></spring:message></title>
<script type="text/javascript">
$(function(){
$("#cfgFrom").validate({
errorPlacement: function(error,element){
if($(element).parents().hasClass("tagsinput")){
$(element).parents(".col-md-6").next("div").append(error);
}else{
$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
}
},
submitHandler: function(form){
loading('onloading...');
form.submit();
},
errorContainer: "#messageBox",
});
});
</script>
</head>
<body>
<div class="page-content">
<h3 class="page-title">
<spring:message code="area_group_manage"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i>
<c:if test="${empty _cfg.id}"><spring:message code="add"></spring:message></c:if>
<c:if test="${not empty _cfg.id}"><spring:message code="edit"></spring:message></c:if>
</div>
</div>
<div class="portlet-body form">
<!-- BEGIN FORM-->
<form id="cfgFrom" action="${ctx}/cfg/groupArea/saveOrUpdate" method="post" class="form-horizontal">
<input type="hidden" name="id" value="${_cfg.id}">
<div class="form-body">
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label>
<div class="col-md-6">
<select name="groupId" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search" >
<option value="" <c:if test="${empty _cfg.groupId }">selected</c:if>><spring:message code="select"/></option>
<c:forEach items="${policyGroups }" var="policyGroup">
<option value="${policyGroup.groupId}" <c:if test="${_cfg.groupId==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
</c:forEach>
</select>
</div>
<div for="groupId"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="area"/></label>
<div class="col-md-6">
<select name="areaCode" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search" >
<option value="" ><spring:message code="select"/></option>
<c:forEach items="${areas}" var="area">
<option value="${area.itemCode}" <c:if test="${_cfg.areaCode == area.itemCode }">selected</c:if> >${area.itemValue}</option>
</c:forEach>
</select>
</div>
<div for="areaCode"></div>
</div>
</div>
</div>
</div>
<div class="form-actions">
<div class="row">
<div class="col-md-6">
<div class="row">
<div class="col-md-offset-3 col-md-8">
<button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
<button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
</div>
</div>
</div>
<div class="col-md-6"> </div>
</div>
</div>
</form>
<!-- END FORM-->
</div>
</div>
</div>
</div>
</div>
</body>
</html>

193
src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/groupAreaList.jsp Normal file
View File

@@ -0,0 +1,193 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<title><spring:message code="${cfgName}"></spring:message></title>
<script>
$(document).ready(function() {
//搜索框提示语初始化
if("${cfg.groupId}"){
$("#intype").val("${cfg.groupId}");
}else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
}
$("#seltype").change(function(){
$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
});
//筛选功能初始化
filterActionInit();
//reset
$("#resetBtn").on("click",function(){
$("select.selectpicker").each(function(){
$(this).selectpicker('val',$(this).find('option:first').val());
$(this).find("option").attr("selected",false);
$(this).find("option:first").attr("selected",true);
});
$(".Wdate").attr("value",'');
$("#searchForm")[0].reset();
});
});
</script>
</head>
<body>
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<%-- <shiro:hasPermission name="avContUrl:config"> --%>
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/cfg/groupArea/groupAreaForm'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message>
</button>
<%--</shiro:hasPermission>--%>
</div>
<h3 class="page-title">
<spring:message code="area_group_manage"/>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">
<div class="portlet">
<div class="portlet-body">
<div class="row" >
<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/cfg/groupArea/groupAreaList" method="post" class="form-search">
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
callback="page();" />
<!-- 筛选按钮展开状态-->
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="areaCode"><spring:message code="area"></spring:message></form:option>
</form:select>
</div>
<input id="intype" class="form-control input-medium" type="hidden" value="">
<div class="input-group-btn">
<form:select id="" path="areaCode" class="selectpicker select2 input-medium" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${areas}" var="area">
<form:option value="${area.itemCode }"><spring:message code="${area.itemValue }"/></form:option>
</c:forEach>
</form:select>
</div>
</div>
</div>
<div class="pull-left">
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/> <i class="fa fa-angle-double-down"></i></button>
</div>
<div class="pull-right">
<%-- <shiro:hasPermission name="avContUrl:config"> --%>
<sys:delRow url="${ctx}/cfg/groupArea/groupAreaForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/cfg/groupArea/delete?isValid=-1" id="contentTable" label="delete"></sys:delRow>
<%-- </shiro:hasPermission> --%>
<a class="btn btn-icon-only btn-default setfields tooltips"
data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
<i class="icon-wrench"></i>
</a>
</div>
</div>
<!-- /搜索内容与操作按钮栏 -->
<!-- 筛选搜索内容栏默认隐藏-->
<div class="col-md-12 filter-action-select-panle hide" >
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="config_time"/>：</label>
<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="<fmt:formatDate value='${cfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label>&nbsp;</label>
<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="<fmt:formatDate value="${cfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="edit_time"/>：</label>
<input name="search_edit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="<fmt:formatDate value="${cfg.search_edit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label>&nbsp;</label>
<input name="search_edit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="<fmt:formatDate value="${cfg.search_edit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div>
</div>
</div>
</div>
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th><spring:message code="group_name"/></th>
<th><spring:message code="area"/></th>
<th><spring:message code="creator"/></th>
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>
<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
</tr>
</thead>
<tbody>
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
<tr>
<td><input type="checkbox" class="i-checks" id="${cfg.id}" value="0" "></td>
<td>
<%-- <a href="javascript:;" data-original-title="${cfg.groupName}"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fns:abbr(cfg.groupName,20)}
</a> --%>
<c:forEach items="${policyGroups }" var="policyGroup">
<c:if test="${cfg.groupId==policyGroup.groupId }"><spring:message code="${policyGroup.groupName}"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${areas}" var="area">
<c:if test="${cfg.areaCode==area.itemCode }"><spring:message code="${area.itemValue}"/></c:if>
</c:forEach>
</td>
<td>${cfg.creatorName }</td>
<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td>${cfg.editorName }</td>
<td><fmt:formatDate value="${cfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
</tr>
</c:forEach>
</tbody>
</table>
<div class="page">${page}</div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>