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

(1)修复字段域导入时获取字典值失败原值被替换为空，影响验证的bug

Browse Source 
(2)packet ip ratelimit 字段验证
(3)packet ip 滚动条修复
This commit is contained in:
wangxin
2018-10-19 12:46:15 +08:00
parent 5655f16c32
commit 777e78c167
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/util/excel/ImportExcel.java
View File

@@ -359,7 +359,11 @@ public class ImportExcel {
ExcelField ef = (ExcelField)os[0]; ExcelField ef = (ExcelField)os[0];
// If is dict type, get dict value // If is dict type, get dict value
if (StringUtils.isNotBlank(ef.dictType())){ if (StringUtils.isNotBlank(ef.dictType())){
val = DictUtils.getDictCode(ef.dictType(), val.toString(), ""); Object val1 = DictUtils.getDictCode(ef.dictType(), val.toString(), "");
//没有获取到字典值的话会影响验证判断
if(val1!=null&&StringUtils.isNotBlank(val1.toString())) {
val=val1;
}
//log.debug("Dictionary type value: ["+i+","+colunm+"] " + val); //log.debug("Dictionary type value: ["+i+","+colunm+"] " + val);
} }
// Get param type and type cast // Get param type and type cast

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

@@ -825,6 +825,21 @@ public class BaseController {
StringBuffer errInfo = new StringBuffer(); StringBuffer errInfo = new StringBuffer();
IpPortCfg baseIpCfg = new IpPortCfg(); IpPortCfg baseIpCfg = new IpPortCfg();
BeanUtils.copyProperties(list.get(i), baseIpCfg); BeanUtils.copyProperties(list.get(i), baseIpCfg);
//特殊字段验证
//packet ip ratelimit
if(serviceDict.getFunctionId().intValue()==5&&serviceDict.getAction().intValue()==64) {
String userRegion1=baseIpCfg.getUserRegion1();
try {
Double ratelimt= Double.parseDouble(userRegion1);
if(ratelimt>0.009||ratelimt<0.001) {
errInfo.append(prop.getProperty("ratelimit")+"."+String.format(prop.getProperty("must_between"),0.001,0.009));
}
} catch (Exception e) {
// TODO: handle exception
errInfo.append(String.format(prop.getProperty("not_number"), prop.getProperty("ratelimit")));
}
}
if (regionDict.getRegionType().equals(1)) { if (regionDict.getRegionType().equals(1)) {
// 校验必填的IP，端口 // 校验必填的IP，端口
for (String code : configIpPortShow.split(",")) { for (String code : configIpPortShow.split(",")) {
@@ -1205,7 +1220,7 @@ public class BaseController {
} }
} }
if (!has) { if (!has) {
errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("direction")) + "," errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("direction")) + "."
+ String.format(prop.getProperty("alternative_values"), directionPattern) + ";"); + String.format(prop.getProperty("alternative_values"), directionPattern) + ";");
} }
return has; return has;
@@ -1233,7 +1248,7 @@ public class BaseController {
} }
} }
if (!has) { if (!has) {
errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("protocol")) + "," errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("protocol")) + "."
+ String.format(prop.getProperty("alternative_values"), protocolPattern) + ";"); + String.format(prop.getProperty("alternative_values"), protocolPattern) + ";");
} }
return has; return has;

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

@@ -85,8 +85,6 @@
<body> <body>
<div class="page-content"> <div class="page-content">
<!-- 模板导入，start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
<div class="theme-panel hidden-xs hidden-sm"> <div class="theme-panel hidden-xs hidden-sm">
<shiro:hasPermission name="iplist:config"> <shiro:hasPermission name="iplist:config">
<button type="button" class="btn btn-primary" <button type="button" class="btn btn-primary"
@@ -473,6 +471,7 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 模板导入，start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
</body> </body>
</html> </html>