From 7334247f5bf4f8613bee242a30a9e3f7857962e2 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Thu, 14 Jun 2018 10:16:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2JS=E8=B0=83=E7=94=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=BE=85=E6=8E=A5=E5=8F=A3=E5=8F=AF=E7=94=A8=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../log/ntc/NtcPzReportController.java        |  9 +++++----
 .../webapp/WEB-INF/views/cfg/iplist/list.jsp  | 10 +++++++++-
 .../webapp/static/global/scripts/common.js    | 20 ++++++++++++-------
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/log/ntc/NtcPzReportController.java b/src/main/java/com/nis/web/controller/log/ntc/NtcPzReportController.java
index 26a9206c1..7a229f3e4 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/NtcPzReportController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/NtcPzReportController.java
@@ -15,6 +15,7 @@ import java.util.List;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.nis.domain.FunctionServiceDict;
@@ -35,10 +36,10 @@ import com.nis.web.controller.BaseController;
 @Controller
 @RequestMapping("${adminPath}/logs")
 public class NtcPzReportController extends BaseController{
-	@RequestMapping(value="ajaxGetLogTotal")
+	@RequestMapping(value="ajaxGetLogTotal",method=RequestMethod.POST)
 	@ResponseBody
-	public String ajaxGetLogTotal(Model model,long endTime,int action,Integer functionId,String compileIds){
-		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mi:ss");
+	public String ajaxGetLogTotal(Model model,long endTime,int action,Integer functionId,Integer compileId){
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		int interval=Constants.LOG_TIME_RANGE;
 		Date endDate=new Date(endTime);
 		Date startDate=new Date(endTime-interval);
@@ -50,7 +51,7 @@ public class NtcPzReportController extends BaseController{
 				break;
 			}
 		}
-		ReportResultLog result=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, String.valueOf(serviceId), sdf.format(startDate), sdf.format(endDate));
+		ReportResultLog result=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, String.valueOf(compileId), String.valueOf(serviceId), sdf.format(startDate), sdf.format(endDate));
 		if(result.getData()!=null&&result.getData().getList()!=null){
 			model.addAttribute("data", result.getData().getList());
 		}
diff --git a/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp b/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp
index 5f0da8f1b..19caabe1e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp
@@ -5,6 +5,14 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script>
 	$(document).ready(function() {
+		$("td[compileId]").each(function(){
+			var data={};
+			data.date=new Date();
+			data.compileId=$(this).attr("compileId");
+			data.action=$(this).attr("action");
+			data.functionId=$(this).attr("functionId");
+			GetLogTotal('${ctx}',data);
+		});
 		//$("#loadingModal").modal("show");
 		//setTimeout(function(){
 		//	$("#loadingModal").modal("hide");
@@ -311,7 +319,7 @@
 									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'cancel'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:if>
 							            </c:forEach>
 									</td>
-									<td compileId="${cfg.compileId}" ><div class="loading-total"></div></td>
+									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><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>
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 273978b5a..ad5d47b6c 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -618,18 +618,24 @@ var viewAreaInfo=function(path,areaEffectiveIds,compileId){
   });
 }
 
-var GetLogTotal=function(){
+var GetLogTotal=function(path,data){
+	console.log(data);
+	var timeStamp=0;
+	if(data.date){
+		timeStamp=data.date.valueOf(); 
+	}else{
+		timeStamp=(new Date()).valueOf(); 
+	}
 	$.ajax({
 		type:'post',
-		timeout:1000,//超时时间设置，查询接口时间过长超时
+		timeout:10000,//超时时间设置，查询接口时间过长超时
 		url:path+'/logs/ajaxGetLogTotal',
-		data:function(){//处理数据
-			return {"functionId":functionId,"compileIds":compileIds};
-		},
+		data:{"endTime":timeStamp,"action":data.action,"functionId":data.functionId,"compileId":data.compileId},
 		dataType:'json',
-		async:false,
+		async:true,
 		success:function(data,textStatus){//处理返回结果
-			
+			if(textStatus=="success"){
+			}
 		},
 		complete:function(XMLHttpRequest,status){//超时设置
 			if(status=="timeout"){