(1)实时报表动作替换为serviceId

(2)配置日志总量统计查询条件action替换为serviceId (3)配置列表日志总量列加入serviceId (4)配置日志总量跳转到日志列表action替换为serviceId (5)配置日志相关js提取到pzLog。js中
2018-09-30 10:54:30 +08:00
parent e69191219a
commit 025182e551
51 changed files with 235 additions and 240 deletions
--- a/src/main/java/com/nis/domain/log/SearchReport.java
+++ b/src/main/java/com/nis/domain/log/SearchReport.java
@@ -31,6 +31,7 @@ public class SearchReport extends BaseEntity<SearchReport>{
 	private Integer functionId;
 	private String cfgName;
 	private Integer action;
+	private Integer serviceId;
 	private String services;//service日志总量统计使用
 	private Integer reportType;//小时报，日报，月报
 	//标签，性质，来文函号，境内源Ip,各国目的IP，运营商局点
@@ -52,6 +53,12 @@ public class SearchReport extends BaseEntity<SearchReport>{
 	private String reportTime;
 	
 	
+	public Integer getServiceId() {
+		return serviceId;
+	}
+	public void setServiceId(Integer serviceId) {
+		this.serviceId = serviceId;
+	}
 	public String getServices() {
 		return services;
 	}
--- a/src/main/java/com/nis/web/controller/configuration/LogSearchController.java
+++ b/src/main/java/com/nis/web/controller/configuration/LogSearchController.java
@@ -24,9 +24,9 @@ public class LogSearchController extends BaseController{
 		 */
 		// 获取相应日志检索菜单URL
 		String logUrl = menuService.getLogUrl(entity.getFunctionId());
-		Integer serviceId = menuService.getServiceId(entity.getFunctionId(),entity.getAction());
+//		Integer serviceId = menuService.getServiceId(entity.getFunctionId(),entity.getAction());
 		
-		attr.addAttribute("service", serviceId);
+		attr.addAttribute("service", entity.getService().intValue());
 		attr.addAttribute("cfgId", entity.getCfgId());
 		attr.addAttribute("functionId", entity.getFunctionId());
 		attr.addAttribute("date", entity.getDate());
--- a/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java
@@ -35,12 +35,8 @@ public class NtcDestIpReportController extends BaseController {
 		
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
 		
-		if(bean.getAction()!=null){
-			for(FunctionServiceDict service:serviceList){
-				if(service.getAction().intValue()==bean.getAction().intValue()){
-					bean.setSearchService(service.getServiceId().toString());
-				}
-			}
+		if(bean.getServiceId()!=null){
+			bean.setServices(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){
--- a/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java
@@ -10,6 +10,7 @@ import java.util.Map.Entry;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -33,12 +34,8 @@ public class NtcEntranceReportController extends BaseController {
 	@RequestMapping("/ajaxNtcIspReport")
 	public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
-		if(bean.getAction()!=null){
-			for(FunctionServiceDict service:serviceList){
-				if(service.getAction().intValue()==bean.getAction().intValue()){
-					bean.setSearchService(service.getServiceId().toString());
-				}
-			}
+		if(bean.getServiceId()!=null){
+			bean.setServices(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){
--- a/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java
@@ -9,6 +9,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -21,7 +22,6 @@ import com.nis.domain.report.NtcLwhhReport;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
-import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;

 import net.sf.json.JSONArray;
@@ -36,12 +36,8 @@ public class NtcLwhhReportController extends BaseController {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
 		List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
 		model.addAttribute("requestInfos", requestInfos);
-		if(bean.getAction()!=null){
-			for(FunctionServiceDict service:serviceList){
-				if(service.getAction().intValue()==bean.getAction().intValue()){
-					bean.setSearchService(service.getServiceId().toString());
-				}
-			}
+		if(bean.getServiceId()!=null){
+			bean.setServices(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){
--- a/src/main/java/com/nis/web/controller/report/NtcPzReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcPzReportController.java
@@ -53,7 +53,7 @@ import net.sf.json.JsonConfig;
 public class NtcPzReportController extends BaseController{
 	@RequestMapping(value="ajaxGetLogTotal",method=RequestMethod.POST)
 	@ResponseBody
-	public List<Map<String, Object>> ajaxGetLogTotal(Model model,Long endTime,String actions,Integer functionId,String compileIds){
+	public List<Map<String, Object>> ajaxGetLogTotal(Model model,Long endTime,String actions,String serviceIds,Integer functionId,String compileIds){
 		List<Map<String, Object>> dataList=new ArrayList<>();
 		SimpleDateFormat sdf=new SimpleDateFormat(Constants.SEARCH_DATEFORMAT);
 		Date endDate=null;
@@ -95,22 +95,25 @@ public class NtcPzReportController extends BaseController{
 			logger.info("log search end time:"+sdf.format(endDate));
 			logger.info("log search start time:"+sdf.format(startDate));
 		}
-		
-		String serviceIdsStr="";
-		StringBuffer serviceIds=new StringBuffer();
-		List<FunctionServiceDict> serviceList=DictUtils.getFunctionServiceDictList(functionId.intValue()); 
-		for(String action:actions.split(",")) {
-			for(FunctionServiceDict service:serviceList){
-				if(service.getAction().intValue()==Integer.parseInt(action)){
-					serviceIds.append(service.getServiceId().intValue());
-					serviceIds.append(",");
-				}
-			}
-		}
-		if(serviceIds.toString().endsWith(",")) {
-			serviceIdsStr=serviceIds.toString().substring(0,serviceIds.toString().lastIndexOf(","));
-		}
-		String json=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, serviceIdsStr, startDate==null?null:sdf.format(startDate), endDate==null?null:sdf.format(endDate));
+//		String serviceIdsStr="";
+//		if(StringUtils.isBlank(serviceIds)) {
+//			StringBuffer _serviceIds=new StringBuffer();
+//			List<FunctionServiceDict> serviceList=DictUtils.getFunctionServiceDictList(functionId.intValue()); 
+//			for(String action:actions.split(",")) {
+//				for(FunctionServiceDict service:serviceList){
+//					if(service.getAction().intValue()==Integer.parseInt(action)){
+//						_serviceIds.append(service.getServiceId().intValue());
+//						_serviceIds.append(",");
+//					}
+//				}
+//			}
+//			if(_serviceIds.toString().endsWith(",")) {
+//				serviceIdsStr=_serviceIds.toString().substring(0,_serviceIds.toString().lastIndexOf(","));
+//			}
+//		}else {
+//			serviceIdsStr=serviceIds;
+//		}
+		String json=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, serviceIds, startDate==null?null:sdf.format(startDate), endDate==null?null:sdf.format(endDate));
 		List<NtcPzReport> list=getList(json);
 		String[] idArr=compileIds.split(",");
 		if(list!=null&&(list.size()>0)){
@@ -136,12 +139,8 @@ public class NtcPzReportController extends BaseController{
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
 		List<ServiceDictInfo> labels=serviceDictInfoService.findAllLableDict();
 		model.addAttribute("labels", labels);
-		if(bean.getAction()!=null){
-			for(FunctionServiceDict service:serviceList){
-				if(service.getAction().intValue()==bean.getAction().intValue()){
-					bean.setSearchService(service.getServiceId().toString());
-				}
-			}
+		if(bean.getServiceId()!=null){
+			bean.setSearchService(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){
--- a/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java
@@ -9,6 +9,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -33,12 +34,8 @@ public class NtcSrcipDomesticReportController extends BaseController {
 	@RequestMapping("/ajaxNtcSrcipDomesticReport")
 	public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
-		if(bean.getAction()!=null){
-			for(FunctionServiceDict service:serviceList){
-				if(service.getAction().intValue()==bean.getAction().intValue()){
-					bean.setSearchService(service.getServiceId().toString());
-				}
-			}
+		if(bean.getServiceId()!=null){
+			bean.setServices(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){
--- a/src/main/java/com/nis/web/controller/report/NtcTagReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcTagReportController.java
@@ -9,6 +9,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -35,12 +36,8 @@ public class NtcTagReportController extends BaseController {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
 		List<ServiceDictInfo> labels=serviceDictInfoService.findAllLableDict();
 		model.addAttribute("labels", labels);
-		if(bean.getAction()!=null){
-			for(FunctionServiceDict service:serviceList){
-				if(service.getAction().intValue()==bean.getAction().intValue()){
-					bean.setSearchService(service.getServiceId().toString());
-				}
-			}
+		if(bean.getServiceId()!=null){
+			bean.setServices(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){
--- a/src/main/java/com/nis/web/controller/report/NtcXzReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcXzReportController.java
@@ -9,6 +9,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -36,12 +37,8 @@ public class NtcXzReportController extends BaseController {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
 		List<ServiceDictInfo> xzs=serviceDictInfoService.findAllXzDict();
 		model.addAttribute("xzs", xzs);
-		if(bean.getAction()!=null){
-			for(FunctionServiceDict service:serviceList){
-				if(service.getAction().intValue()==bean.getAction().intValue()){
-					bean.setSearchService(service.getServiceId().toString());
-				}
-			}
+		if(bean.getServiceId()!=null){
+			bean.setServices(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){
--- a/src/main/webapp/WEB-INF/include/header.jsp
+++ b/src/main/webapp/WEB-INF/include/header.jsp
@@ -96,6 +96,7 @@
 <script src="${pageContext.request.contextPath}/static/global/scripts/jquery.tagsinput.js" type="text/javascript"></script>
 <script src="${pageContext.request.contextPath}/static/global/scripts/app.js" type="text/javascript"></script>
 <script src="${pageContext.request.contextPath}/static/global/scripts/ipRegion.js" type="text/javascript"></script>
+<script src="${pageContext.request.contextPath}/static/global/scripts/pzLog.js" type="text/javascript"></script>
 <!-- 文件导入 -->
 <script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-fileupload/js/bootstrap-fileupload.js" type="text/javascript"></script>
 <script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-fileupload/js/jquery.cookie.min.js" type="text/javascript"></script>
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
@@ -420,7 +420,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
@@ -420,7 +420,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
@@ -482,7 +482,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
@@ -428,7 +428,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
@@ -418,7 +418,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp
@@ -365,7 +365,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
@@ -468,7 +468,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
@@ -427,7 +427,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
@@ -326,7 +326,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-<%-- 									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+<%-- 									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 --%>								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
@@ -437,7 +437,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp
@@ -383,7 +383,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
@@ -499,7 +499,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
@@ -416,7 +416,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
@@ -404,7 +404,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
@@ -500,7 +500,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
@@ -418,7 +418,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">
--- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
@@ -415,7 +415,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
@@ -466,7 +466,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
@@ -471,7 +471,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
@@ -492,7 +492,7 @@
 									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'cancel_approved'}"><span data-audit="cancel" class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:if>
 							            </c:forEach>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
@@ -445,7 +445,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
@@ -421,7 +421,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
@@ -468,7 +468,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
@@ -461,7 +461,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
@@ -448,7 +448,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
@@ -439,7 +439,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
@@ -143,7 +143,7 @@
 	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
 													<form:option value=""><spring:message code="select"/></form:option>
 													<c:forEach items="${serviceList}" var="service">
-														<form:option value="${service.action }"><spring:message code="${service.serviceName}"/> <spring:message code="action_${service.actionCode }"/></form:option>
+														<form:option value="${service.action }"><spring:message code="${service.serviceName}"/></form:option>
 													</c:forEach>
 											 </form:select>
 											 <form:select path="isValid" class="selectpicker select2 input-small" >
@@ -441,7 +441,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
@@ -445,7 +445,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
@@ -446,7 +446,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
@@ -446,7 +446,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
@@ -712,7 +712,7 @@
 										</c:choose>
 									</td>
 									<c:if test="${action ne 128}">
-										<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+										<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									</c:if>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
@@ -343,7 +343,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
@@ -346,7 +346,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
@@ -450,7 +450,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
@@ -602,7 +602,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
@@ -443,7 +443,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
@@ -444,7 +444,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
@@ -443,7 +443,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
--- a/src/main/webapp/WEB-INF/views/report/list.jsp
+++ b/src/main/webapp/WEB-INF/views/report/list.jsp
@@ -92,8 +92,8 @@ $(document).ready(function() {
 	});
 	function getXlsxFileName() {
 		var cfgName = $("[name=cfgName2]").val() + "_";
-		if ("${bean.action}") {
-			var action = $("[name=action]").find('[value=' + "${bean.action}" + ']').text() + "_";
+		if ("${bean.serviceId}") {
+			var action = $("[name=serviceId]").find('[value=' + "${bean.serviceId}" + ']').text() + "_";
 		} else {
 			var action = "";
 		}
@@ -142,9 +142,16 @@ var  reportDate=0;
 var ajaxServiceLogTotal=function(){
 	var services=[];
 	var objs=[];
+	var serviceIndex=0;
 	$(".service").each(function(){
+		if(serviceIndex%2==0){
+			$(this).addClass("btn-primary");
+		}else{
+			$(this).addClass("btn-default");
+		}
 		objs.push($(this));
 		services.push($(this).data("service"));
+		serviceIndex++;
 	});
 	var timeout=$.validator.messages.timeout;
 	var failed=$.validator.messages.failed;
@@ -195,7 +202,7 @@ var ajaxReport=function(url,target){
 		cache:false,
 		url:'${ctx}'+url,// /report/ajaxNtcTagReport
 		data:{
-			"action":$('[name="action"]').val(),
+			"serviceId":$('[name="serviceId"]').val(),
 			"reportType":$('[name="reportType"]').val(),
 			"reportTime":$('[name="reportTime"]').val(),
 			"functionId":$('[name="functionId"]').val()
@@ -355,15 +362,13 @@ function customColumnClick(){
 <body>
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
+		<%-- <c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action"> --%>
 			<c:forEach items="${serviceList}" var="service" varStatus="status">
-				<c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}">
+				<%-- <c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}"> --%>
 				    <c:if test="${service.serviceId ne 5}">
 				      <c:if test="${(service.action ne 128) && (service.action ne 32) && (service.action ne 96)}" >
-					    <div data-service="${service.serviceId}" class="service btn 
-						<c:if test="${status.index%2==0}">btn-primary</c:if>
-						<c:if test="${status.index%2!=0}">btn-default</c:if>">
-							<spring:message code="${action.itemValue}"/>
+					    <div data-service="${service.serviceId}" class="service btn">
+							<spring:message code="${service.serviceName}"/>
 							<spring:message code="log_total"/>
 							<span>0</span>
 						</div>
@@ -371,18 +376,16 @@ function customColumnClick(){
 				    </c:if>
 					 <c:if test="${service.serviceId eq 5}">
 					   <c:if test="${(service.action ne 128) && (service.action ne 96)}" >
-					    <div data-service="${service.serviceId}" class="service btn 
-						<c:if test="${status.index%2==0}">btn-primary</c:if>
-						<c:if test="${status.index%2!=0}">btn-default</c:if>">
-							<spring:message code="${action.itemValue}"/>
+					    <div data-service="${service.serviceId}" class="service btn">
+							<spring:message code="${service.serviceName}"/>
 							<spring:message code="log_total"/>
 							<span>0</span>
 						 </div>
 						</c:if>
 				    </c:if>
-				</c:if>
+				<%-- </c:if> --%>
 			</c:forEach>
-		</c:forEach>
+		<%-- </c:forEach> --%>
 	</div>
 	<h3 class="page-title">
 		<spring:message code="${bean.cfgName}"/>
@@ -398,7 +401,7 @@ function customColumnClick(){
 						<input name="cfgName" type="hidden" value="${bean.cfgName}"/>
 						
 						<input name="cfgName2" type="hidden" value="<spring:message code="${bean.cfgName}"/>"/>
-						<input name="action2" type="hidden" value="<spring:message code="${bean.action}"/>"/>
+						<input name="serviceId2" type="hidden" value="<spring:message code="${bean.serviceId}"/>"/>
 						
 						<input id="reportBusinessType" name="reportBusinessType" type="hidden" value="${bean.reportBusinessType}"/>
 						<!-- 筛选按钮展开状态-->
@@ -406,24 +409,24 @@ function customColumnClick(){
 						<!-- 搜索内容与操作按钮栏 -->
 						<div class="col-md-12">
 							<div class="pull-left">
-								<form:select path="action" class="selectpicker select2 input-small">
+								<form:select path="serviceId" class="selectpicker select2 input-small">
 									<form:option value=""><spring:message code="action"/></form:option>
-									<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action" >
+									<%-- <c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action" > --%>
 										<c:forEach items="${serviceList}" var="service" >
-										<c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}">
+										<%-- <c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}"> --%>
 										    <c:if test="${service.serviceId ne 5}">
 				    						 <c:if test="${(service.action ne 128) && (service.action ne 32)  && (service.action ne 96) }" >
-											  <form:option value="${action.itemCode}" ><spring:message code="${action.itemValue}"/></form:option>
+											  <form:option value="${service.serviceId}" ><spring:message code="${service.serviceName}"/></form:option>
 											</c:if>
 										  </c:if>
 										   <c:if test="${service.serviceId  eq 5}">
 										      <c:if test="${(service.action ne 128) && (service.action ne 96) }" >
-											  <form:option value="${action.itemCode}" ><spring:message code="${action.itemValue}"/></form:option>
+											  <form:option value="${service.serviceId}" ><spring:message code="${service.serviceName}"/></form:option>
 										     </c:if>
 										   </c:if>
-										</c:if>
+										<%-- </c:if> --%>
 										</c:forEach>
-									</c:forEach>
+									<%-- </c:forEach> --%>
 								</form:select>
 							</div>
 							<div class="pull-left">
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -345,8 +345,6 @@ $(function(){
   $("input[name$='exprType']:checked").each(function(){
 	   //setDefaultMatchMethod(this);
   });
-   //获取配置日志总数
-   getTotalLog();
   $(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 		$("#protocolId").val($(this).attr("protocolId"));
@@ -1346,120 +1344,6 @@ var viewAreaInfo=function(path,areaEffectiveIds,compileId){
  
  });
 }
-var getTotalLog=function(){
-	/*
-		td需要配置属性有，audit,functionId，compileId，action
-	    */
-	   var data={};
-	   //data.date=new Date();
-	   data.compileIds=[];
-	   data.actions=[];
-	   data.objs=[];
-	   $("td[compileId]").each(function(){
-		   	var audit=$(this).attr("audit");
-		   	var compileId=$(this).attr("compileId");
-		   	var action=$(this).attr("action");
-		   	var functionId=$(this).attr("functionId");
-		   	if(audit&&compileId&&action&&functionId){
-		   		if(audit == 1){
-					var has=false;
-					for(var i=0;i<data.actions.length;i++){
-						if(data.actions[i]==$(this).attr("action")){
-							has=true;
-						}
-					}
-					if(!has){
-						data.actions.push($(this).attr("action"));
-					}
-					//$(this).attr("date",data.date.getTime());
-					data.compileIds.push($(this).attr("compileId"));
-					data.functionId=$(this).attr("functionId");
-					data.objs.push($(this));
-			   	}else{
-			   		$(this).html("0");
-			   	}
-		   	}else{
-		   		$(this).html("0");
-		   	}
-		});
-	   if(data.compileIds.length>0){
-		   GetLogTotal(data);
-	   }
-	   
-}
-var GetLogTotal=function(_data){
-	var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.indexOf("/nis")+4);
-	var timeStamp;
-	if(_data.date){
-		timeStamp=_data.date.valueOf(); 
-	}/*else{
-		timeStamp=(new Date()).valueOf(); 
-	}*/
-	var totalTrs=$(_data.objs);
-	var timeout=$.validator.messages.timeout;
-	var failed=$.validator.messages.failed;
-	var request=$.ajax({
-		type:'post',
-		timeout:10000,//超时时间设置，查询接口时间过长超时
-		url:pathName+'/report/ajaxGetLogTotal',
-		data:{"endTime":timeStamp,"actions":_data.actions.join(','),"functionId":_data.functionId,"compileIds":_data.compileIds.join(',')},
-		dataType:'json',
-		async:true,
-		success:function(data,textStatus){//处理返回结果
-			if(textStatus=="success"){
-				totalTrs.each(function(){
-					var hasLog=false;
-					for(var i=0;i<data.length;i++){
-						if($(this).attr("compileId")==data[i].compileId){
-							$(this).attr("id",i+"logTotal");
-							$(this).html("<a href='javascript:;' onclick='toLogSearch("+i+")'>"+data[i].sum+"<a>");
-							hasLog=true;
-						}
-					}
-					if(!hasLog){
-						$(this).html("0");
-					}
-				})
-			}
-		},
-		complete:function(XMLHttpRequest,status){//超时设置
-			if(status=="timeout"){
-				totalTrs.each(function(){
-					$(this).html(timeout);
-				})
-			}else if(status !="success"){
-				totalTrs.each(function(){
-					$(this).html(failed);
-				})
-			}
-		}
-	});
-}
-
-var toLogSearch = function(index){
-	// 保存配置界面URL
-	$("#searchForm").each(function(){
-		var cfgUrl = $(this).attr("action");
-		sessionStorage.removeItem('cfgUrl');
-		sessionStorage.setItem('cfgUrl',cfgUrl);
-	});
-	
-	var td = document.getElementById(index+"logTotal");
-	$("td[compileId]").each(function(){
-		if($(this).attr("id") == index+"logTotal"){
-			// 获取检索日志参数
-			var action=$(this).attr("action");
-			var compileId=$(this).attr("compileId");
-			var functionId=$(this).attr("functionId");
-			var date=$(this).attr("date");
-			var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.indexOf("/nis")+4);
-			
-			window.location.href = pathName+"/toLogSearch?action="+action+"&functionId="+functionId+"&cfgId="+compileId+"&date="+date+"&isLogTotalSearch=yes";			
-			
-		}
-	});
-	
-}

 //删除区域IP
 function delAreaIp(obj){ 
--- a/src/main/webapp/static/global/scripts/pzLog.js
+++ b/src/main/webapp/static/global/scripts/pzLog.js
@@ -0,0 +1,121 @@
+/**
+ * 处理配置日志总量以及跳转日志界面
+ */
+$(function(){
+	 //获取配置日志总数
+	 getTotalLog();
+});
+var getTotalLog=function(){
+	/*
+		td需要配置属性有，audit,functionId，compileId，action
+	    */
+	   var data={};
+	   //data.date=new Date();
+	   data.compileIds=[];
+	   data.serviceIds=[];
+	   data.objs=[];
+	   $("td[compileId]").each(function(){
+		   	var audit=$(this).attr("audit");
+		   	var compileId=$(this).attr("compileId");
+		   	var serviceId=$(this).attr("serviceId");
+		   	var functionId=$(this).attr("functionId");
+		   	if(audit&&compileId&&functionId&&serviceId){
+		   		if(audit == 1){
+					var has=false;
+					for(var i=0;i<data.serviceIds.length;i++){
+						if(data.serviceIds[i]==$(this).attr("serviceId")){
+							has=true;
+						}
+					}
+					if(!has){
+						data.serviceIds.push($(this).attr("serviceId"));
+					}
+					//$(this).attr("date",data.date.getTime());
+					data.compileIds.push($(this).attr("compileId"));
+					data.functionId=$(this).attr("functionId");
+					data.objs.push($(this));
+			   	}else{
+			   		$(this).html("0");
+			   	}
+		   	}else{
+		   		$(this).html("0");
+		   	}
+		});
+	   if(data.compileIds.length>0){
+		   GetLogTotal(data);
+	   }
+	   
+}
+var GetLogTotal=function(_data){
+	var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.indexOf("/nis")+4);
+	var timeStamp;
+	if(_data.date){
+		timeStamp=_data.date.valueOf(); 
+	}/*else{
+		timeStamp=(new Date()).valueOf(); 
+	}*/
+	var totalTrs=$(_data.objs);
+	var timeout=$.validator.messages.timeout;
+	var failed=$.validator.messages.failed;
+	var request=$.ajax({
+		type:'post',
+		timeout:10000,//超时时间设置，查询接口时间过长超时
+		url:pathName+'/report/ajaxGetLogTotal',
+		data:{"endTime":timeStamp,"serviceIds":_data.serviceIds.join(','),"functionId":_data.functionId,"compileIds":_data.compileIds.join(',')},
+		dataType:'json',
+		async:true,
+		success:function(data,textStatus){//处理返回结果
+			if(textStatus=="success"){
+				totalTrs.each(function(){
+					var hasLog=false;
+					for(var i=0;i<data.length;i++){
+						if($(this).attr("compileId")==data[i].compileId){
+							$(this).attr("id",i+"logTotal");
+							$(this).html("<a href='javascript:;' onclick='toLogSearch("+i+")'>"+data[i].sum+"<a>");
+							hasLog=true;
+						}
+					}
+					if(!hasLog){
+						$(this).html("0");
+					}
+				})
+			}
+		},
+		complete:function(XMLHttpRequest,status){//超时设置
+			if(status=="timeout"){
+				totalTrs.each(function(){
+					$(this).html(timeout);
+				})
+			}else if(status !="success"){
+				totalTrs.each(function(){
+					$(this).html(failed);
+				})
+			}
+		}
+	});
+}
+
+var toLogSearch = function(index){
+	// 保存配置界面URL
+	$("#searchForm").each(function(){
+		var cfgUrl = $(this).attr("action");
+		sessionStorage.removeItem('cfgUrl');
+		sessionStorage.setItem('cfgUrl',cfgUrl);
+	});
+	
+	var td = document.getElementById(index+"logTotal");
+	$("td[compileId]").each(function(){
+		if($(this).attr("id") == index+"logTotal"){
+			// 获取检索日志参数
+			var serviceId=$(this).attr("serviceId");
+			var compileId=$(this).attr("compileId");
+			var functionId=$(this).attr("functionId");
+			var date=$(this).attr("date");
+			var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.indexOf("/nis")+4);
+			
+			window.location.href = pathName+"/toLogSearch?service="+serviceId+"&functionId="+functionId+"&cfgId="+compileId+"&date="+date+"&isLogTotalSearch=yes";			
+			
+		}
+	});
+	
+}