diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java index 0cadc60ea..a7e4f6426 100644 --- a/src/main/java/com/nis/domain/configuration/BaseCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java @@ -287,7 +287,20 @@ public class BaseCfg extends BaseEntity implements Cloneable{ protected Integer regionId;//仅用于copy属性使用 protected Integer numberRegionGroupId;//仅用于copy属性使用 protected Integer numberRegionRegionId;//仅用于copy属性使用 - + private Integer groupType; //url组以及dns组相关功能使用 + private Integer udFlag; //url组以及dns组相关功能使用 过滤数据库数据标记 + public Integer getGroupType() { + return groupType; + } + public void setGroupType(Integer groupType) { + this.groupType = groupType; + } + public Integer getUdFlag() { + return udFlag; + } + public void setUdFlag(Integer udFlag) { + this.udFlag = udFlag; + } public Integer getNumberRegionGroupId() { return numberRegionGroupId; } diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index fc15818cb..7ba6d945f 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -46,6 +46,7 @@ import com.nis.domain.Page; import com.nis.domain.SysDataDictionaryItem; import com.nis.domain.basics.AsnGroupInfo; import com.nis.domain.basics.AsnIpCfg; +import com.nis.domain.basics.PolicyGroupInfo; import com.nis.domain.basics.ServiceDictInfo; import com.nis.domain.basics.SysDictInfo; import com.nis.domain.configuration.AppComplexFeatureCfg; @@ -639,6 +640,8 @@ public class BaseController { } } } + List dnsGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(cfg.getGroupType(), cfg.getUdFlag()); + model.addAttribute("policyGroupInfos", dnsGroupInfos); } protected void initUpdateFormCondition(Model model, BaseCfg cfg) { @@ -703,6 +706,8 @@ public class BaseController { model.addAttribute("regionList", regionList); List serviceList = DictUtils.getFunctionServiceDictList(cfg.getFunctionId()); model.addAttribute("serviceList", serviceList); + List dnsGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(cfg.getGroupType(), cfg.getUdFlag()); + model.addAttribute("policyGroupInfos", dnsGroupInfos); } public List getAreaIsps(String areaEffectiveIds, List areaIspList, List isps, diff --git a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java index 26cb0e9ec..7689aca52 100644 --- a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java +++ b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java @@ -26,4 +26,5 @@ public interface PolicyGroupInfoDao extends CrudDao { PolicyGroupInfo getGroupInfo(PolicyGroupInfo policyGroupInfo); List findPolicyByGroupInfoList(@Param("ids")String ids); + List findPolicyGroupInfosByTypeForUD(@Param("groupType")Integer groupType,@Param("flag")Integer flag); } \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml index edaba3469..2879438d1 100644 --- a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml +++ b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml @@ -266,6 +266,14 @@ WHERE r.group_id IN (${ids}) - - + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java b/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java index 4ccf12ee6..4b9d24fe9 100644 --- a/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java +++ b/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java @@ -173,5 +173,11 @@ public class PolicyGroupInfoService extends BaseService{ public PolicyGroupInfo getGroupInfo(PolicyGroupInfo policyGroupInfo){ return policyGroupInfoDao.getGroupInfo(policyGroupInfo); } - + /** + * url组以及dns组相关功能使用 + */ + public List findPolicyGroupInfosByTypeforUD(Integer type,Integer flag) { + List list=policyGroupInfoDao.findPolicyGroupInfosByTypeForUD(type,flag); + return list; + } }