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

(1)细化IPV4掩码范围验证的提示

Browse Source 
(2)IP不能为xxxx的提示前方加入空格
(3)DNS响应策略导入模板，导入功能提交
This commit is contained in:
wangxin
2018-11-02 14:53:51 +08:00
parent 6ab181c329
commit e063194254
11 changed files with 307 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java
View File

@@ -64,6 +64,12 @@ public class DnsResStrategyService extends BaseService{
return dnsResStrategy;
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void saveDnsResStrategies(List<DnsResStrategy> cfgs) {
for(DnsResStrategy cfg: cfgs) {
saveOrUpdate(cfg);
}
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void saveOrUpdate(DnsResStrategy entity){
Date createTime=new Date();
setAreaEffectiveIds(entity);
@@ -78,17 +84,19 @@ public class DnsResStrategyService extends BaseService{
entity.setCreateTime(createTime);
entity.setIsValid(0);
entity.setIsAudit(0);
//调用服务接口获取compileId
List<Integer> compileIds = new ArrayList<Integer>();
try {
compileIds = ConfigServiceUtil.getId(1,1);
} catch (Exception e) {
e.printStackTrace();
logger.info("获取编译ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
if(compileIds != null && compileIds.size() >0 && compileIds.get(0) != 0){
entity.setCompileId(compileIds.get(0));
if(entity.getCompileId()==null||entity.getCompileId().intValue()==0) {
//调用服务接口获取compileId
List<Integer> compileIds = new ArrayList<Integer>();
try {
compileIds = ConfigServiceUtil.getId(1,1);
} catch (Exception e) {
e.printStackTrace();
logger.info("获取编译ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
if(compileIds != null && compileIds.size() >0 && compileIds.get(0) != 0){
entity.setCompileId(compileIds.get(0));
}
}
dnsResStrategyDao.insert(entity);
//修改