gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ntcSubscribeIdCfgList修改名称

Browse Source
This commit is contained in:
zhanghongqing
2018-08-21 18:00:20 +08:00
parent c98d319eda
commit 584ca1cfb1
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/nis/domain/configuration/AppPolicyCfg.java
View File

@@ -84,14 +84,13 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
private List<IpPortCfg> ipPortList; private List<IpPortCfg> ipPortList;
private IpPortCfg ipPort; private IpPortCfg ipPort;
private NtcSubscribeIdCfg ntcSubscribeIdCfg; private NtcSubscribeIdCfg ntcSubscribeIdCfg;
private List<NtcSubscribeIdCfg> ntcSubscribeCfgList; private List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList;
public List<NtcSubscribeIdCfg> getNtcSubscribeCfgList() {
return ntcSubscribeCfgList;
}
public void setNtcSubscribeCfgList(List<NtcSubscribeIdCfg> ntcSubscribeCfgList) { public List<NtcSubscribeIdCfg> getNtcSubscribeIdCfgList() {
this.ntcSubscribeCfgList = ntcSubscribeCfgList; return ntcSubscribeIdCfgList;
}
public void setNtcSubscribeIdCfgList(List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList) {
this.ntcSubscribeIdCfgList = ntcSubscribeIdCfgList;
} }
public NtcSubscribeIdCfg getNtcSubscribeIdCfg() { public NtcSubscribeIdCfg getNtcSubscribeIdCfg() {

13
src/main/java/com/nis/web/service/configuration/AppCfgService.java
View File

@@ -19,6 +19,7 @@ import com.nis.domain.configuration.AppPolicyCfg;
import com.nis.domain.configuration.AppSslCertCfg; import com.nis.domain.configuration.AppSslCertCfg;
import com.nis.domain.configuration.AreaIpCfg; import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.domain.maat.MaatCfg; import com.nis.domain.maat.MaatCfg;
import com.nis.domain.maat.MaatCfg.DigestCfg; import com.nis.domain.maat.MaatCfg.DigestCfg;
import com.nis.domain.maat.MaatCfg.GroupCfg; import com.nis.domain.maat.MaatCfg.GroupCfg;
@@ -34,6 +35,7 @@ import com.nis.util.DictUtils;
import com.nis.util.StringUtil; import com.nis.util.StringUtil;
import com.nis.web.dao.configuration.AppCfgDao; import com.nis.web.dao.configuration.AppCfgDao;
import com.nis.web.dao.configuration.AreaIpCfgDao; import com.nis.web.dao.configuration.AreaIpCfgDao;
import com.nis.web.dao.configuration.StringCfgDao;
import com.nis.web.security.UserUtils; import com.nis.web.security.UserUtils;
import com.nis.web.service.BaseService; import com.nis.web.service.BaseService;
@@ -49,6 +51,9 @@ public class AppCfgService extends BaseService {
protected AppCfgDao appCfgDao; protected AppCfgDao appCfgDao;
@Autowired @Autowired
protected AreaIpCfgDao areaIpCfgDao; protected AreaIpCfgDao areaIpCfgDao;
@Autowired
protected StringCfgDao stringcfgDao;
public Page<AppPolicyCfg> findAppPolicyList(Page<AppPolicyCfg> page, AppPolicyCfg entity) { public Page<AppPolicyCfg> findAppPolicyList(Page<AppPolicyCfg> page, AppPolicyCfg entity) {
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
@@ -95,6 +100,14 @@ public class AppCfgService extends BaseService {
public AppPolicyCfg getAppPolicyCfg(Long cfgId){ public AppPolicyCfg getAppPolicyCfg(Long cfgId){
AppPolicyCfg policy = appCfgDao.getAppPolicyCfg(cfgId); AppPolicyCfg policy = appCfgDao.getAppPolicyCfg(cfgId);
List<IpPortCfg> ipPortList = appCfgDao.getAppPolicyIpList(policy); 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); policy.setIpPortList(ipPortList);
return policy; return policy;
} }