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

导出数据方法setDataList增加国际化配置参数

Browse Source 
修改所有字典展示取值itemDesc为itemValue
This commit is contained in:
duandongmei
2018-06-13 16:29:11 +08:00
parent 613f19c145
commit 6960e1528e
26 changed files with 213 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/domain/configuration/BaseCfg.java
View File

@@ -55,7 +55,7 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
/**
* GK类型
*/
@ExcelField(title="action")
@ExcelField(title="action",dictType="SERVICE_ACTION")
protected Integer action;
/**
* 有效标识

6
src/main/java/com/nis/util/DictUtils.java
View File

@@ -126,6 +126,12 @@ public class DictUtils {
return getDictLabel(dictKey, itemCode, "默认");
}
/*public static String getDictLabel(String dictKey, String itemCode, String itemValue){
String itemLabel = getDictOption(dictKey).get(itemCode);
return StringUtil.isBlank(itemLabel) ? defaultValue : itemLabel;
}*/
public static String getDictCode(String dictKey, String itemValue, String defaultValue){

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

@@ -94,6 +94,22 @@ public class ExportExcel {
getFields(list,cls.getSuperclass());
}
}
/**
* //递归获取cls实体对象及父级对象的method
* @param list
* @param cls
*/
public void getMethods(List<Method> list,Class<?> cls) {
Method[] methods=cls.getDeclaredMethods();
if(methods != null && methods.length > 0){
for (Method method : methods) {
list.add(method);
}
}
if(cls.getSuperclass() != null){
getMethods(list,cls.getSuperclass());
}
}
/**
* 构造函数
@@ -113,6 +129,7 @@ public class ExportExcel {
public ExportExcel(String title, Class<?> cls, int type, int... groups){
List<Field> list=new ArrayList<Field>();
// Get annotation field
//递归获取cls实体对象及父级对象的属性
getFields(list, cls);
if(!StringUtil.isEmpty(list)){
@@ -139,8 +156,11 @@ public class ExportExcel {
}
}
}
List<Method> ms=new ArrayList<Method>();
// Get annotation method
Method[] ms = cls.getDeclaredMethods();
//递归获取cls实体对象及父级对象的属性
getMethods(ms, cls);
if(!StringUtil.isEmpty(ms)){
for (Method m : ms){
ExcelField ef = m.getAnnotation(ExcelField.class);
if (ef != null && (ef.type()==0 || ef.type()==type)){
@@ -163,6 +183,7 @@ public class ExportExcel {
}
}
}
}
// Field sorting
Collections.sort(annotationList, new Comparator<Object[]>() {
public int compare(Object[] o1, Object[] o2) {
@@ -187,6 +208,7 @@ public class ExportExcel {
}
/**
* 构造函数
* @param msgProp 国际化配置
* @param title 表格标题，传“空值”，表示无标题
* @param cls 实体对象，通过annotation.ExportField获取标题
* @param type 导出类型（1:导出数据；2：导出模板）
@@ -222,8 +244,11 @@ public class ExportExcel {
}
}
}
List<Method> ms=new ArrayList<Method>();
// Get annotation method
Method[] ms = cls.getDeclaredMethods();
//递归获取cls实体对象及父级对象的属性
getMethods(ms, cls);
if(!StringUtil.isEmpty(ms)){
for (Method m : ms){
ExcelField ef = m.getAnnotation(ExcelField.class);
if (ef != null && (ef.type()==0 || ef.type()==type)){
@@ -246,6 +271,7 @@ public class ExportExcel {
}
}
}
}
// Field sorting
Collections.sort(annotationList, new Comparator<Object[]>() {
public int compare(Object[] o1, Object[] o2) {
@@ -436,7 +462,7 @@ public class ExportExcel {
} else if (val instanceof String) {
cell.setCellValue((String) val);
} else if (val instanceof Integer) {
cell.setCellValue((Integer) val);
cell.setCellValue((String) val);
} else if (val instanceof Long) {
cell.setCellValue((Long) val);
} else if (val instanceof Double) {
@@ -445,7 +471,7 @@ public class ExportExcel {
cell.setCellValue((Float) val);
} else if (val instanceof Date) {
DataFormat format = wb.createDataFormat();
style.setDataFormat(format.getFormat("yyyy-MM-dd"));
style.setDataFormat(format.getFormat("yyyy-MM-dd HH:mm:ss"));
cell.setCellValue((Date) val);
} else {
if (fieldType != Class.class){
@@ -467,7 +493,7 @@ public class ExportExcel {
* 添加数据（通过annotation.ExportField添加数据）
* @return list 数据列表
*/
public <E> ExportExcel setDataList(List<E> list){
public <E> ExportExcel setDataList(Properties msgProp,List<E> list){
for (E e : list){
int colunm = 0;
Row row = this.addRow();
@@ -488,7 +514,7 @@ public class ExportExcel {
}
// If is dict, get dict label
if (StringUtils.isNotBlank(ef.dictType())){
val = DictUtils.getDictLabel(val==null?"":val.toString(), ef.dictType(), "");
val = DictUtils.getDictLabel(ef.dictType(),val==null?"":val.toString() , "");
}
}catch(Exception ex) {
// Failure to ignore
@@ -563,41 +589,41 @@ public class ExportExcel {
return this;
}
// /**
// * 导出测试
// */
// public static void main(String[] args) throws Throwable {
//
// List<String> headerList = Lists.newArrayList();
// for (int i = 1; i <= 10; i++) {
// headerList.add("表头"+i);
// }
//
// List<String> dataRowList = Lists.newArrayList();
// for (int i = 1; i <= headerList.size(); i++) {
// dataRowList.add("数据"+i);
// }
//
// List<List<String>> dataList = Lists.newArrayList();
// for (int i = 1; i <=1000000; i++) {
// dataList.add(dataRowList);
// }
//
// ExportExcel ee = new ExportExcel("表格标题", headerList);
//
// for (int i = 0; i < dataList.size(); i++) {
// Row row = ee.addRow();
// for (int j = 0; j < dataList.get(i).size(); j++) {
// ee.addCell(row, j, dataList.get(i).get(j));
// }
// }
//
// ee.writeFile("target/export.xlsx");
//
// ee.dispose();
//
// log.debug("Export success.");
//
// }
/**
* 导出测试
*/
public static void main(String[] args) throws Throwable {
List<String> headerList = Lists.newArrayList();
for (int i = 1; i <= 10; i++) {
headerList.add("表头"+i);
}
List<String> dataRowList = Lists.newArrayList();
for (int i = 1; i <= headerList.size(); i++) {
dataRowList.add("数据"+i);
}
List<List<String>> dataList = Lists.newArrayList();
for (int i = 1; i <=1000000; i++) {
dataList.add(dataRowList);
}
ExportExcel ee = new ExportExcel("表格标题", headerList);
for (int i = 0; i < dataList.size(); i++) {
Row row = ee.addRow();
for (int j = 0; j < dataList.get(i).size(); j++) {
ee.addCell(row, j, dataList.get(i).get(j));
}
}
ee.writeFile("target/export.xlsx");
ee.dispose();
log.debug("Export success.");
}
}

2
src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
View File

@@ -503,7 +503,7 @@ public class AvContentController extends BaseController {
}
Page<CfgIndexInfo> page = avContentCfgService.findPage(pageInfo, entity);
new ExportExcel(msgProp,null, CfgIndexInfo.class,1).setDataList(page.getList()).write(response, fileName).dispose();
new ExportExcel(msgProp,null, CfgIndexInfo.class,1).setDataList(msgProp,page.getList()).write(response, fileName).dispose();
}
return null;

2
src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java
View File

@@ -144,7 +144,7 @@ public class SpecificServiceHostCfgController extends BaseController {
String fileName = msgProp.getProperty("agreement_ip_configuration").replaceAll(" ", "_")+".xlsx";
List<SpecificServiceHostCfg> list = Lists.newArrayList();
list.add(new SpecificServiceHostCfg());
new ExportExcel(msgProp,msgProp.getProperty("agreement_ip_configuration"), SpecificServiceHostCfg.class, 2).setDataList(list).
new ExportExcel(msgProp,msgProp.getProperty("agreement_ip_configuration"), SpecificServiceHostCfg.class, 2).setDataList(msgProp,list).
write(request,response, fileName).dispose();
return null;
} catch (Exception e) {

2
src/main/java/com/nis/web/controller/sys/UserController.java
View File

@@ -199,7 +199,7 @@ public class UserController extends BaseController{
try {
String fileName = "用户数据-"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
Page<SysUser> page = userService.findUser(new Page<SysUser>(request, response, -1), user);
new ExportExcel("用户数据", SysUser.class).setDataList(page.getList()).write(response, fileName).dispose();
new ExportExcel("用户数据", SysUser.class).setDataList(getMsgProp(),page.getList()).write(response, fileName).dispose();
return null;
} catch (Exception e) {
addMessage(redirectAttributes, "导出用户失败！失败信息："+e.getMessage());

10
src/main/webapp/WEB-INF/include/form/areaInfo.jsp
View File

@@ -145,7 +145,7 @@ $(function(){
<select id="_areaCfg.ipType" class="show-tick form-control required">
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<option value="${ipTypeC.itemCode}" <c:if test="${_areaCfg.ipType==ipTypeC.itemCode || (_areaCfg.ipType==null && ipTypeC.itemCode==4)}">selected</c:if>><spring:message code="${ipTypeC.itemDesc}"/></option>
<option value="${ipTypeC.itemCode}" <c:if test="${_areaCfg.ipType==ipTypeC.itemCode || (_areaCfg.ipType==null && ipTypeC.itemCode==4)}">selected</c:if>><spring:message code="${ipTypeC.itemValue}"/></option>
</c:forEach>
</select>
</div>
@@ -160,7 +160,7 @@ $(function(){
<div class="col-md-6">
<select id="_areaCfg.ipPattern" class="show-tick form-control required">
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<option value="${ipPatternC.itemCode}" <c:if test="${_areaCfg.ipPattern==ipPatternC.itemCode || (_areaCfg.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemDesc}"/></option>
<option value="${ipPatternC.itemCode}" <c:if test="${_areaCfg.ipPattern==ipPatternC.itemCode || (_areaCfg.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemValue}"/></option>
</c:forEach>
</select>
</div>
@@ -185,7 +185,7 @@ $(function(){
<div class="col-md-6">
<select id="_areaCfg.portPattern" class="show-tick form-control required">
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<option value="${portPatternC.itemCode}" <c:if test="${_areaCfg.portPattern==portPatternC.itemCode || (_areaCfg.portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemDesc}"/></option>
<option value="${portPatternC.itemCode}" <c:if test="${_areaCfg.portPattern==portPatternC.itemCode || (_areaCfg.portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemValue}"/></option>
</c:forEach>
</select>
</div>
@@ -229,7 +229,7 @@ $(function(){
<div class="col-md-6">
<select id="_areaCfg.protocol" class="show-tick form-control required">
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<option value="${protocolC.itemCode}" <c:if test="${_areaCfg.protocol==protocolC.itemCode || (_areaCfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemDesc}"/></option>
<option value="${protocolC.itemCode}" <c:if test="${_areaCfg.protocol==protocolC.itemCode || (_areaCfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
</c:forEach>
</select>
<input type="hidden" id="_areaCfg.protocolId" value="${_areaCfg.protocolId}">
@@ -243,7 +243,7 @@ $(function(){
<div class="col-md-6">
<select id="_areaCfg.direction" class="show-tick form-control required" >
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
<option value="${directionC.itemCode}" <c:if test="${_areaCfg.direction==directionC.itemCode || (_areaCfg.direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemDesc}"/></option>
<option value="${directionC.itemCode}" <c:if test="${_areaCfg.direction==directionC.itemCode || (_areaCfg.direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemValue}"/></option>
</c:forEach>
</select>
</div>

21
src/main/webapp/WEB-INF/include/form/ipInfo.jsp
View File

@@ -9,7 +9,14 @@
<div class="col-md-6">
<select name="ipType" class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<option value="${ipTypeC.itemCode}" <c:if test="${_cfg.ipType==ipTypeC.itemCode || (_cfg.ipType==null && ipTypeC.itemCode==4)}">selected</c:if>><spring:message code="${ipTypeC.itemDesc}"/></option>
<option value="${ipTypeC.itemCode}"
<c:if test="${_cfg.ipType==ipTypeC.itemCode
|| (_cfg.ipType==null && ipTypeC.itemCode==4)}">
selected
</c:if>
>
<spring:message code="${ipTypeC.itemValue}"/>
</option>
</c:forEach>
</select>
</div>
@@ -25,12 +32,12 @@
<c:choose>
<c:when test="${specialProtocol!=null and specialProtocol eq 'ipsec'}">
<c:forEach items="${fns:getDictList('IPSEC_PROTOCOL')}" var="protocolC">
<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemDesc}"/></option>
<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
</c:forEach>
</c:when>
<c:otherwise>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemDesc}"/></option>
<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
</c:forEach>
</c:otherwise>
</c:choose>
@@ -50,7 +57,7 @@
<div class="col-md-6">
<select name="ipPattern" class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<option value="${ipPatternC.itemCode}" <c:if test="${_cfg.ipPattern==ipPatternC.itemCode || (_cfg.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemDesc}"/></option>
<option value="${ipPatternC.itemCode}" <c:if test="${_cfg.ipPattern==ipPatternC.itemCode || (_cfg.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemValue}"/></option>
</c:forEach>
</select>
</div>
@@ -81,7 +88,7 @@
<div class="col-md-6">
<select name="portPattern" class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<option value="${portPatternC.itemCode}" <c:if test="${_cfg.portPattern==portPatternC.itemCode || (_cfg.portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemDesc}"/></option>
<option value="${portPatternC.itemCode}" <c:if test="${_cfg.portPattern==portPatternC.itemCode || (_cfg.portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemValue}"/></option>
</c:forEach>
</select>
</div>
@@ -154,7 +161,7 @@
<div class="col-md-6">
<select name="protocol" class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemDesc}"/></option>
<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
</c:forEach>
</select>
<input type="hidden" name="protocolId" value="0">
@@ -170,7 +177,7 @@
<div class="col-md-6">
<select name="direction" class="selectpicker show-tick form-control required" >
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
<option value="${directionC.itemCode}" <c:if test="${_cfg.direction==directionC.itemCode || (_cfg.direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemDesc}"/></option>
<option value="${directionC.itemCode}" <c:if test="${_cfg.direction==directionC.itemCode || (_cfg.direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemValue}"/></option>
</c:forEach>
</select>
</div>

4
src/main/webapp/WEB-INF/include/form/stringInfo.jsp
View File

@@ -20,7 +20,7 @@
<div class="col-md-6">
<select name="isHexbin" class="selectpicker select2 form-control required" >
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<option value="${isHexbinC.itemCode}" <c:if test="${_cfg.isHexbin==isHexbinC.itemCode || (_cfg.matchMethod==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemDesc}"/></option>
<option value="${isHexbinC.itemCode}" <c:if test="${_cfg.isHexbin==isHexbinC.itemCode || (_cfg.matchMethod==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
</c:forEach>
</select>
</div>
@@ -53,7 +53,7 @@
<div class="col-md-6">
<select name="matchMethod" class="selectpicker select2 form-control required" >
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<option value="${matchMethodC.itemCode}" <c:if test="${_cfg.matchMethod==matchMethodC.itemCode || (_cfg.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemDesc}"/></option>
<option value="${matchMethodC.itemCode}" <c:if test="${_cfg.matchMethod==matchMethodC.itemCode || (_cfg.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
</c:forEach>
</select>
</div>

10
src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
View File

@@ -307,7 +307,7 @@
<td>${cfg.cfgDesc }</td>
<td>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemDesc }"/></c:if>
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
</c:forEach>
</td>
<td>${cfg.srcIpAddress }</td>
@@ -316,22 +316,22 @@
<td>${cfg.destPort }</td>
<td>
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemDesc }"/></c:if>
<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemDesc }"/></c:if>
<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemValue }"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemDesc }"/></c:if>
<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemDesc }"/></c:if>
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
</c:forEach>
</td>
<td>

4
src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
View File

@@ -305,7 +305,7 @@
</td>
<td>
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemDesc}"/></c:if>
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
</c:forEach>
</td>
<td>
@@ -314,7 +314,7 @@
</td>
<td>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemDesc}"/></c:if>
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
</c:forEach>
</td>
<td>

10
src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
View File

@@ -307,7 +307,7 @@
<td>${cfg.cfgDesc }</td>
<td>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemDesc }"/></c:if>
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
</c:forEach>
</td>
<td>${cfg.srcIpAddress }</td>
@@ -316,22 +316,22 @@
<td>${cfg.destPort }</td>
<td>
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemDesc }"/></c:if>
<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemDesc }"/></c:if>
<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemValue }"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemDesc }"/></c:if>
<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemDesc }"/></c:if>
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
</c:forEach>
</td>
<td>

