From 584ca1cfb1b2696693dd94738fa6377f06e44807 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Tue, 21 Aug 2018 18:00:20 +0800
Subject: [PATCH] =?UTF-8?q?ntcSubscribeIdCfgList=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/domain/configuration/AppPolicyCfg.java  | 13 ++++++-------
 .../web/service/configuration/AppCfgService.java    | 13 +++++++++++++
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java
index bc14c93a3..da27c0bfe 100644
--- a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java
+++ b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java
@@ -84,14 +84,13 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
 	private List<IpPortCfg> ipPortList;
 	private IpPortCfg ipPort;
 	private NtcSubscribeIdCfg ntcSubscribeIdCfg;
-	private List<NtcSubscribeIdCfg> ntcSubscribeCfgList;
-	
-	public List<NtcSubscribeIdCfg> getNtcSubscribeCfgList() {
-		return ntcSubscribeCfgList;
-	}
+	private List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList;
 
-	public void setNtcSubscribeCfgList(List<NtcSubscribeIdCfg> ntcSubscribeCfgList) {
-		this.ntcSubscribeCfgList = ntcSubscribeCfgList;
+	public List<NtcSubscribeIdCfg> getNtcSubscribeIdCfgList() {
+		return ntcSubscribeIdCfgList;
+	}
+	public void setNtcSubscribeIdCfgList(List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList) {
+		this.ntcSubscribeIdCfgList = ntcSubscribeIdCfgList;
 	}
 
 	public NtcSubscribeIdCfg getNtcSubscribeIdCfg() {
diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java
index fe8763e95..b99062c66 100644
--- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java
@@ -19,6 +19,7 @@ import com.nis.domain.configuration.AppPolicyCfg;
 import com.nis.domain.configuration.AppSslCertCfg;
 import com.nis.domain.configuration.AreaIpCfg;
 import com.nis.domain.configuration.IpPortCfg;
+import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.domain.maat.MaatCfg;
 import com.nis.domain.maat.MaatCfg.DigestCfg;
 import com.nis.domain.maat.MaatCfg.GroupCfg;
@@ -34,6 +35,7 @@ import com.nis.util.DictUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.dao.configuration.AppCfgDao;
 import com.nis.web.dao.configuration.AreaIpCfgDao;
+import com.nis.web.dao.configuration.StringCfgDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.BaseService;
 
@@ -49,6 +51,9 @@ public class AppCfgService extends BaseService {
 	protected AppCfgDao appCfgDao;
 	@Autowired
 	protected AreaIpCfgDao areaIpCfgDao;
+	@Autowired
+	protected StringCfgDao stringcfgDao;
+	
 	
 	public Page<AppPolicyCfg> findAppPolicyList(Page<AppPolicyCfg> page, AppPolicyCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
@@ -95,6 +100,14 @@ public class AppCfgService extends BaseService {
 	public AppPolicyCfg getAppPolicyCfg(Long cfgId){
 		AppPolicyCfg policy = appCfgDao.getAppPolicyCfg(cfgId);
 		List<IpPortCfg> ipPortList = appCfgDao.getAppPolicyIpList(policy);
+		//查询关键字
+		if(policy.getCompileId()!=null){
+			NtcSubscribeIdCfg ntcSubscribeIdCfg = new NtcSubscribeIdCfg();
+			ntcSubscribeIdCfg.setCompileId(policy.getCompileId());
+			List<NtcSubscribeIdCfg> ntcList = stringcfgDao.findSubscribeIdCfgList(ntcSubscribeIdCfg);
+			policy.setNtcSubscribeIdCfgList(ntcList);
+		}
+		
 		policy.setIpPortList(ipPortList);
 		return policy;
 	}