diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 300264f7f..f447f9c34 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -2040,7 +2040,6 @@ public class BaseController { cfg.setBehavCode(Integer.parseInt(behaviorId)); } - AppFeatureIndex appfeature = new AppFeatureIndex(); BeanUtils.copyProperties(cfg, appfeature,new String[] {"cfgId"}); if(regionDict!=null){ @@ -2049,7 +2048,6 @@ public class BaseController { appfeature.setCfgRegionType(String.valueOf(regionDict.getRegionType())); } appFeatureIndexs.add(appfeature); - ind++; } ipCfgService.saveAndSend(regionDict, serviceDict, specificServiceCfg, _complexkeywordCfgs, cfgIndexInfos, appPolicyCfgs,appFeatureIndexs,isSend.equals("1")); @@ -2279,6 +2277,24 @@ public class BaseController { ByteArrayOutputStream out = new ByteArrayOutputStream(); ExcelCsv.writeCSVFile(response,titleList,headMap,dataList,fileName,titleTime,msgProp); } + + + public void _ajaxExport(HttpServletRequest request, HttpServletResponse response, + String code,String titleTime,List headerList, List> dataList) + throws Exception{ + Properties msgProp = getMsgProp(); + String fileName = msgProp.getProperty(code, code) + "_" + DateUtils.getDate("yyyyMMddHHmmss") + + ".xlsx"; + fileName = fileName.replaceAll(" ", "_"); + if (request.getHeader("User-Agent").toUpperCase().indexOf("MSIE") > 0) { + fileName = URLEncoder.encode(fileName, "UTF-8"); + } else { + fileName = new String(fileName.getBytes("UTF-8"), "ISO8859-1"); + } + new ExportExcel(msgProp.getProperty(code, code),code,titleTime, headerList).ajaxDataList(dataList, code).write(response, fileName).dispose(); + + } + public String initLogMap(BaseLogEntity log,String title){ Properties msgProp = getMsgProp(); String logTime=msgProp.getProperty(title,title);;