4
src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
View File

@@ -305,7 +305,7 @@
</td>
<td>
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemDesc}"/></c:if>
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
</c:forEach>
</td>
<td>
@@ -314,7 +314,7 @@
</td>
<td>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemDesc}"/></c:if>
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
</c:forEach>
</td>
<td>

14
src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
View File

@@ -186,7 +186,7 @@ var delContent=function(contentClassName,addBtnClassName){
<div class="col-md-6">
<select name="voipAccounts[${status.index }].isHexbin" class="selectpicker select2 form-control required">
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<option value="${isHexbinC.itemCode}" <c:if test="${voipAccount.isHexbin==isHexbinC.itemCode || (voipAccount.isHexbin==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemDesc}"/></option>
<option value="${isHexbinC.itemCode}" <c:if test="${voipAccount.isHexbin==isHexbinC.itemCode || (voipAccount.isHexbin==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
</c:forEach>
</select>
</div>
@@ -219,7 +219,7 @@ var delContent=function(contentClassName,addBtnClassName){
<div class="col-md-6">
<select name="voipAccounts[${status.index }].matchMethod" class="selectpicker select2 form-control required" >
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<option value="${matchMethodC.itemCode}" <c:if test="${voipAccount.matchMethod==matchMethodC.itemCode || (voipAccount.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemDesc}"/></option>
<option value="${matchMethodC.itemCode}" <c:if test="${voipAccount.matchMethod==matchMethodC.itemCode || (voipAccount.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
</c:forEach>
</select>
</div>
@@ -271,7 +271,7 @@ var delContent=function(contentClassName,addBtnClassName){
<div class="col-md-6">
<select name="voipIps[${status.index }].ipType" class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType" varStatus="satus">
<option value="${ipType.itemCode}" <c:if test="${voipIp.ipType==ipType.itemCode || (voipIp.ipType==null && ipType.itemCode==4)}">selected</c:if> ><spring:message code="${ipType.itemDesc}"/></option>
<option value="${ipType.itemCode}" <c:if test="${voipIp.ipType==ipType.itemCode || (voipIp.ipType==null && ipType.itemCode==4)}">selected</c:if> ><spring:message code="${ipType.itemValue}"/></option>
</c:forEach>
</select>
</div>
@@ -286,7 +286,7 @@ var delContent=function(contentClassName,addBtnClassName){
<div class="col-md-6">
<select name="voipIps[${status.index }].ipPattern" class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC" varStatus="satus">
<option value="${ipPatternC.itemCode}" <c:if test="${voipIp.ipPattern==ipPatternC.itemCode || (voipIp.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if> ><spring:message code="${ipPatternC.itemDesc}"/></option>
<option value="${ipPatternC.itemCode}" <c:if test="${voipIp.ipPattern==ipPatternC.itemCode || (voipIp.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if> ><spring:message code="${ipPatternC.itemValue}"/></option>
</c:forEach>
</select>
</div>
@@ -317,7 +317,7 @@ var delContent=function(contentClassName,addBtnClassName){
<div class="col-md-6">
<select name="voipIps[${status.index }].portPattern" class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC" varStatus="satus">
<option value="${portPatternC.itemCode}" <c:if test="${voipIp.portPattern==portPatternC.itemCode || (voipIp.portPattern==null && portPatternC.itemCode==1)}">selected</c:if> ><spring:message code="${portPatternC.itemDesc}"/></option>
<option value="${portPatternC.itemCode}" <c:if test="${voipIp.portPattern==portPatternC.itemCode || (voipIp.portPattern==null && portPatternC.itemCode==1)}">selected</c:if> ><spring:message code="${portPatternC.itemValue}"/></option>
</c:forEach>
</select>
</div>
@@ -375,7 +375,7 @@ var delContent=function(contentClassName,addBtnClassName){
<div class="col-md-6">
<select name="voipIps[${status.index }].protocol" class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC" varStatus="satus">
<option value="${protocolC.itemCode}" <c:if test="${voipIp.protocol==protocolC.itemCode || (voipIp.protocol==null && protocolC.itemCode==0)}">selected</c:if> ><spring:message code="${protocolC.itemDesc}"/></option>
<option value="${protocolC.itemCode}" <c:if test="${voipIp.protocol==protocolC.itemCode || (voipIp.protocol==null && protocolC.itemCode==0)}">selected</c:if> ><spring:message code="${protocolC.itemValue}"/></option>
</c:forEach>
</select>
</div>
@@ -388,7 +388,7 @@ var delContent=function(contentClassName,addBtnClassName){
<div class="col-md-6">
<select name="voipIps[${status.index }].direction" class="selectpicker show-tick form-control required" >
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC" varStatus="satus">
<option value="${directionC.itemCode}" <c:if test="${voipIp.direction==directionC.itemCode || (voipIp.direction==null && directionC.itemCode==0)}">selected</c:if> ><spring:message code="${directionC.itemDesc}"/></option>
<option value="${directionC.itemCode}" <c:if test="${voipIp.direction==directionC.itemCode || (voipIp.direction==null && directionC.itemCode==0)}">selected</c:if> ><spring:message code="${directionC.itemValue}"/></option>
</c:forEach>
</select>
</div>

2
src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
View File

@@ -458,7 +458,7 @@
<sys:delRow url="${ctx}/ntc/av/voipForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/av/updateAvVoipValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
</shiro:hasPermission>
<!--<sys:delRow url="${ctx}/ntc/av/voipExport?functionId=${cfg.functionId }" id="contentTable" label="export" maxRow="${page.maxExportSize }"></sys:delRow>-->
<sys:delRow url="${ctx}/ntc/av/voipExport?functionId=${cfg.functionId }" id="contentTable" label="export" maxRow="${page.maxExportSize }"></sys:delRow>
<shiro:hasPermission name="avVoip:audit">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">

4
src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
View File

@@ -84,7 +84,7 @@
<select name="${cfgName}.matchMethod"
class="selectpicker select2 form-control required">
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<option value="${matchMethodC.itemCode}" <c:if test="${complexCfg.matchMethod==matchMethodC.itemCode || (complexCfg.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemDesc}"/></option>
<option value="${matchMethodC.itemCode}" <c:if test="${complexCfg.matchMethod==matchMethodC.itemCode || (complexCfg.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
</c:forEach>
</select>
</div>
@@ -101,7 +101,7 @@
<select name="${cfgName}.isHexbin"
class="selectpicker select2 form-control required">
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<option value="${isHexbinC.itemCode}" <c:if test="${complexCfg.isHexbin==isHexbinC.itemCode || (complexCfg.matchMethod==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemDesc}"/></option>
<option value="${isHexbinC.itemCode}" <c:if test="${complexCfg.isHexbin==isHexbinC.itemCode || (complexCfg.matchMethod==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
</c:forEach>
</select>
</div>

14
src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp
View File

@@ -31,7 +31,7 @@
<label><spring:message code='ip_type'/>:</label>
<label>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemDesc }"/></c:if>
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -41,7 +41,7 @@
<label><spring:message code='ip_pattern'/>:</label>
<label>
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemDesc }"/></c:if>
<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -61,7 +61,7 @@
<label><spring:message code='port_pattern'/>:</label>
<label>
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemDesc }"/></c:if>
<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -88,7 +88,7 @@
<label><spring:message code='direction'/>:</label>
<label>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemDesc }"/></c:if>
<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -98,7 +98,7 @@
<label><spring:message code='protocol'/>:</label>
<label>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemDesc }"/></c:if>
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -138,7 +138,7 @@
<label><spring:message code='match_method' />:</label>
<label>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemDesc}"/></c:if>
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
</c:forEach>
</label>
</div>
@@ -148,7 +148,7 @@
<label><spring:message code='whether_hexbinary' />:</label>
<label>
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemDesc}"/></c:if>
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
</c:forEach>
</label>
</div>

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

