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

(1)导入模板生成取消将function_region_dict中字段只只有一个的时候，方向，协议，大小写敏感等字段隐藏

Browse Source 
(2)ip导入方向协议导入时填入默认值
This commit is contained in:
wangxin
2018-12-18 14:58:48 +06:00
parent 317cb9ab28
commit ad5107928d
3 changed files with 52 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -773,9 +773,9 @@ public class ExportExcel {
/**
*block 只有TCP不需要导入
* */
headerStr="";
commentStr="";
/*List<SysDataDictionaryItem> protocol=DictUtils.getDictList("PROTOCOL");
/*headerStr="";
commentStr="";*/
List<SysDataDictionaryItem> protocol=DictUtils.getDictList("PROTOCOL");
if(protocol !=null && protocol.size()>0){
for (SysDataDictionaryItem sysDataDictionaryItem : protocol) {
if(sysDataDictionaryItem.getItemCode().equals("6")){
@@ -783,7 +783,7 @@ public class ExportExcel {
index++;
}
}
}*/
}
if(StringUtil.isEmpty(defaultValue)){
defaultValue="6";
}
@@ -819,10 +819,10 @@ public class ExportExcel {
}
}
}else{
if(StringUtil.isEmpty(region.getConfigProtocol())){
/*if(StringUtil.isEmpty(region.getConfigProtocol())){
headerStr="";
commentStr="";
}else{
}else{*/
commentStr="";
List<SysDataDictionaryItem> protocol=DictUtils.getDictList("PROTOCOL");
if(protocol !=null && protocol.size()>0){
@@ -856,13 +856,13 @@ public class ExportExcel {
}
}
/*}*/
}
if(StringUtil.isEmpty(commentStr)
/*if(StringUtil.isEmpty(commentStr)
||(region.getConfigProtocol().split(",").length==1)){
headerStr="";
commentStr="";
}else{
}else{*/
commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++;
index++;
@@ -873,16 +873,16 @@ public class ExportExcel {
commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":"+defaultValue+"\n";
index++;
}
}
/*}*/
}
//Direction
if("direction".equals(headerStr)){
if(StringUtil.isEmpty(region.getConfigDirection())
/*if(StringUtil.isEmpty(region.getConfigDirection())
||(region.getConfigDirection().split(",").length==1)){
headerStr="";
commentStr="";
}else{
}else{*/
commentStr="";
List<SysDataDictionaryItem> direction=DictUtils.getDictList("DIRECTION");
if(direction !=null && direction.size()>0){
@@ -904,11 +904,11 @@ public class ExportExcel {
defaultValue="0";
}
}
}
if(StringUtil.isEmpty(commentStr)){
/*}*/
/*if(StringUtil.isEmpty(commentStr)){
headerStr="";
commentStr="";
}else{
}else{*/
commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++;
index++;
@@ -919,7 +919,7 @@ public class ExportExcel {
commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":"+defaultValue+"\n";
index++;
}
}
/*}*/
}
//字符串或摘要字符串
@@ -927,7 +927,7 @@ public class ExportExcel {
if(region.getRegionType().equals(3)){
if("district".equals(headerStr)){
if(StringUtil.isEmpty(region.getConfigDistrict())
||(region.getConfigDistrict().split(",").length==1)){
/*||(region.getConfigDistrict().split(",").length==1)*/){
headerStr="";
commentStr="";
}else{
@@ -1032,7 +1032,7 @@ public class ExportExcel {
//match method
if("match_method".equals(headerStr)){
if(StringUtil.isEmpty(region.getConfigMatchMethod())
||(region.getConfigMatchMethod().split(",").length==1)){
/*||(region.getConfigMatchMethod().split(",").length==1)*/){
headerStr="";
commentStr="";
}else{
@@ -1111,7 +1111,7 @@ public class ExportExcel {
}
}
if(StringUtil.isEmpty(commentStr) || (!StringUtil.isEmpty(list) && list.size()==1)){
if(StringUtil.isEmpty(commentStr) /*|| (!StringUtil.isEmpty(list) && list.size()==1)*/){
headerStr="";
commentStr="";
}else{
@@ -1161,7 +1161,7 @@ public class ExportExcel {
}
}
if(StringUtil.isEmpty(commentStr) || (!StringUtil.isEmpty(list) && list.size()==1)){
if(StringUtil.isEmpty(commentStr) /*|| (!StringUtil.isEmpty(list) && list.size()==1)*/){
headerStr="";
commentStr="";
}else{