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

多媒体、IP复用、增加导出excel和csv

Browse Source
This commit is contained in:
leijun
2018-12-23 00:36:58 +08:00
parent 9080960e95
commit df32c39736
42 changed files with 730 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
View File

@@ -43,6 +43,7 @@ import com.nis.domain.configuration.AvSignSampleCfg;
import com.nis.domain.configuration.AvSignSampleCfgModel;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.FileDigestCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.maat.ToMaatResult;
@@ -585,18 +586,20 @@ public class AvController extends BaseController {
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{
*/
List<AvFileSampleCfg> ipLists = new ArrayList<AvFileSampleCfg>();
// 导出选中记录
if (!StringUtil.isEmpty(ids)) {
ipLists = avCfgService.getAvFileBySampleList(ids);
} else {
entity.setTableName(IpPortCfg.getTablename());
Page<AvFileSampleCfg> pageInfo = new Page<AvFileSampleCfg>(request, response, "a");
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<AvFileSampleCfg> page = avCfgService.getAvFileSampleList(pageInfo, entity);
ipLists = page.getList();
}
// 条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<AvFileSampleCfg> pageInfo = new Page<AvFileSampleCfg>(request, response, "a");
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<AvFileSampleCfg> page = avCfgService.getAvFileSampleList(pageInfo, entity);
titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), AvFileSampleCfg.class);
String cfgIndexInfoNoExport = ",group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
@@ -616,7 +619,7 @@ public class AvController extends BaseController {
}
noExportMap.put(entity.getMenuNameCode(), cfgIndexInfoNoExport);
dataMap.put(entity.getMenuNameCode(), page.getList());
dataMap.put(entity.getMenuNameCode(), ipLists);
String timeRange = initTimeMap(entity);
noExportMap.put("timeRange", timeRange);

29
src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
View File

@@ -826,23 +826,22 @@ public class FileTransferCfgController 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());
Page<FileDigestCfg> pageInfo = new Page<FileDigestCfg>(request, response, "a");
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<FileDigestCfg> page = fileTransferCfgService.getFileDigestList(pageInfo, entity);
List<FileDigestCfg> ipLists = new ArrayList<FileDigestCfg>();
// 导出选中记录
if (!StringUtil.isEmpty(ids)) {
ipLists = fileTransferCfgService.getFileByDigestList(ids);
} else {
Page<FileDigestCfg> pageInfo = new Page<FileDigestCfg>(request, response, "a");
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<FileDigestCfg> page = fileTransferCfgService.getFileDigestList(pageInfo, entity);
ipLists = page.getList();
}
titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), FileDigestCfg.class);
String cfgIndexInfoNoExport = ",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
// 时间过滤
if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) {
cfgIndexInfoNoExport = ",config_time" + cfgIndexInfoNoExport;
@@ -858,7 +857,7 @@ public class FileTransferCfgController extends BaseController {
}
noExportMap.put(entity.getMenuNameCode(), cfgIndexInfoNoExport);
dataMap.put(entity.getMenuNameCode(), page.getList());
dataMap.put(entity.getMenuNameCode(), ipLists);
/* } */
String timeRange = initTimeMap(entity);