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

音视频日志增加视频协议

Browse Source 
回调类配置批量下发修改
This commit is contained in:
DuanDongmei
2018-12-07 20:26:12 +08:00
parent 529a934f42
commit 0b97ccc6d4
16 changed files with 150 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2594,6 +2594,8 @@ public class BaseController {
List subList = commonPolicyService.getIpDropList("ip_port_cfg", compileIds);
for(int i=0;i<subList.size();i++){
IpPortCfg cfg = (IpPortCfg) subList.get(i);
cfg.setIsValid(entity.getIsValid());
cfg.setAuditTime(entity.getAuditTime());
newList.add(BaseService.convertCallBackIp(cfg,cfg.getGroupId()));
}
@@ -2603,32 +2605,42 @@ public class BaseController {
list = avCfgService.getAvFileSampleList(page,searchFileSampleCfg).getList();
for(int i=0;i<list.size();i++){
BaseCfg cfg = (BaseCfg) list.get(i);
cfg.setIsValid(entity.getIsValid());
cfg.setAuditTime(entity.getAuditTime());
ids.add(cfg.getCompileId());
newList.add(cfg);
}
newList.addAll(list);
}else if(className.equals("AvSignSampleCfg")){
list = avCfgService.getSignSampleList(searchSignSampleCfg);
for(int i=0;i<list.size();i++){
BaseCfg cfg = (BaseCfg) list.get(i);
cfg.setIsValid(entity.getIsValid());
cfg.setAuditTime(entity.getAuditTime());
ids.add(cfg.getCompileId());
newList.add(cfg);
}
newList.addAll(list);
}else if(className.equals("PxyObjKeyring")){
list = pxyObjKeyringService.findPage(page, searchObjKeyringCfg).getList();
for(int i=0;i<list.size();i++){
PxyObjKeyring cfg = (PxyObjKeyring) list.get(i);
cfg.setIsValid(entity.getIsValid());
cfg.setAuditTime(entity.getAuditTime());
newList.add(BaseService.convertCallBackProxyObjKeyring(cfg));
ids.add(cfg.getCompileId());
newList.add(cfg);
}
}else if(className.equals("PxyObjTrustedCaCert")){
list = pxyObjKeyringService.findTrustedCertPage(page,searchTrustedCaCertCfg).getList();
for(int i=0;i<list.size();i++){
PxyObjTrustedCaCert cfg = (PxyObjTrustedCaCert) list.get(i);
cfg.setIsValid(entity.getIsValid());
cfg.setAuditTime(entity.getAuditTime());
newList.addAll(BaseService.convertCallBackProxyObjTrustedCa(cfg,null));
//TODO 要保证cert下发成功crl必须也同时下发成功，需要单个查询
ids.add(cfg.getCompileId());
}
}/*else if(className.equals("PxyObjTrustedCaCrl")){ //批量下发时不需要单独下发CRL
}/*//批量下发时不需要单独下发CRL
else if(className.equals("PxyObjTrustedCaCrl")){
list = pxyObjKeyringService;
for(int i=0;i<list.size();i++){
PxyObjTrustedCaCrl cfg = (PxyObjTrustedCaCrl) list.get(i);
@@ -2639,6 +2651,8 @@ public class BaseController {
list = dnsResStrategyService.findPage(page,searchDnsResStrategy).getList();
for(int i=0;i<list.size();i++){
DnsResStrategy cfg = (DnsResStrategy) list.get(i);
cfg.setIsValid(entity.getIsValid());
cfg.setAuditTime(entity.getAuditTime());
newList.add(BaseService.convertCallBackDnsResStrategy(cfg));
ids.add(cfg.getCompileId());
}
@@ -2646,26 +2660,34 @@ public class BaseController {
list = dnsIpCfgService.findPage(page,searchDnsIpCfg).getList();
for(int i=0;i<list.size();i++){
DnsIpCfg cfg = (DnsIpCfg) list.get(i);
newList.add(BaseService.convertCallBackIp(cfg,cfg.getGroupId()));
cfg.setIsValid(entity.getIsValid());
cfg.setAuditTime(entity.getAuditTime());
newList.add(BaseService.convertCallBackIp(cfg,cfg.getDnsStrategyId()));
ids.add(cfg.getCompileId());
}
}else if(className.equals("IpPortCfg")){
list = commonPolicyService.getIpPortList(searchIpPortCfg);
for(int i=0;i<list.size();i++){
IpPortCfg cfg = (IpPortCfg) list.get(i);
cfg.setIsValid(entity.getIsValid());
cfg.setAuditTime(entity.getAuditTime());
newList.add(BaseService.convertCallBackIp(cfg,cfg.getGroupId()));
ids.add(cfg.getCompileId());
}
}
}
//批量修改和下发回调配置
commonPolicyService.auditCallBackData(newList, compileIds, ids, entity);
page.setList(list);
if(page.isLastPage()){
hasData = false;
}
if(!StringUtil.isEmpty(newList)) {
//批量修改和下发回调配置
commonPolicyService.auditCallBackData(newList, compileIds, ids, entity);
}else {
hasData = false;
}
return hasData;
}