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 @@ <spring:message code="${cfgName}"></spring:message>