@@ -453,7 +453,7 @@
<input type="hidden" name="action" value="${action}"> <input
type="hidden" name="protocolId" value="${_cfg.protocolId}">
<div id="areaInfo">
<%@include file="/WEB-INF/include/form/areaDemoInfo.jsp"%>
<%-- <%@include file="/WEB-INF/include/form/areaDemoInfo.jsp"%> --%>
<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>
</div>
<input type="hidden" name=requestId value="0">

10
src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
View File

@@ -31,7 +31,7 @@
<select name="${cfgName}.ipType"
class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<option value="${ipTypeC.itemCode}" <c:if test="${ipPort.ipType==ipTypeC.itemCode || (ipPort.ipType==null && ipTypeC.itemCode==4)}">selected</c:if>><spring:message code="${ipTypeC.itemDesc}"/></option>
<option value="${ipTypeC.itemCode}" <c:if test="${ipPort.ipType==ipTypeC.itemCode || (ipPort.ipType==null && ipTypeC.itemCode==4)}">selected</c:if>><spring:message code="${ipTypeC.itemValue}"/></option>
</c:forEach>
</select>
</div>
@@ -48,7 +48,7 @@
<select name="${cfgName}.ipPattern"
class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<option value="${ipPatternC.itemCode}" <c:if test="${ipPort.ipPattern==ipPatternC.itemCode || (ipPort.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemDesc}"/></option>
<option value="${ipPatternC.itemCode}" <c:if test="${ipPort.ipPattern==ipPatternC.itemCode || (ipPort.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemValue}"/></option>
</c:forEach>
</select>
</div>
@@ -77,7 +77,7 @@
<select name="${cfgName}.portPattern"
class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<option value="${portPatternC.itemCode}" <c:if test="${ipPort.portPattern==portPatternC.itemCode || (ipPort.portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemDesc}"/></option>
<option value="${portPatternC.itemCode}" <c:if test="${ipPort.portPattern==portPatternC.itemCode || (ipPort.portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemValue}"/></option>
</c:forEach>
</select>
</div>
@@ -132,7 +132,7 @@
<select name="${cfgName}.protocol"
class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<option value="${protocolC.itemCode}" <c:if test="${ipPort.protocol==protocolC.itemCode || (ipPort.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemDesc}"/></option>
<option value="${protocolC.itemCode}" <c:if test="${ipPort.protocol==protocolC.itemCode || (ipPort.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
</c:forEach>
</select>
</div>
@@ -147,7 +147,7 @@
<select name="${cfgName}.direction"
class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
<option value="${directionC.itemCode}" <c:if test="${ipPort.direction==directionC.itemCode || (ipPort.direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemDesc}"/></option>
<option value="${directionC.itemCode}" <c:if test="${ipPort.direction==directionC.itemCode || (ipPort.direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemValue}"/></option>
</c:forEach>
</select>
</div>

