日志action条件修改

src/main/java/com/nis/web/controller/BaseController.java

@@ -52,6 +52,7 @@ import com.nis.util.Constants;
 import com.nis.util.DateUtils;
 import com.nis.util.DictUtils;
 import com.nis.util.JsonMapper;
+import com.nis.util.StringUtil;
 import com.nis.util.excel.ExportExcel;
 import com.nis.web.service.ArchiveServcie;
 import com.nis.web.service.AreaService;
@@ -632,14 +633,15 @@ public class BaseController {
 		}
 	}
 	
-	public void setLogAction(BaseLogEntity log) {
+	public void setLogAction(BaseLogEntity log,List<FunctionServiceDict> serviceList) {
-		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
+		if(!StringUtil.isEmpty(serviceList)){
 			for (FunctionServiceDict dict : serviceList) {
 				if (dict.getServiceId().intValue() == log.getService()) {
 					log.setAction(dict.getAction());
 				}
 			}
 		}
+	}
 	
 	//初始化查询值判断
 	public void initLogSearchValue(BaseLogEntity entry,Map<String, Object> params){

src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java

@@ -17,11 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.DkBehaviorLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -50,6 +52,9 @@ public class DkBehaviorLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_DKBEHAVIOR_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -64,7 +69,7 @@ public class DkBehaviorLogController extends BaseController{
 				List<DkBehaviorLog> list = page.getList();
 				for (DkBehaviorLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询行为识别日志成功");

src/main/java/com/nis/web/controller/log/ntc/AppLogController.java

@@ -18,11 +18,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcAppLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -51,6 +53,9 @@ public class AppLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_APP_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -65,7 +70,7 @@ public class AppLogController extends BaseController{
 				List<NtcAppLog> list = page.getList();
 				for (NtcAppLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询App日志成功");

src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java

@@ -21,12 +21,14 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcIpLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -43,9 +45,13 @@ public class BgpLogController extends BaseController {
 			params.put("pageNo", page.getPageNo());
 			initLogSearchValue(log, params);
 
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = Constants.LOG_BASE_URL + Constants.NTC_BGP_LOG;
 			String recv = HttpClientUtil.getMsg(url, params, request);
 			
+			
 			logger.info("查询结果:" + recv);
 			if (StringUtils.isNotBlank(recv)) {
 				Gson gson = new GsonBuilder().create();
@@ -55,7 +61,7 @@ public class BgpLogController extends BaseController {
 					List<NtcIpLog> list = page.getList();
 					for (NtcIpLog l : list) {
 						l.setFunctionId(log.getFunctionId());
-						setLogAction(l);
+						setLogAction(l,serviceList);
 					}
 					model.addAttribute("page", page);
 				}

src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java

@@ -24,11 +24,13 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 import com.google.gson.reflect.TypeToken;
 import com.google.protobuf.DescriptorProtos.FieldDescriptorProto.Type;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcDdosLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.sun.jna.platform.win32.OaIdl.DATE;
@@ -58,6 +60,9 @@ public class DdosLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_DDOS_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -80,7 +85,7 @@ public class DdosLogController extends BaseController{
 				List<NtcDdosLog> list = page.getList();
 				for (NtcDdosLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询Ddos日志成功");

src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java

@@ -18,11 +18,13 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcDnsLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -42,6 +44,9 @@ public class DnsLogController extends BaseController {
 			}
 			initLogSearchValue(log, params);
 		
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = Constants.LOG_BASE_URL + Constants.NTC_DNS_LOG;
 			String recv = HttpClientUtil.getMsg(url, params, request);
 			logger.info("查询结果:" + recv);
@@ -55,7 +60,7 @@ public class DnsLogController extends BaseController {
 				List<NtcDnsLog> list = page.getList();
 				for (NtcDnsLog l : list) {
 					l.setFunctionId(log.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 			}

src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java

@@ -18,12 +18,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcFtpLog;
 import com.nis.domain.log.NtcOpenVpnLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -52,6 +54,9 @@ public class FtpLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_FTP_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -67,7 +72,7 @@ public class FtpLogController extends BaseController{
 				List<NtcFtpLog> list = page.getList();
 				for (NtcFtpLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询Ftp日志成功");

src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java

@@ -17,11 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcHttpLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -41,6 +43,9 @@ public class HttpLogController extends BaseController {
 			}
 			initLogSearchValue(log, params);
 		
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = Constants.LOG_BASE_URL + Constants.NTC_HTTP_LOG;
 			String recv = HttpClientUtil.getMsg(url, params, request);
 			logger.info("查询结果:" + recv);
@@ -54,7 +59,7 @@ public class HttpLogController extends BaseController {
 				List<NtcHttpLog> list = page.getList();
 				for (NtcHttpLog l : list) {
 					l.setFunctionId(log.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 			}

src/main/java/com/nis/web/controller/log/ntc/IpLogController.java

@@ -21,12 +21,14 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcIpLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -43,6 +45,9 @@ public class IpLogController extends BaseController {
 			params.put("pageNo", page.getPageNo());
 			initLogSearchValue(log, params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = Constants.LOG_BASE_URL + Constants.NTC_IP_LOG;
 			String recv = HttpClientUtil.getMsg(url, params, request);
 			
@@ -56,7 +61,7 @@ public class IpLogController extends BaseController {
 					List<NtcIpLog> list = page.getList();
 					for (NtcIpLog l : list) {
 						l.setFunctionId(log.getFunctionId());
-						setLogAction(l);
+						setLogAction(l,serviceList);
 					}
 					model.addAttribute("page", page);
 				}
@@ -77,6 +82,9 @@ public class IpLogController extends BaseController {
 		params.put("pageNo", page.getPageNo());
 		initLogSearchValue(log, params);
 		
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+		
 		String url = "http://10.0.6.121:8080/gwall/test/logTest";
 		try {
 			String recv = HttpClientUtil.getMsg(url, params, request);
@@ -90,7 +98,7 @@ public class IpLogController extends BaseController {
 				List<NtcIpLog> list = page.getList();
 				for (NtcIpLog l : list) {
 					l.setFunctionId(log.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 			}

src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java

@@ -18,12 +18,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcIpsecLog;
 import com.nis.domain.log.NtcIpsecLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -52,6 +54,9 @@ public class IpsecLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_IPSEC_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -65,7 +70,7 @@ public class IpsecLogController extends BaseController{
 				page.setList(list);
 				for (NtcIpsecLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询Ipsec日志成功");

src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java

@@ -17,11 +17,13 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcL2tpLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -40,6 +42,9 @@ public class L2tpLogController extends BaseController {
 		// 请求参数判断
 		initLogSearchValue(ntcL2tpLog, params);
 		
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(ntcL2tpLog.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+		
 		try {
 			// 请求接口
 			String url = Constants.LOG_BASE_URL + Constants.NTC_L2TP_LOG;
@@ -52,7 +57,7 @@ public class L2tpLogController extends BaseController {
 				List<NtcL2tpLog> list = fromPage.getList();
 				for (NtcL2tpLog log : list) {
 					log.setFunctionId(ntcL2tpLog.getFunctionId());
-					setLogAction(log);
+					setLogAction(log,serviceList);
 				}
 				model.addAttribute("page", page);
 			}

src/main/java/com/nis/web/controller/log/ntc/MailLogController.java

@@ -17,11 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcMailLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -38,6 +40,9 @@ public class MailLogController extends BaseController {
 			params.put("pageNo", page.getPageNo());
 			initLogSearchValue(log, params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = Constants.LOG_BASE_URL + Constants.NTC_MAIL_LOG;
 			String recv = HttpClientUtil.getMsg(url, params, request);
 			
@@ -50,7 +55,7 @@ public class MailLogController extends BaseController {
 					List<NtcMailLog> list = page.getList();
 					for (NtcMailLog l : list) {
 						l.setFunctionId(log.getFunctionId());
-						setLogAction(l);
+						setLogAction(l,serviceList);
 					}
 					model.addAttribute("page", page);
 				}

src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java

@@ -17,11 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmAvIpLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -51,6 +53,9 @@ public class MmAvIpLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_MMAVIP_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -65,7 +70,7 @@ public class MmAvIpLogController extends BaseController{
 				List<MmAvIpLog> list = page.getList();
 				for (MmAvIpLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询音视频IP日志成功");

src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java

@@ -17,11 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmAvUrlLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -51,6 +53,9 @@ public class MmAvUrlLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_MMAVURL_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -65,7 +70,7 @@ public class MmAvUrlLogController extends BaseController{
 				List<MmAvUrlLog> list = page.getList();
 				for (MmAvUrlLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询音视频url日志成功");

src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java

@@ -15,11 +15,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmPicIpLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -38,6 +40,9 @@ public class MmPicIpLogController extends BaseController {
 		// 请求参数判断
 		initLogSearchValue(mmPicIpLog, params);
 		
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(mmPicIpLog.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+		
 		try {
 			// 请求接口
 			String url = Constants.LOG_BASE_URL + Constants.NTC_MMPICIP_LOG;
@@ -50,7 +55,7 @@ public class MmPicIpLogController extends BaseController {
 				List<MmPicIpLog> list = fromPage.getList();
 				for (MmPicIpLog log : list) {
 					log.setFunctionId(mmPicIpLog.getFunctionId());
-					setLogAction(log);
+					setLogAction(log,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("音视频图片IP日志查询成功！");

src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java

@@ -15,11 +15,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmPicUrlLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -38,6 +40,9 @@ public class MmPicUrlController extends BaseController{
 		// 请求参数判断
 		initLogSearchValue(mmPicUrlLog, params);
 		
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(mmPicUrlLog.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+		
 		try {
 			// 请求接口
 			String url = Constants.LOG_BASE_URL + Constants.NTC_MMPICURL_LOG;
@@ -50,7 +55,7 @@ public class MmPicUrlController extends BaseController{
 				List<MmPicUrlLog> list = fromPage.getList();
 				for (MmPicUrlLog log : list) {
 					log.setFunctionId(mmPicUrlLog.getFunctionId());
-					setLogAction(log);
+					setLogAction(log,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("音视频图片URL日志查询成功！");

src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java

@@ -15,11 +15,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmAvIpLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -38,6 +40,9 @@ public class MmPornAvSampleController extends BaseController {
 			//查询值判断
 			initLogSearchValue(entry, params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL + Constants.NTC_MMPORNAUDIOSAMPLE_LOG;
 			String jsonString = HttpClientUtil.getMsg(url, params, request);
@@ -52,7 +57,7 @@ public class MmPornAvSampleController extends BaseController {
 				List<MmAvIpLog> list = page.getList();
 				for (MmAvIpLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询音频色情样例日志成功");
@@ -76,6 +81,9 @@ public class MmPornAvSampleController extends BaseController {
 			//查询值判断
 			initLogSearchValue(entry, params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL + Constants.NTC_MMPORNVIDEOSAMPLE_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -90,7 +98,7 @@ public class MmPornAvSampleController extends BaseController {
 				List<MmAvIpLog> list = page.getList();
 				for (MmAvIpLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询视频色情样例日志成功");

src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java

@@ -15,11 +15,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmSampleAudioLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -38,6 +40,9 @@ public class MmSampleAudioController extends BaseController{
 		// 请求参数判断
 		initLogSearchValue(sampleAudioLog, params);
 		
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(sampleAudioLog.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+		
 		try {
 			// 请求接口
 			String url = Constants.LOG_BASE_URL + Constants.NTC_MMSAMPLEAUDIO_LOG;
@@ -50,7 +55,7 @@ public class MmSampleAudioController extends BaseController{
 				List<MmSampleAudioLog> list = fromPage.getList();
 				for (MmSampleAudioLog log : list) {
 					log.setFunctionId(sampleAudioLog.getFunctionId());
-					setLogAction(log);
+					setLogAction(log,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("音频样例日志查询成功！");

src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java

@@ -15,11 +15,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmSamplePicLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -38,6 +40,9 @@ public class MmSamplePicController extends BaseController{
 		// 请求参数判断
 		initLogSearchValue(samplePicLog, params);
 		
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(samplePicLog.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+		
 		try {
 			// 请求接口
 			String url = Constants.LOG_BASE_URL + Constants.NTC_MMSAMPLEPIC_LOG;
@@ -50,7 +55,7 @@ public class MmSamplePicController extends BaseController{
 				List<MmSamplePicLog> list = fromPage.getList();
 				for (MmSamplePicLog log : list) {
 					log.setFunctionId(samplePicLog.getFunctionId());
-					setLogAction(log);
+					setLogAction(log,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("图片样例日志查询成功！");

src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java

@@ -15,11 +15,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmSampleVideoLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -38,6 +40,9 @@ public class MmSampleVideoController extends BaseController{
 		// 请求参数判断
 		initLogSearchValue(sampleVideoLog, params);
 		
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(sampleVideoLog.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+		
 		try {
 			// 请求接口
 			String url = Constants.LOG_BASE_URL + Constants.NTC_MMSAMPLEVIDEO_LOG;
@@ -50,7 +55,7 @@ public class MmSampleVideoController extends BaseController{
 				List<MmSampleVideoLog> list = fromPage.getList();
 				for (MmSampleVideoLog log : list) {
 					log.setFunctionId(sampleVideoLog.getFunctionId());
-					setLogAction(log);
+					setLogAction(log,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("视频样例日志查询成功！");

src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java

@@ -19,11 +19,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmVoipLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -42,6 +44,9 @@ public class MmSampleVoipLogController extends BaseController {
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = Constants.LOG_BASE_URL+Constants.NTC_MMSAMPLE_VOIP_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
 			//String path = request.getClass().getClassLoader().getResource("").getPath();
@@ -57,7 +62,7 @@ public class MmSampleVoipLogController extends BaseController {
 				List<MmVoipLog> list = page.getList();
 				for (MmVoipLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询Voip样例日志成功");

src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java

@@ -17,11 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmVoipLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -50,6 +52,9 @@ public class MmVoipAccountLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_MMVOIP_ACCOUNT_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -64,7 +69,7 @@ public class MmVoipAccountLogController extends BaseController{
 				List<MmVoipLog> list = page.getList();
 				for (MmVoipLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询mmVoipAccount日志成功");

src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java

@@ -17,11 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmVoipLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -50,6 +52,9 @@ public class MmVoipIpLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_MMVOIP_IP_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -64,7 +69,7 @@ public class MmVoipIpLogController extends BaseController{
 				List<MmVoipLog> list = page.getList();
 				for (MmVoipLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询VoipIp日志成功");

src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java

@@ -17,11 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmVoipLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -50,6 +52,9 @@ public class MmVoipLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_MMVOIP_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -64,7 +69,7 @@ public class MmVoipLogController extends BaseController{
 				List<MmVoipLog> list = page.getList();
 				for (MmVoipLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询Voip日志成功");

src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java

@@ -18,12 +18,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcOpenVpnLog;
 import com.nis.domain.log.NtcOpenVpnLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -52,6 +54,9 @@ public class OpenVpnLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_OPENVPN_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -66,7 +71,7 @@ public class OpenVpnLogController extends BaseController{
 				List<NtcOpenVpnLog> list = page.getList();
 				for (NtcOpenVpnLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询OpenVpn日志成功");

src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java

@@ -17,11 +17,13 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcPptpLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -40,6 +42,9 @@ public class PptpLogController extends BaseController {
 		// 请求参数判断
 		initLogSearchValue(ntcPptpLog, params);
 		
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(ntcPptpLog.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+		
 		try {
 			// 请求接口
 			String url = Constants.LOG_BASE_URL + Constants.NTC_PPTP_LOG;
@@ -52,7 +57,7 @@ public class PptpLogController extends BaseController {
 				page.setList(list);
 				for (NtcPptpLog log : list) {
 					log.setFunctionId(ntcPptpLog.getFunctionId());
-					setLogAction(log);
+					setLogAction(log,serviceList);
 				}
 				model.addAttribute("page", page);
 			}

src/main/java/com/nis/web/controller/log/ntc/SshLogController.java

@@ -18,12 +18,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcSshLog;
 import com.nis.domain.log.NtcSshLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -52,6 +54,9 @@ public class SshLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_SSH_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -66,7 +71,7 @@ public class SshLogController extends BaseController{
 				List<NtcSshLog> list = page.getList();
 				for (NtcSshLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询Ssh日志成功");

src/main/java/com/nis/web/controller/log/ntc/SslLogController.java

@@ -17,11 +17,13 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcSslLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.StringUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
@@ -43,6 +45,10 @@ public class SslLogController extends BaseController {
 		if(StringUtils.isNotBlank(ntcSslLog.getSni())) {
 			params.put("SearchSni", ntcSslLog.getSni());
 		}	
+		
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(ntcSslLog.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+		
 		try {
 			// 请求接口
 			String url = Constants.LOG_BASE_URL + Constants.NTC_SSL_LOG;
@@ -55,7 +61,7 @@ public class SslLogController extends BaseController {
 				page.setList(list);
 				for (NtcSslLog log : list) {
 					log.setFunctionId(ntcSslLog.getFunctionId());
-					setLogAction(log);
+					setLogAction(log,serviceList);
 				}
 				model.addAttribute("page", page);
 			}

src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java

@@ -17,10 +17,12 @@ import org.springframework.web.servlet.support.RequestContext;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.PxyHttpLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -41,6 +43,9 @@ public class PxyHttpLogController extends BaseController {
 		
 			initLogSearchValue(log, params);
 		
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = Constants.LOG_BASE_URL + Constants.PXY_HTTP_LOG;
 			String recv = HttpClientUtil.getMsg(url, params, request);
 			logger.info("查询结果:" + recv);
@@ -53,7 +58,7 @@ public class PxyHttpLogController extends BaseController {
 				List<PxyHttpLog> list = page.getList();
 				for (PxyHttpLog l : list) {
 					l.setFunctionId(log.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 			}

src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp

@@ -50,13 +50,25 @@ $(document).ready(function(){
 							
 							<!-- 搜索内容与操作按钮栏 -->
 							<div class="col-md-12">
-								<%-- <div class="pull-left">
+								<div class="pull-left">
-									<form:select path="action" class="selectpicker select2 input-small">
+									<select path="action" class="selectpicker select2 input-small">
-										<form:option value=""><spring:message code="action"/></form:option>
+									<option value=""><spring:message code="action"/></option>
-										<form:option value="16"><spring:message code="action_reject"/></form:option>
+									<c:forEach items="${serviceList}" var="service"
-										<form:option value="1"><spring:message code="action_monit"/></form:option>
+											varStatus="satus">
-									</form:select>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-								</div> --%>
+											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32)}"> --%>
+												<option value="${dict.itemCode}" 
+													<c:if test="${log.action eq dict.itemCode}">
+														selected
+													</c:if>
+													>
+													<spring:message code="${dict.itemValue}"/>
+												</option>
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+								</select>
+								</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
@@ -163,8 +175,8 @@ $(document).ready(function(){
 									<th><spring:message code='entrance'/></th>
 									
 									<th><spring:message code='behavior_protocol'/></th>
-									<%-- <th><spring:message code='os_type'/></th>
+									<th><spring:message code='os_type'/></th>
-									<th><spring:message code='browser_type'/></th> --%>
+									<th><spring:message code='browser_type'/></th>
 									<th><spring:message code='behaviour_type'/></th>
 									<th><spring:message code='social_app'/></th>
 									<th><spring:message code='c2s_pkt_num'/></th>
@@ -219,7 +231,7 @@ $(document).ready(function(){
 											</c:if>
 										</c:forEach>
 									</td>
-									<%-- <td>
+									<td>
 										<c:forEach items="${fns:getCodeList('osCode')}" var="dict">
 											<c:if test="${dict.code eq log.labelOsId}">
 												<spring:message code="${dict.item}"/>
@@ -232,7 +244,7 @@ $(document).ready(function(){
 												<spring:message code="${dict.item}"/>
 											</c:if>
 										</c:forEach>
-									</td> --%>
+									</td>
 									<td>
 										<c:forEach items="${fns:getCodeList('behaviorCode')}" var="dict">
 											<c:if test="${dict.code eq log.labelBehavId}">

src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp

@@ -48,14 +48,23 @@
 						<!-- 搜索内容与操作按钮栏 -->
 						<div class="col-md-12">
 							<div class="pull-left">
-								<form:select path="action" class="selectpicker select2 input-small">
+								<select path="action" class="selectpicker select2 input-small">
-									<form:option value=""><spring:message code="action"/></form:option>
+									<option value=""><spring:message code="action"/></option>
+									<c:forEach items="${serviceList}" var="service"
+											varStatus="satus">
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-											<c:if test="${(dict.itemValue eq 'action_monit') or (dict.itemValue eq 'action_reject')}">
+											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32)}"> --%>
-												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+												<option value="${dict.itemCode}" 
+													<c:if test="${log.action eq dict.itemCode}">
+														selected
+													</c:if>
+													>
+													<spring:message code="${dict.itemValue}"/>
+												</option>
 											</c:if>
 										</c:forEach>
-								</form:select>
+									</c:forEach>
+								</select>
 							</div>
 							<div class="pull-left">
 								<div class="input-group">