diff --git a/src/main/java/com/nis/domain/log/SearchReport.java b/src/main/java/com/nis/domain/log/SearchReport.java index fdfc207e9..f200bb31b 100644 --- a/src/main/java/com/nis/domain/log/SearchReport.java +++ b/src/main/java/com/nis/domain/log/SearchReport.java @@ -10,6 +10,8 @@ package com.nis.domain.log; import java.util.HashMap; +import com.nis.domain.BaseEntity; + /** * @ClassName: SearchReport.java * @Description: TODO @@ -17,7 +19,17 @@ import java.util.HashMap; * @date 2018年7月5日 下午12:30:44 * @version V1.0 */ -public class SearchReport { +public class SearchReport extends BaseEntity{ + /** + * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) + * + * @since 1.0.0 + */ + + private static final long serialVersionUID = 1L; + private Integer functionId; + private String cfgName; + private Integer action; private String searchBusinessType; private String searchReportStartTime; private String searchReportEndTime; @@ -25,6 +37,48 @@ public class SearchReport { private HashMap searchCondition; public static final String searchConditionSplitor=","; public int searchConditionLimit; + /** + * functionId + * @return functionId + */ + + public Integer getFunctionId() { + return functionId; + } + /** + * @param functionId the functionId to set + */ + public void setFunctionId(Integer functionId) { + this.functionId = functionId; + } + /** + * cfgName + * @return cfgName + */ + + public String getCfgName() { + return cfgName; + } + /** + * @param cfgName the cfgName to set + */ + public void setCfgName(String cfgName) { + this.cfgName = cfgName; + } + /** + * action + * @return action + */ + + public Integer getAction() { + return action; + } + /** + * @param action the action to set + */ + public void setAction(Integer action) { + this.action = action; + } /** * searchBusinessType * @return searchBusinessType diff --git a/src/main/java/com/nis/web/controller/report/TestBean.java b/src/main/java/com/nis/web/controller/report/TestBean.java new file mode 100644 index 000000000..740735fbc --- /dev/null +++ b/src/main/java/com/nis/web/controller/report/TestBean.java @@ -0,0 +1,29 @@ +/** + *@Title: TestBean.java + *@Package com.nis.web.controller.report + *@Description TODO + *@author dell + *@date 2018年7月6日 上午9:20:48 + *@version 版本号 + */ +package com.nis.web.controller.report; + +import com.nis.domain.log.BaseReportLog; + +/** + * @ClassName: TestBean.java + * @Description: TODO + * @author (dell) + * @date 2018年7月6日 上午9:20:48 + * @version V1.0 + */ +public class TestBean extends BaseReportLog { + + /** + * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) + * + * @since 1.0.0 + */ + + private static final long serialVersionUID = -8794587413327741665L; +} diff --git a/src/main/java/com/nis/web/controller/report/TestController.java b/src/main/java/com/nis/web/controller/report/TestController.java index 837715e2e..840fd95d3 100644 --- a/src/main/java/com/nis/web/controller/report/TestController.java +++ b/src/main/java/com/nis/web/controller/report/TestController.java @@ -11,10 +11,8 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import com.mysql.fabric.xmlrpc.base.Array; import com.nis.domain.Page; -import com.nis.domain.configuration.IpPortCfg; -import com.nis.domain.log.NtcDnsLog; +import com.nis.domain.log.SearchReport; import com.nis.web.controller.BaseController; @Controller @@ -22,12 +20,13 @@ import com.nis.web.controller.BaseController; public class TestController extends BaseController { @RequestMapping("list") - public String list(@ModelAttribute("cfg") IpPortCfg cfg,Model model, HttpServletRequest request, HttpServletResponse response) { - Page page=new Page(request, response); - List list=new ArrayList(); - list.add(new IpPortCfg()); + public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) { + Page page=new Page(request, response); + List list=new ArrayList<>(); + list.add(new TestBean()); page.setList(list); model.addAttribute("page", page); + model.addAttribute("bean", bean); return "/report/test"; } } diff --git a/src/main/webapp/WEB-INF/views/report/attrType.jsp b/src/main/webapp/WEB-INF/views/report/attrType.jsp new file mode 100644 index 000000000..015959889 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/report/attrType.jsp @@ -0,0 +1,42 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
性质总量0点1点2点3点4点5点6点7点8点9点10点11点12点14点15点16点17点18点19点20点21点22点23点
+
${page}
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/report/destIp.jsp b/src/main/webapp/WEB-INF/views/report/destIp.jsp new file mode 100644 index 000000000..e65b43edc --- /dev/null +++ b/src/main/webapp/WEB-INF/views/report/destIp.jsp @@ -0,0 +1,42 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
所属国家总量0点1点2点3点4点5点6点7点8点9点10点11点12点14点15点16点17点18点19点20点21点22点23点
+
${page}
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/report/entranceId.jsp b/src/main/webapp/WEB-INF/views/report/entranceId.jsp new file mode 100644 index 000000000..e6b77f476 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/report/entranceId.jsp @@ -0,0 +1,42 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
局点总量0点1点2点3点4点5点6点7点8点9点10点11点12点14点15点16点17点18点19点20点21点22点23点
+
${page}
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/report/label.jsp b/src/main/webapp/WEB-INF/views/report/label.jsp new file mode 100644 index 000000000..7d2cca059 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/report/label.jsp @@ -0,0 +1,42 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
标签总量0点1点2点3点4点5点6点7点8点9点10点11点12点14点15点16点17点18点19点20点21点22点23点
+
${page}
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/report/lwhh.jsp b/src/main/webapp/WEB-INF/views/report/lwhh.jsp new file mode 100644 index 000000000..1d2a8b5f8 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/report/lwhh.jsp @@ -0,0 +1,42 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
性质总量0点1点2点3点4点5点6点7点8点9点10点11点12点14点15点16点17点18点19点20点21点22点23点
+
${page}
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/report/srcIp.jsp b/src/main/webapp/WEB-INF/views/report/srcIp.jsp new file mode 100644 index 000000000..63cc402ae --- /dev/null +++ b/src/main/webapp/WEB-INF/views/report/srcIp.jsp @@ -0,0 +1,43 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
所属省所属市总量0点1点2点3点4点5点6点7点8点9点10点11点12点14点15点16点17点18点19点20点21点22点23点
+
${page}
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/report/test.jsp b/src/main/webapp/WEB-INF/views/report/test.jsp index 3d2053954..366b517de 100644 --- a/src/main/webapp/WEB-INF/views/report/test.jsp +++ b/src/main/webapp/WEB-INF/views/report/test.jsp @@ -2,31 +2,11 @@ <%@ include file="/WEB-INF/include/taglib.jsp"%> -<spring:message code="test"></spring:message> +<spring:message code="${bean.cfgName}"></spring:message>