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

Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

Browse Source
This commit is contained in:
zhangwei
2019-01-04 20:25:58 +06:00
parent 23c7d024cd 4bf5df788d
commit fe3771b60b
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/service/basics/AsnIpCfgService.java
View File

@@ -444,7 +444,8 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class); SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
final SqlSession batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); final SqlSession batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
try{ try{
data.entrySet().stream().forEach( enrty->{ for(Entry<Long,List<AsnIpCfg>> enrty:data.entrySet()) {
//data.entrySet().stream().forEach( enrty->{
Long asn=enrty.getKey();//ans group 的group id Long asn=enrty.getKey();//ans group 的group id
List<AsnIpCfg> asnIpCfgs=enrty.getValue(); List<AsnIpCfg> asnIpCfgs=enrty.getValue();
for(int index = 0; index < asnIpCfgs.size();index++){ for(int index = 0; index < asnIpCfgs.size();index++){
@@ -548,7 +549,8 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
}else { }else {
throw new RuntimeException("isValid value is "+isValid); throw new RuntimeException("isValid value is "+isValid);
} }
}); //});
}
}finally { }finally {
if(batchSqlSession != null){ if(batchSqlSession != null){
batchSqlSession.close(); batchSqlSession.close();

7
src/main/resources/messages/message_ru.properties
View File

@@ -1449,3 +1449,10 @@ hex_minlength_8=Please enter a hexadecimal string of length 8
hex_minlength_16=Please enter a hexadecimal string of length 16 hex_minlength_16=Please enter a hexadecimal string of length 16
need_input=Attributes need to be filled in need_input=Attributes need to be filled in
max_input=Fill in at most four max_input=Fill in at most four
no_need_input=Attributes no need to be filled in
close_link=Close Link
asn_group=ASN Group
can_not_edit_issued_ans_group=Can not edit valid ASN group
can_not_delete_asn_group_with_audited_ip=Can not delete ASN group with approved IP
organization=Organization
mismatch=Mismatch