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

业务配置增加勾选导出

Browse Source
This commit is contained in:
leijun
2018-12-17 03:30:34 +08:00
parent bb2c6b8201
commit 94eb5991af
39 changed files with 738 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java
View File

@@ -46,6 +46,7 @@ import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.domain.configuration.PxyObjTrustedCaCert;
import com.nis.domain.configuration.WebsiteDomainTopic;
import com.nis.domain.maat.ToMaatResult;
import com.nis.domain.maat.ToMaatResult.ResponseData;
@@ -300,22 +301,19 @@ public class AppFeatureCfgController extends BaseController {
Map<String, Class<?>> classMap=new HashMap<String, Class<?>>();
Map<String, List> dataMap=new HashMap<String, List>();
Map<String, String> noExportMap=new HashMap<String, String>();
/*//导出选中记录
* if(!StringUtil.isEmpty(ids)){
for(String id:ids.split(",")){
Long.parseLong(id);
}
//List<CfgIndexInfo> list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids);
}else{*/
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
List<AppFeatureIndex> ipLists=new ArrayList<AppFeatureIndex>();
//导出选中记录
if(!StringUtil.isEmpty(ids)){
ipLists=appMultiFeatureCfgService.findAppByFeatureIndexList(ids);
}else{
Page<AppFeatureIndex> pageInfo=new Page<AppFeatureIndex>(request, response,"r");
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<AppFeatureIndex> page = appMultiFeatureCfgService.findAppFeatureIndexList(pageInfo, entity);
for(AppFeatureIndex feature:page.getList()){
ipLists=page.getList();
}
for(AppFeatureIndex feature:ipLists){
SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(feature.getSpecServiceId());
feature.setAppName(app.getSpecServiceName());
}
@@ -334,7 +332,7 @@ public class AppFeatureCfgController extends BaseController {
List<IpPortCfg> ipList=new ArrayList<IpPortCfg>();
List<AppComplexFeatureCfg> keywordList=new ArrayList<AppComplexFeatureCfg>();
List<AppStringFeatureCfg> strList=new ArrayList<AppStringFeatureCfg>();
for (AppFeatureIndex cfg : page.getList()) {
for (AppFeatureIndex cfg : ipLists) {
Map<String, List> maps=appMultiFeatureCfgService.exportFeature(cfg);
if(entity.getFunctionId()!=567){
keywordList.addAll(maps.get("APP_KEYWORDS"));
@@ -343,7 +341,7 @@ public class AppFeatureCfgController extends BaseController {
}
ipList.addAll(maps.get("APP_IP_RANGE"));
}
dataMap.put(entity.getMenuNameCode(), page.getList());
dataMap.put(entity.getMenuNameCode(), ipLists);
if(entity.getFunctionId()!=564 && entity.getFunctionId()!=567 ){
keywordList=replaceKeyList(keywordList);
titleList.add("APP_IP_RANGE");