14
src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
View File

@@ -32,7 +32,7 @@
<label><spring:message code='ip_type'/>:</label>
<label>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemDesc }"/></c:if>
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -42,7 +42,7 @@
<label><spring:message code='ip_pattern'/>:</label>
<label>
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemDesc }"/></c:if>
<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -62,7 +62,7 @@
<label><spring:message code='port_pattern'/>:</label>
<label>
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemDesc }"/></c:if>
<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -89,7 +89,7 @@
<label><spring:message code='direction'/>:</label>
<label>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemDesc }"/></c:if>
<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -99,7 +99,7 @@
<label><spring:message code='protocol'/>:</label>
<label>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemDesc }"/></c:if>
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -146,7 +146,7 @@
<label><spring:message code='match_method' />:</label>
<label>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemDesc}"/></c:if>
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
</c:forEach>
</label>
</div>
@@ -156,7 +156,7 @@
<label><spring:message code='whether_hexbinary' />:</label>
<label>
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemDesc}"/></c:if>
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
</c:forEach>
</label>
</div>

14
src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp
View File

@@ -31,7 +31,7 @@
<label><spring:message code='ip_type'/>:</label>
<label>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemDesc }"/></c:if>
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -41,7 +41,7 @@
<label><spring:message code='ip_pattern'/>:</label>
<label>
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemDesc }"/></c:if>
<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -61,7 +61,7 @@
<label><spring:message code='port_pattern'/>:</label>
<label>
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemDesc }"/></c:if>
<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -88,7 +88,7 @@
<label><spring:message code='direction'/>:</label>
<label>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemDesc }"/></c:if>
<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -98,7 +98,7 @@
<label><spring:message code='protocol'/>:</label>
<label>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemDesc }"/></c:if>
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -145,7 +145,7 @@
<label><spring:message code='match_method' />:</label>
<label>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemDesc}"/></c:if>
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
</c:forEach>
</label>
</div>
@@ -155,7 +155,7 @@
<label><spring:message code='whether_hexbinary' />:</label>
<label>
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemDesc}"/></c:if>
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
</c:forEach>
</label>
</div>

