ip模板提交
样例的level改成下拉选项 拦截强度做成下拉选项
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user