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 8425ebee5..95c907cb3 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 @@ -43,7 +43,7 @@ public class NtcPzReportController extends BaseController{ @ResponseBody public Map ajaxGetLogTotal(Model model,long endTime,int action,Integer functionId,Integer compileId){ Map data=new HashMap(); - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf=new SimpleDateFormat(Constants.SEARCH_DATEFORMAT); int interval=Constants.LOG_TIME_RANGE; Date endDate=new Date(endTime); Date startDate=new Date(endTime-interval); diff --git a/src/main/java/com/nis/web/controller/report/NtcServiceReportController.java b/src/main/java/com/nis/web/controller/report/NtcServiceReportController.java index 2de2b5366..b5eb4ff61 100644 --- a/src/main/java/com/nis/web/controller/report/NtcServiceReportController.java +++ b/src/main/java/com/nis/web/controller/report/NtcServiceReportController.java @@ -1,6 +1,10 @@ package com.nis.web.controller.report; import java.io.UnsupportedEncodingException; +import java.text.ParseException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -9,34 +13,71 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.log.SearchReport; import com.nis.domain.report.NtcServiceReport; import com.nis.domain.report.ReportResult; import com.nis.exceptions.MaatConvertException; import com.nis.util.Constants; +import com.nis.util.DictUtils; import com.nis.web.controller.BaseController; @Controller @RequestMapping("${adminPath}/report") public class NtcServiceReportController extends BaseController { - @RequestMapping("/ntcLabelReport") - public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) { - initReportCondition(model, bean); + @RequestMapping("/ajaxNtcServiceReport") + @ResponseBody + public Map report(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) { + Map data=new HashMap<>(); + List 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()); + } + } + }else{ + StringBuffer serviceId=new StringBuffer(); + for(int i=0;i result=new ReportResult<>(); StringBuffer url=new StringBuffer(Constants.LOG_BASE_URL+Constants.NTC_SERVICE_REPORT+"?"); - try { - result=result.getReport(url.toString(), bean); - } catch (MaatConvertException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (UnsupportedEncodingException e) { - // TODO Auto-generated catch block - e.printStackTrace(); +// try { +// result=result.getReport(url.toString(), bean); +// Page page=result.getData(); +// List data=page.getList(); +// for(NtcServiceReport report:data){ +// if(datas.containsKey(report.getService().toString())){ +// data.put(report.getService().toString(), datas.get(report.getService().toString())+report.getSum().longValue()); +// }else{ +// data.put(report.getService().toString(),report.getSum().longValue()); +// } +// } +// } catch (Exception e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + if(bean.getAction()!=null){ + data.put(bean.getAction().toString(), 66666666l); } - Page page=result.getData(); - model.addAttribute("page", page); - return "/report/list"; + return data; } } diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp index cb601334f..51c2d88c1 100644 --- a/src/main/webapp/WEB-INF/views/report/list.jsp +++ b/src/main/webapp/WEB-INF/views/report/list.jsp @@ -62,6 +62,31 @@ } } }); + $(".service").each(function(){ + var target=$(this).find("span"); + var action=$(this).data("action"); + $.ajax({ + type:'post', + url:'${ctx}/report/ajaxNtcServiceReport', + data:{ + "action":action, + "reportType":$('[name="reportType"]').val(), + "reportTime":$('[name="reportTime"]').val() + }, + dataType:'json', + async:true, + success:function(data,textStatus){//处理返回结果 + if(textStatus=="success"){ + target.html(data[action]); + } + }, + complete:function(XMLHttpRequest,status){//超时设置 + if(status=="timeout"){ + target.html(timeout); + } + } + }); + }); }); function changeReportType(reportType, init) { @@ -102,11 +127,15 @@ var ajaxReport=function(url,target){