4
src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
View File

@@ -68,7 +68,7 @@ $(function(){
<select name="${cfgName}.matchMethod"
class="selectpicker select2 form-control required">
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<option value="${matchMethodC.itemCode}" <c:if test="${strCfg.matchMethod==matchMethodC.itemCode || (strCfg.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemDesc}"/></option>
<option value="${matchMethodC.itemCode}" <c:if test="${strCfg.matchMethod==matchMethodC.itemCode || (strCfg.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
</c:forEach>
</select>
</div>
@@ -85,7 +85,7 @@ $(function(){
<select name="${cfgName}.isHexbin"
class="selectpicker select2 form-control required">
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<option value="${isHexbinC.itemCode}" <c:if test="${strCfg.isHexbin==isHexbinC.itemCode || (strCfg.matchMethod==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemDesc}"/></option>
<option value="${isHexbinC.itemCode}" <c:if test="${strCfg.isHexbin==isHexbinC.itemCode || (strCfg.matchMethod==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
</c:forEach>
</select>
</div>

14
src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp
View File

@@ -31,7 +31,7 @@
<label><spring:message code='ip_type'/>:</label>
<label>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemDesc }"/></c:if>
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -41,7 +41,7 @@
<label><spring:message code='ip_pattern'/>:</label>
<label>
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemDesc }"/></c:if>
<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -61,7 +61,7 @@
<label><spring:message code='port_pattern'/>:</label>
<label>
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemDesc }"/></c:if>
<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -88,7 +88,7 @@
<label><spring:message code='direction'/>:</label>
<label>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemDesc }"/></c:if>
<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -98,7 +98,7 @@
<label><spring:message code='protocol'/>:</label>
<label>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemDesc }"/></c:if>
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -145,7 +145,7 @@
<label><spring:message code='match_method' />:</label>
<label>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemDesc}"/></c:if>
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
</c:forEach>
</label>
</div>
@@ -155,7 +155,7 @@
<label><spring:message code='whether_hexbinary' />:</label>
<label>
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemDesc}"/></c:if>
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
</c:forEach>
</label>
</div>

