(1)IP复用提交

(2)修改保存区域IP的Dao为AreaIpCfgDao
(3)共用页面兼容性调整
(4)针对IP复用的loop action做了特殊处理,此处审核不是走callback
This commit is contained in:
wangxin
2018-06-25 16:55:45 +08:00
parent ea43be405a
commit 393c0f9917
20 changed files with 307 additions and 87 deletions

View File

@@ -155,7 +155,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
BeanUtils.copyProperties(cfg, maatCfg);
String json="";
if(cfg.getIsAudit()==1){
if(Constants.DROP_ACTION==cfg.getAction()||Constants.LOOP_ACTION==cfg.getAction()){
if(Constants.SERVICE_IP_MULITIPLEX!=cfg.getServiceId().intValue() &&(Constants.DROP_ACTION==cfg.getAction()||Constants.LOOP_ACTION==cfg.getAction())){
List<InlineIp> ipList=new ArrayList<>();
InlineIp ip=convertCallBackIp(cfg,null);
ipList.add(ip);