(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

@@ -1,22 +1,14 @@
package com.nis.web.service.basics;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.nis.domain.Page;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.AvVoipAccountCfg;
import com.nis.domain.configuration.AvVoipIpCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.StringUtil;
import com.nis.web.dao.basics.PolicyGroupInfoDao;
import com.nis.web.security.UserUtils;
@@ -44,6 +36,10 @@ public class PolicyGroupInfoService extends BaseService{
List<PolicyGroupInfo> list=policyGroupInfoDao.findPolicyGroupInfos();
return list;
}
public List<PolicyGroupInfo> findPolicyGroupInfosByType(int type) {
List<PolicyGroupInfo> list=policyGroupInfoDao.findPolicyGroupInfosByType(type);
return list;
}
public PolicyGroupInfo getById(int id) {
PolicyGroupInfo policyGroupInfo=policyGroupInfoDao.getById(id);