30
src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp
View File

@@ -63,7 +63,7 @@
<label><spring:message code='ip_type'/>:</label>
<label>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemDesc }"/></c:if>
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -73,7 +73,7 @@
<label><spring:message code='ip_pattern'/>:</label>
<label>
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemDesc }"/></c:if>
<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -93,7 +93,7 @@
<label><spring:message code='port_pattern'/>:</label>
<label>
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemDesc }"/></c:if>
<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -120,7 +120,7 @@
<label><spring:message code='direction'/>:</label>
<label>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemDesc }"/></c:if>
<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -130,7 +130,7 @@
<label><spring:message code='protocol'/>:</label>
<label>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemDesc }"/></c:if>
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -162,7 +162,7 @@
<label><spring:message code='match_method' />:</label>
<label>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemDesc}"/></c:if>
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
</c:forEach>
</label>
</div>
@@ -174,7 +174,7 @@
<label><spring:message code='whether_hexbinary' />:</label>
<label>
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemDesc}"/></c:if>
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
</c:forEach>
</label>
</div>
@@ -219,7 +219,7 @@
<label><spring:message code='match_method' />:</label>
<label>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemDesc}"/></c:if>
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
</c:forEach>
</label>
</div>
@@ -229,7 +229,7 @@
<label><spring:message code='whether_hexbinary' />:</label>
<label>
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemDesc}"/></c:if>
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
</c:forEach>
</label>
</div>
@@ -266,7 +266,7 @@
<label><spring:message code='match_method' />:</label>
<label>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemDesc}"/></c:if>
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
</c:forEach>
</label>
</div>
@@ -278,7 +278,7 @@
<label><spring:message code='whether_hexbinary' />:</label>
<label>
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemDesc}"/></c:if>
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
</c:forEach>
</label>
</div>
@@ -323,7 +323,7 @@
<label><spring:message code='match_method' />:</label>
<label>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemDesc}"/></c:if>
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
</c:forEach>
</label>
</div>
@@ -333,7 +333,7 @@
<label><spring:message code='whether_hexbinary' />:</label>
<label>
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemDesc}"/></c:if>
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
</c:forEach>
</label>
</div>
@@ -372,7 +372,7 @@
<label><spring:message code='match_method' />:</label>
<label>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemDesc}"/></c:if>
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
</c:forEach>
</label>
</div>
@@ -384,7 +384,7 @@
<label><spring:message code='whether_hexbinary' />:</label>
<label>
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemDesc}"/></c:if>
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
</c:forEach>
</label>
</div>

