From 3f4b28cbfd05b93d7d82b9ddf21d5336ae3d9c28 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Wed, 13 Jun 2018 16:25:00 +0800
Subject: [PATCH] =?UTF-8?q?ExportExcel=E6=96=B9=E6=B3=95=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/controller/BaseController.java    | 46 +++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index 3e1905e78..4c3d563a2 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -45,6 +45,7 @@ import com.nis.domain.configuration.NumBoundaryCfg;
 import com.nis.domain.configuration.RequestInfo;
 import com.nis.domain.configuration.StringCfgTemplate;
 import com.nis.domain.log.BaseLogEntity;
+import com.nis.domain.log.NtcOpenVpnLog;
 import com.nis.util.Configurations;
 //import com.nis.main.ConvertTool;
 import com.nis.util.Constants;
@@ -450,17 +451,17 @@ public class BaseController {
 					if(dict.getRegionType()==1){
 				        List<IpCfgTemplate> list = Lists.newArrayList();
 				        list.add(new IpCfgTemplate());
-				        new ExportExcel(msgProp,null, IpCfgTemplate.class, 2).setDataList(list).
+				        new ExportExcel(msgProp,null, IpCfgTemplate.class, 2).setDataList(msgProp,list).
 				    	write(request,response, fileName).dispose();
 					}else if(dict.getRegionType()==2){
 						List<StringCfgTemplate> list = Lists.newArrayList();
 				        list.add(new StringCfgTemplate());
-				        new ExportExcel(msgProp,null, StringCfgTemplate.class, 2).setDataList(list).
+				        new ExportExcel(msgProp,null, StringCfgTemplate.class, 2).setDataList(msgProp,list).
 				    	write(request,response, fileName).dispose();
 					}else if(dict.getRegionType()==3){
 						List<ComplexStringCfgTemplate> list = Lists.newArrayList();
 				        list.add(new ComplexStringCfgTemplate());
-				        new ExportExcel(msgProp,null, ComplexStringCfgTemplate.class, 2).setDataList(list).
+				        new ExportExcel(msgProp,null, ComplexStringCfgTemplate.class, 2).setDataList(msgProp,list).
 				    	write(request,response, fileName).dispose();
 					}
 				}
@@ -476,4 +477,43 @@ public class BaseController {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
 		model.addAttribute("serviceList", serviceList);
 	}
+	//初始化查询值判断
+	public void initLogSearchValue(BaseLogEntity entry,Map<String, Object> params){
+		
+		if (StringUtils.isNotBlank(entry.getSearchFoundStartTime())&&StringUtils.isNotBlank(entry.getSearchFoundEndTime())) {
+			params.put("searchFoundStartTime", entry.getSearchFoundStartTime());
+			params.put("searchFoundEndTime", entry.getSearchFoundEndTime());
+		}else{
+			//设置默认查询当前时间及前五分钟
+			String startTime = DateUtils.getDateTime();
+			Date dateEnd = new Date(new Date().getTime()-Constants.LOG_TIME_RANGE);
+			String endTime = DateUtils.formatDateTime(dateEnd);
+			params.put("searchFoundStartTime", startTime);
+			params.put("searchFoundEndTime",endTime );
+			entry.setSearchFoundStartTime(startTime);
+			entry.setSearchFoundEndTime(endTime);
+		}
+		
+		if (StringUtils.isNotBlank(entry.getProtocol())) {
+			params.put("searchProtocol", entry.getProtocol());
+		}
+		if (entry.getServiceType()!=null) {
+			params.put("searchServiceType", entry.getServiceType());
+		}
+		if (StringUtils.isNotBlank(entry.getServerIp())) {
+			params.put("searchServerIp", entry.getServerIp());
+		}
+		if (StringUtils.isNotBlank(entry.getClientIp())) {
+			params.put("searchClientIp", entry.getClientIp());
+		}
+		if (StringUtils.isNotBlank(entry.getCljIp())) {
+			params.put("searchCljIp", entry.getCljIp());
+		}
+		if (entry.getDirection()!=null) {
+			params.put("searchDirection", entry.getDirection());
+		}
+		if (entry.getEntranceId()!=null) {
+			params.put("searchEntranceId", entry.getEntranceId());
+		}
+	}
 }