diff --git a/src/main/java/com/nis/domain/log/SearchReport.java b/src/main/java/com/nis/domain/log/SearchReport.java index f200bb31b..5342db1f6 100644 --- a/src/main/java/com/nis/domain/log/SearchReport.java +++ b/src/main/java/com/nis/domain/log/SearchReport.java @@ -30,6 +30,7 @@ public class SearchReport extends BaseEntity{ private Integer functionId; private String cfgName; private Integer action; + private Integer reportType; private String searchBusinessType; private String searchReportStartTime; private String searchReportEndTime; @@ -37,6 +38,21 @@ public class SearchReport extends BaseEntity{ private HashMap searchCondition; public static final String searchConditionSplitor=","; public int searchConditionLimit; + + /** + * reportType + * @return reportType + */ + + public Integer getReportType() { + return reportType; + } + /** + * @param reportType the reportType to set + */ + public void setReportType(Integer reportType) { + this.reportType = reportType; + } /** * functionId * @return functionId diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 0829709b0..0fbcc368e 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -40,6 +40,7 @@ import com.nis.domain.configuration.IpCfgTemplate; import com.nis.domain.configuration.RequestInfo; import com.nis.domain.configuration.StringCfgTemplate; import com.nis.domain.log.BaseLogEntity; +import com.nis.domain.log.SearchReport; import com.nis.exceptions.MaatConvertException; import com.nis.util.Configurations; //import com.nis.main.ConvertTool; @@ -296,6 +297,20 @@ public class BaseController { List serviceList = DictUtils.getFunctionServiceDictList(cfg.getFunctionId()); model.addAttribute("serviceList", serviceList); } + protected void initReportCondition(Model model,SearchReport report){ + List requestInfos=requestInfoService.getAllRequestInfo(); + model.addAttribute("requestInfos", requestInfos); + List fls=serviceDictInfoService.findAllFlDict(); + model.addAttribute("fls", fls); + List xzs=serviceDictInfoService.findAllXzDict(); + model.addAttribute("xzs", xzs); + List lables=serviceDictInfoService.findAllLableDict(); + model.addAttribute("lables", lables); + List regionList = DictUtils.getFunctionRegionDictList(report.getFunctionId()); + model.addAttribute("regionList", regionList); + List serviceList = DictUtils.getFunctionServiceDictList(report.getFunctionId()); + model.addAttribute("serviceList", serviceList); + } protected void initFormCondition(Model model){ List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); diff --git a/src/main/java/com/nis/web/controller/report/ReportController.java b/src/main/java/com/nis/web/controller/report/ReportController.java new file mode 100644 index 000000000..53728d4ee --- /dev/null +++ b/src/main/java/com/nis/web/controller/report/ReportController.java @@ -0,0 +1,22 @@ +package com.nis.web.controller.report; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +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 com.nis.domain.log.SearchReport; +import com.nis.web.controller.BaseController; + +@Controller +@RequestMapping("${adminPath}/report") +public class ReportController extends BaseController { + @RequestMapping("/list") + public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) { + initReportCondition(model, bean); + return "/report/list"; + } +} diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp new file mode 100644 index 000000000..73b10b86f --- /dev/null +++ b/src/main/webapp/WEB-INF/views/report/list.jsp @@ -0,0 +1,138 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${bean.cfgName}"></spring:message> + + + +
+ +

+ + +

+ +
+
+
+
+
+ + + + + + +
+
+ + + + + + + + + + +
+
+
+ + + +
+
+
+ + + + +
+ +
+ + + +
+
+ +
+
+ +
+ +
+ +
+ <%@include file="/WEB-INF/views/report/label.jsp" %> + <%@include file="/WEB-INF/views/report/attrType.jsp" %> + <%@include file="/WEB-INF/views/report/lwhh.jsp" %> + <%@include file="/WEB-INF/views/report/srcIp.jsp" %> + <%@include file="/WEB-INF/views/report/destIp.jsp" %> + <%@include file="/WEB-INF/views/report/entranceId.jsp" %> +
+
+ +
+
+
+ + \ No newline at end of file