From 627893fff62b1433976c55f5ff4a7220a4070fd5 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Wed, 26 Sep 2018 18:19:19 +0800
Subject: [PATCH] =?UTF-8?q?DNS=E7=AD=96=E7=95=A5=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=B1=95=E7=A4=BA=E6=97=A0=E6=AC=BA=E9=AA=97?=
 =?UTF-8?q?IP=E7=9A=84=E7=BB=84,DNS=E9=85=8D=E7=BD=AE=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E5=8E=9F=E7=8A=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintenance/DnsResStrategyController.java            | 3 ++-
 .../controller/configuration/ntc/WebsiteController.java  | 2 +-
 .../java/com/nis/web/dao/basics/PolicyGroupInfoDao.java  | 1 +
 .../java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml   | 9 +++++++++
 .../nis/web/service/basics/PolicyGroupInfoService.java   | 4 ++++
 5 files changed, 17 insertions(+), 2 deletions(-)

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<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(1);
+//		List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(1);
+		List<PolicyGroupInfo> 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<DnsResStrategy> resStrategys=dnsResStrategyService.findhasValidIpResStrategys(null, 1,1);
+		List<DnsResStrategy> 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<PolicyGroupInfo> {
 	List<PolicyGroupInfo> findPolicyGroupInfoList(PolicyGroupInfo policyGroupInfo);
 	List<PolicyGroupInfo> findPolicyGroupInfos();
 	List<PolicyGroupInfo> findPolicyGroupInfosByType(int groupType);
+	List<PolicyGroupInfo> findHasIPPolicyGroupInfosByType(int groupType);
 	List<PolicyGroupInfo> 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}
 	</select>
+      <select id="findHasIPPolicyGroupInfosByType" resultMap="PolicyGroupInfoMap">
+		SELECT
+			<include refid="PolicyGroupInfoColumns"/>
+	    FROM (
+	    SELECT DISTINCT dns_strategy_id FROM dns_ip_cfg WHERE is_valid=1 AND is_audit=1
+		) a
+		LEFT JOIN policy_group_info r ON a.dns_strategy_id=r.group_id
+	    where r.is_valid=1 and r.group_type=#{groupType,jdbcType=INTEGER}
+	</select>
 	<insert id="insert" parameterType="com.nis.domain.basics.PolicyGroupInfo" >
     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<PolicyGroupInfo> list=policyGroupInfoDao.findPolicyGroupInfosByType(type);
 		return list;
 	}
+	public List<PolicyGroupInfo> findHasIpPolicyGroupInfosByType(int type) {
+		List<PolicyGroupInfo> list=policyGroupInfoDao.findHasIPPolicyGroupInfosByType(type);
+		return list;
+	}
 	public List<PolicyGroupInfo> findPolicyGroupInfosHasIpRegionByType(int type) {
 		List<PolicyGroupInfo> list=policyGroupInfoDao.findPolicyGroupInfosByType(type);
 		return list;