Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Conflicts:
	src/main/java/com/nis/util/Constants.java
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	src/main/resources/nis.properties

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;
@@ -329,6 +330,20 @@ public class BaseController {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(cfg.getFunctionId());
 		model.addAttribute("serviceList", serviceList);
 	}
+	protected void initReportCondition(Model model,SearchReport report){
+		List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
+		model.addAttribute("requestInfos", requestInfos);
+		List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
+		model.addAttribute("fls", fls);
+		List<ServiceDictInfo> xzs=serviceDictInfoService.findAllXzDict();
+		model.addAttribute("xzs", xzs);
+		List<ServiceDictInfo> lables=serviceDictInfoService.findAllLableDict();
+		model.addAttribute("lables", lables);
+		List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(report.getFunctionId());
+		model.addAttribute("regionList", regionList);
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(report.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+	}
 	protected void initFormCondition(Model model){
 		List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
 		model.addAttribute("requestInfos", requestInfos);

src/main/java/com/nis/web/controller/configuration/AppCfgController.java

@@ -1,6 +1,8 @@
 package com.nis.web.controller.configuration;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -19,6 +21,9 @@ import com.nis.domain.configuration.AppDomainCfg;
 import com.nis.domain.configuration.AppHttpCfg;
 import com.nis.domain.configuration.AppIpCfg;
 import com.nis.domain.configuration.AppPolicyCfg;
+import com.nis.domain.configuration.BaseStringCfg;
+import com.nis.domain.configuration.CfgIndexInfo;
+import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.specific.SpecificServiceCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.web.controller.BaseController;
@@ -52,6 +57,31 @@ public class AppCfgController extends BaseController {
 		initPageCondition(model,cfg);
 		return "/cfg/app/appPolicyCfgList";
 	}
+	/**
+	 * 查询APP策略IP子配置
+	 * @param model
+	 * @param cfgId
+	 * @param index
+	 * @return
+	 */
+	@RequestMapping(value = {"ajaxAppPolicyIpList"})
+	public String ajaxSslSubList(Model model,Long cfgId,Integer index) {
+		AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId);
+		List<String[]> tabList = new ArrayList();
+		if(cfg.getIpPortList()!=null){
+			String cfgType = null;
+			for(IpPortCfg ip:cfg.getIpPortList()){
+				if(!ip.getCfgType().equals(cfgType)){
+					tabList.add(new String[]{"1",ip.getCfgType()});
+					cfgType = ip.getCfgType();
+				}
+			}
+		}
+		model.addAttribute("_cfg", cfg);	
+		model.addAttribute("index", index);
+		model.addAttribute("tabList", tabList);
+		return "/cfg/app/appPolicyIpList";
+	}
 	/**
 	 * 策略配置表单
 	 * @param model

src/main/java/com/nis/web/controller/configuration/CommonController.java

@@ -11,7 +11,6 @@ package com.nis.web.controller.configuration;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -20,16 +19,12 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
-import org.datanucleus.store.types.wrappers.backed.Set;
 import org.springframework.beans.BeanUtils;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
-import com.nis.domain.SysUser;
 import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.HttpUrlCfg;
@@ -223,7 +218,7 @@ public class CommonController extends BaseController {
 		try {
 			ImportExcel ei = new ImportExcel(file, 0, 0);
 			List<IpCfgTemplate> list = ei.getDataList(IpCfgTemplate.class);
-			this.checkIpCfg(list);
+			this.checkIpCfg(ipCfg.getFunctionId(),list);
 			List<BaseIpCfg> ipList = new ArrayList<>();
 			Date date=new Date();
 			for(IpCfgTemplate cfg : list){
@@ -251,7 +246,7 @@ public class CommonController extends BaseController {
 	}
 	//ip配置导出
 	public void _exportIp(Model model,HttpServletRequest  request,HttpServletResponse response,
-			@ModelAttribute("cfg")IpPortCfg entity,String ids,RedirectAttributes redirectAttributes){
+			IpPortCfg entity,String ids,RedirectAttributes redirectAttributes){
 		try {
 			//获取国际化配置
 			Properties msgProp = getMsgProp();

src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java

@@ -35,7 +35,7 @@ import com.nis.web.security.UserUtils;
 public class BgpCfgController extends BaseController{
 	
 	@RequestMapping(value = {"bgpList"})
-	@RequiresPermissions(value={"other:bgp:config"})
+//	@RequiresPermissions(value={"other:bgp:config"})
 	public String httpList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg
 			,HttpServletRequest request,HttpServletResponse response
 			,RedirectAttributes redirectAttributes) {

src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java

@@ -47,7 +47,7 @@ import com.nis.web.security.UserUtils;
 @RequestMapping("${adminPath}/ntc/fileTransfer/")
 public class FileTransferCfgController  extends BaseController{
 	@RequestMapping(value = {"ftpList"})
-	@RequiresPermissions(value={"fileTransfer:ftp:config"})
+//	@RequiresPermissions(value={"fileTransfer:ftp:config"})
 	public String ftpList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) {
 		Page<CfgIndexInfo> searchPage=new Page<CfgIndexInfo>(request,response,"a");
 		Page<CfgIndexInfo> page = fileTransferCfgService.getFtpList(searchPage, cfg);
@@ -131,7 +131,7 @@ public class FileTransferCfgController  extends BaseController{
 	}
 	
 	@RequestMapping(value = {"fileDigestList"})
-	@RequiresPermissions(value={"fileTransfer:fileDigest:config"})
+//	@RequiresPermissions(value={"fileTransfer:fileDigest:config"})
 	public String fileDigestList(Model model,@ModelAttribute("cfg")FileDigestCfg cfg
 			,HttpServletRequest request,HttpServletResponse response
 			,RedirectAttributes redirectAttributes) {

src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java

@@ -45,7 +45,7 @@ import com.nis.web.security.UserUtils;
 @RequestMapping("${adminPath}/ntc/mail/")
 public class MailCfgController  extends BaseController{
 	@RequestMapping(value = {"mailList"})
-	@RequiresPermissions(value={"mail:config"})
+//	@RequiresPermissions(value={"mail:config"})
 	public String mailList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) {
 		Page<CfgIndexInfo> searchPage=new Page<CfgIndexInfo>(request,response,"a");
 		Page<CfgIndexInfo> page = mailCfgService.getMailList(searchPage, cfg);

src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java

@@ -48,7 +48,7 @@ import com.nis.web.security.UserUtils;
 public class WebsiteController extends BaseController{
 	
 	@RequestMapping(value = {"httpList"})
-	@RequiresPermissions(value={"website:http:config"})
+//	@RequiresPermissions(value={"website:http:config"})
 	public String httpList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) {
 		Page<CfgIndexInfo> searchPage=new Page<CfgIndexInfo>(request,response,"a");
 		Page<CfgIndexInfo> page = websiteCfgService.getWebsiteList(searchPage, cfg);
@@ -57,7 +57,7 @@ public class WebsiteController extends BaseController{
 		return "/cfg/website/httpList";
 	}
 	@RequestMapping(value = {"dnsList"})
-	@RequiresPermissions(value={"website:dns:config"})
+//	@RequiresPermissions(value={"website:dns:config"})
 	public String dnsList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) {
 		Page<CfgIndexInfo> searchPage=new Page<CfgIndexInfo>(request,response,"a");
 		Page<CfgIndexInfo> page = websiteCfgService.getWebsiteList(searchPage, cfg);
@@ -207,7 +207,7 @@ public class WebsiteController extends BaseController{
 		return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+functionId;
 	}
 	@RequestMapping(value = {"sslList"})
-	@RequiresPermissions(value={"website:ssl:config"})
+//	@RequiresPermissions(value={"website:ssl:config"})
 	public String sslList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) {
 		Page<CfgIndexInfo> searchPage=new Page<CfgIndexInfo>(request,response,"a");
 		Page<CfgIndexInfo> page = websiteCfgService.getWebsiteList(searchPage, cfg);

src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java

@@ -14,6 +14,9 @@ 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.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
@@ -22,7 +25,7 @@ import com.nis.domain.configuration.HttpUrlCfg;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
-import com.nis.web.controller.BaseController;
+import com.nis.web.controller.configuration.CommonController;
 
 /**
  * 白名单
@@ -31,9 +34,9 @@ import com.nis.web.controller.BaseController;
  */
 @Controller
 @RequestMapping("${adminPath}/ntc/whitelist")
-public class WhiteListController extends BaseController{
+public class WhiteListController extends CommonController{
 	
-	@RequestMapping(value = {"ipList"})
+	@RequestMapping(value = {"ip/list"})
 	@RequiresPermissions(value={"whitelist:ip:config","whitelist:ip:audit"},logical=Logical.OR)
 	public String ipList(Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
 		cfg.setTableName(IpPortCfg.getTablename());
@@ -43,7 +46,7 @@ public class WhiteListController extends BaseController{
 		initPageCondition(model,cfg);
 		return "/cfg/whitelist/ipList";
 	}
-	@RequestMapping(value = {"domainList"})
+	@RequestMapping(value = {"domain/list"})
 	@RequiresPermissions(value={"whitelist:domain:config","whitelist:domain:audit"},logical=Logical.OR)
 	public String domainList(Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) {
 		cfg.setTableName(HttpUrlCfg.getTablename());
@@ -53,7 +56,7 @@ public class WhiteListController extends BaseController{
 		initPageCondition(model,cfg);
 		return "/cfg/whitelist/domainList";
 	}
-	@RequestMapping(value = {"ipForm"})
+	@RequestMapping(value = {"ip/form"})
 	@RequiresPermissions(value={"whitelist:ip:config"})
 	public String ipForm(Model model,String ids,BaseIpCfg entity) {
 		if(StringUtils.isNotBlank(ids)){
@@ -72,7 +75,7 @@ public class WhiteListController extends BaseController{
 		
 		return "/cfg/whitelist/ipForm";
 	}
-	@RequestMapping(value = {"domainForm"})
+	@RequestMapping(value = {"domain/form"})
 	@RequiresPermissions(value={"whitelist:domain:config"})
 	public String domainForm(Model model,String ids,HttpUrlCfg entity) {
 		if(StringUtils.isNotBlank(ids)){
@@ -90,7 +93,7 @@ public class WhiteListController extends BaseController{
 		
 		return "/cfg/whitelist/domainForm";
 	}
-	@RequestMapping(value = {"saveOrUpdateIp"})
+	@RequestMapping(value = {"ip/saveOrUpdate"})
 	public String saveOrUpdateIp(RedirectAttributes model, IpPortCfg cfg) {
 		cfg.setTableName(IpPortCfg.getTablename());
 		logger.info("saveOrUpdateIp loaded");
@@ -112,9 +115,9 @@ public class WhiteListController extends BaseController{
 			logger.error("保存失败",e);
 			addMessage(model,"save_failed");
 		}
-		return "redirect:" + adminPath +"/ntc/whitelist/ipList?functionId="+cfg.getFunctionId();
+		return "redirect:" + adminPath +"/ntc/whitelist/ip/list?functionId="+cfg.getFunctionId();
 	}
-	@RequestMapping(value = {"saveOrUpdateDomain"})
+	@RequestMapping(value = {"domain/saveOrUpdate"})
 	public String saveOrUpdateDomain(RedirectAttributes model, HttpUrlCfg cfg) {
 		cfg.setTableName(HttpUrlCfg.getTablename());
 		logger.info("saveOrUpdateIp loaded");
@@ -136,10 +139,10 @@ public class WhiteListController extends BaseController{
 			logger.error("保存失败",e);
 			addMessage(model,"save_failed");
 		}
-		return "redirect:" + adminPath +"/ntc/whitelist/domainList?functionId="+cfg.getFunctionId();
+		return "redirect:" + adminPath +"/ntc/whitelist/domain/list?functionId="+cfg.getFunctionId();
 	}
 	
-	@RequestMapping(value = {"deleteIp"})
+	@RequestMapping(value = {"ip/delete"})
 	@RequiresPermissions("whitelist:ip:config")
 	public String deleteIp(String ids,Integer functionId,RedirectAttributes model) {
 		try{
@@ -149,9 +152,9 @@ public class WhiteListController extends BaseController{
 			logger.error("删除失败", e);
 			addMessage(model,"delete_failed");
 		}
-		return "redirect:" + adminPath +"/ntc/whitelist/ipList?functionId="+functionId;
+		return "redirect:" + adminPath +"/ntc/whitelist/ip/list?functionId="+functionId;
 	}
-	@RequestMapping(value = {"deleteDomain"})
+	@RequestMapping(value = {"domain/delete"})
 	@RequiresPermissions("whitelist:domain:config")
 	public String deleteDomain(String ids,Integer functionId,RedirectAttributes model) {
 		try{
@@ -161,10 +164,10 @@ public class WhiteListController extends BaseController{
 			logger.error("删除失败", e);
 			addMessage(model,"delete_failed");
 		}
-		return "redirect:" + adminPath +"/ntc/whitelist/domainList?functionId="+functionId;
+		return "redirect:" + adminPath +"/ntc/whitelist/domain/list?functionId="+functionId;
 	}
-	@RequestMapping(value = {"auditIp"})
-	@RequiresPermissions("whitelist:ip:aduit")
+	@RequestMapping(value = {"ip/audit"})
+	@RequiresPermissions("whitelist:ip:audit")
 	public String auditIp(String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) {
 		try{
 			for(String id:ids.split(",")){
@@ -183,15 +186,15 @@ public class WhiteListController extends BaseController{
 			addMessage(redirectAttributes,"audit_success");
 		}catch(MaatConvertException e){
 			logger.error("审核失败", e);
-			addMessage(redirectAttributes, e.getPrefix()+e.getResult().getReason());
+			addMessage(redirectAttributes, e.getMessage());
 		}catch(Exception e){
 			logger.error("审核失败", e);
 			addMessage(redirectAttributes, "audit_failed");
 		}
-		return "redirect:" + adminPath +"/ntc/whitelist/ipList?functionId="+cfg.getFunctionId();
+		return "redirect:" + adminPath +"/ntc/whitelist/ip/list?functionId="+cfg.getFunctionId();
 	}
-	@RequestMapping(value = {"auditDomain"})
-	@RequiresPermissions("whitelist:domain:aduit")
+	@RequestMapping(value = {"domain/audit"})
+	@RequiresPermissions("whitelist:domain:audit")
 	public String auditDomain(String ids,HttpUrlCfg cfg,RedirectAttributes redirectAttributes) {
 		try{
 			List<HttpUrlCfg> beans=domainService.getListByCfgId(ids);
@@ -209,11 +212,30 @@ public class WhiteListController extends BaseController{
 			addMessage(redirectAttributes,"audit_success");
 		}catch(MaatConvertException e){
 			logger.error("审核失败", e);
-			addMessage(redirectAttributes, e.getPrefix()+e.getResult().getReason());
+			addMessage(redirectAttributes, e.getMessage());
 		}catch(Exception e){
 			logger.error("审核失败", e);
 			addMessage(redirectAttributes, "audit_failed");
 		}
-		return "redirect:" + adminPath +"/ntc/whitelist/domainList?functionId="+cfg.getFunctionId();
+		return "redirect:" + adminPath +"/ntc/whitelist/domain/list?functionId="+cfg.getFunctionId();
+	}
+	//ip配置导入
+	@RequestMapping(value = "ip/import", method=RequestMethod.POST)
+	public String importIp(String cfgName,RedirectAttributes redirectAttributes,
+			@RequestParam("file") MultipartFile file,IpPortCfg cfg) {
+		this._importIp(cfgName,redirectAttributes, file,cfg);
+		return "redirect:" + adminPath +"/ntc/whitelist/ip/list?functionId="+cfg.getFunctionId();
+	}
+	//ip模板下载
+	@RequestMapping(value = "ip/import/template")
+	public void importFileTemplate(HttpServletRequest request,HttpServletResponse response, 
+    		RedirectAttributes redirectAttributes,Integer functionId,Integer cfgRegionCode) {
+		this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode);
+	}
+	//ip配置导出
+	@RequestMapping(value = "ip/export")
+	public void exportIp(Model model,HttpServletRequest  request,HttpServletResponse response,
+			@ModelAttribute("cfg")IpPortCfg entity,String ids,RedirectAttributes redirectAttributes){
+		this._exportIp(model, request, response, entity, ids, redirectAttributes);
 	}
 }

src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java

@@ -8,7 +8,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -17,18 +16,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
-import com.nis.domain.configuration.AreaIpCfg;
-import com.nis.domain.configuration.BaseIpCfg;
-import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.HttpBodyCfg;
 import com.nis.domain.configuration.HttpReqHeadCfg;
 import com.nis.domain.configuration.HttpResHeadCfg;
 import com.nis.domain.configuration.HttpUrlCfg;
-import com.nis.domain.configuration.IpPortCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
-import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
 

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";
+	}
+}

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<TestBean> {
+	
+	/**
+	 * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
+	 *
+	 * @since 1.0.0
+	 */
+	
+	private static final long serialVersionUID = -8794587413327741665L;
+}

src/main/java/com/nis/web/controller/report/TestController.java

@@ -0,0 +1,32 @@
+package com.nis.web.controller.report;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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.Page;
+import com.nis.domain.log.SearchReport;
+import com.nis.web.controller.BaseController;
+
+@Controller
+@RequestMapping("${adminPath}/report/test")
+public class TestController extends BaseController {
+	
+	@RequestMapping("list")
+	public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
+		Page<TestBean> page=new Page<TestBean>(request, response);
+		List<TestBean> list=new ArrayList<>();
+		list.add(new TestBean());
+		page.setList(list);
+		model.addAttribute("page", page);
+		model.addAttribute("bean", bean);
+		return "/report/test";
+	}
+}