14
src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp
View File

@@ -31,7 +31,7 @@
<label><spring:message code='ip_type'/>:</label>
<label>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemDesc }"/></c:if>
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -41,7 +41,7 @@
<label><spring:message code='ip_pattern'/>:</label>
<label>
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemDesc }"/></c:if>
<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -61,7 +61,7 @@
<label><spring:message code='port_pattern'/>:</label>
<label>
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemDesc }"/></c:if>
<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -88,7 +88,7 @@
<label><spring:message code='direction'/>:</label>
<label>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemDesc }"/></c:if>
<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -98,7 +98,7 @@
<label><spring:message code='protocol'/>:</label>
<label>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemDesc }"/></c:if>
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
</c:forEach>
</label>
</div>
@@ -134,7 +134,7 @@
<label><spring:message code='match_method' />:</label>
<label>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemDesc}"/></c:if>
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
</c:forEach>
</label>
</div>
@@ -146,7 +146,7 @@
<label><spring:message code='whether_hexbinary' />:</label>
<label>
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemDesc}"/></c:if>
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
</c:forEach>
</label>
</div>

4
src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
View File

@@ -139,7 +139,7 @@ $(function(){
<div class="col-md-6">
<select name="ipPattern" class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<option value="${ipPatternC.itemCode}" <c:if test="${_cfg.ipPattern==ipPatternC.itemCode || (_cfg.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemDesc}"/></option>
<option value="${ipPatternC.itemCode}" <c:if test="${_cfg.ipPattern==ipPatternC.itemCode || (_cfg.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemValue}"/></option>
</c:forEach>
</select>
<!-- <input class="form-control" type="text" value="${_cfg.ipType}">-->
@@ -164,7 +164,7 @@ $(function(){
<div class="col-md-6">
<select name="portPattern" class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<option value="${portPatternC.itemCode}" <c:if test="${_cfg.portPattern==portPatternC.itemCode || (_cfg.portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemDesc}"/></option>
<option value="${portPatternC.itemCode}" <c:if test="${_cfg.portPattern==portPatternC.itemCode || (_cfg.portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemValue}"/></option>
</c:forEach>
</select>
</div>