diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java index de7f9deed..73bc636eb 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java @@ -57,7 +57,8 @@ public class DnsResStrategyController extends BaseController { } //查询policyGroup列表,供响应策略选择 - List policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(1); +// List policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(1); + List policyGroups=policyGroupInfoService.findHasIpPolicyGroupInfosByType(1); model.addAttribute("policyGroups", policyGroups); model.addAttribute("_cfg", cfg); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java index acc8c2236..50ab696a6 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java @@ -323,7 +323,7 @@ public class WebsiteController extends BaseController{ initFormCondition(model,entity); } //获取所有响应策略信息 - List resStrategys=dnsResStrategyService.findhasValidIpResStrategys(null, 1,1); + List resStrategys=dnsResStrategyService.findDnsResStrategys(null, 1,1); model.addAttribute("dnsResStrategys", resStrategys); model.addAttribute("_cfg", entity); return "/cfg/website/dnsForm"; 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 f7a2c81cf..93144d780 100644 --- a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java +++ b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java @@ -12,6 +12,7 @@ public interface PolicyGroupInfoDao extends CrudDao { List findPolicyGroupInfoList(PolicyGroupInfo policyGroupInfo); List findPolicyGroupInfos(); List findPolicyGroupInfosByType(int groupType); + List findHasIPPolicyGroupInfosByType(int groupType); List findPolicyGroupInfosHasIpRegionByType(int groupType); PolicyGroupInfo getById(int id); 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 39fcc5589..dae3b765b 100644 --- a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml +++ b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml @@ -73,6 +73,15 @@ FROM policy_group_info r where r.is_valid=1 and r.group_type=#{groupType,jdbcType=INTEGER} + insert into policy_group_info( IS_VALID, 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 0db247050..daf37fcd9 100644 --- a/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java +++ b/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java @@ -49,6 +49,10 @@ public class PolicyGroupInfoService extends BaseService{ List list=policyGroupInfoDao.findPolicyGroupInfosByType(type); return list; } + public List findHasIpPolicyGroupInfosByType(int type) { + List list=policyGroupInfoDao.findHasIPPolicyGroupInfosByType(type); + return list; + } public List findPolicyGroupInfosHasIpRegionByType(int type) { List list=policyGroupInfoDao.findPolicyGroupInfosByType(type); return list;