diff options
| author | zhangwei <[email protected]> | 2018-12-15 23:37:27 +0600 |
|---|---|---|
| committer | zhangwei <[email protected]> | 2018-12-15 23:37:27 +0600 |
| commit | e0aad0a6226d59134718e79532f0402f825ebb3c (patch) | |
| tree | 95200970e52cedb808d78e44ed1021f1c4c3bb8b | |
| parent | 3f5e62a346155e185f0c286a481b2630d513266c (diff) | |
修正raduis日志最多导出2000条的配置，根据页面总数计算。develop_1216
| -rw-r--r-- | src/main/java/com/nis/domain/PageLog.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/nis/web/controller/log/ntc/NtcCollectRadiusLogController.java | 10 | ||||
| -rw-r--r-- | src/main/webapp/WEB-INF/tags/sys/delRow.tag | 9 |
3 files changed, 14 insertions, 7 deletions
diff --git a/src/main/java/com/nis/domain/PageLog.java b/src/main/java/com/nis/domain/PageLog.java index 947075f..d4bbac8 100644 --- a/src/main/java/com/nis/domain/PageLog.java +++ b/src/main/java/com/nis/domain/PageLog.java @@ -415,7 +415,7 @@ public class PageLog<T> { sb.append("<input type=\"text\" value=\""+pageNo+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)"); sb.append(funcName+"(this.value,"+pageSize+",'"+funcParam+"');\" onclick=\"this.select();\"/> / "); /*sb.append(pageNo+" / ");*/ - sb.append(last+" "+requestContext.getMessage("page")+"，"); + sb.append("<span id='lastPageNum'>"+last+"</span> "+requestContext.getMessage("page")+"，"); /*sb.append("<input type=\"text\" value=\""+last+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)"); sb.append(funcName+"("+pageNo+",this.value,'"+funcParam+"');\" onclick=\"this.select();\"/> "+requestContext.getMessage("page")+"，");*/ sb.append(""+requestContext.getMessage("total")+" <span id='showTotalCount'>" + count + "</span> "+requestContext.getMessage("count")+""+(message!=null?message:"")+"</a></li>\n"); diff --git a/src/main/java/com/nis/web/controller/log/ntc/NtcCollectRadiusLogController.java b/src/main/java/com/nis/web/controller/log/ntc/NtcCollectRadiusLogController.java index 9e1b19d..d58695e 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/NtcCollectRadiusLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/NtcCollectRadiusLogController.java @@ -88,12 +88,12 @@ public class NtcCollectRadiusLogController extends BaseController { Map<String, List> dataMap=new HashMap<String, List>();
Map<String, String> noExportMap=new HashMap<String, String>();
//---------------------------
- PageLog<NtcCollectRadiusLog> page = new PageLog<NtcCollectRadiusLog>(request, response);
- page.setPageNo(1);
- page.setPageSize(Constants.MAX_EXPORT_SIZE);
+// PageLog<NtcCollectRadiusLog> page = new PageLog<NtcCollectRadiusLog>(request, response);
+// page.setPageNo(1);
+// page.setPageSizepage.getPageSize);
Map<String, Object> params = new HashMap<String, Object>();
- params.put("pageSize", page.getPageSize());
- params.put("pageNo", page.getPageNo());
+ params.put("pageSize", log.getPageLog().getCount());
+ params.put("pageNo", 1);
initLogSearchValue(log, params);
// 请求参数判断
if(StringUtils.isNotBlank(log.getNasIp())) {
diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag index 89fc2b6..55e1d34 100644 --- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag +++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag @@ -407,7 +407,14 @@ function cancelPassOpt(url){ doAll(checkboxes,url); //导出检索条件下所有数据 }else{ - var totalCount = $("#showTotalCount").html() == undefined ? '' : $("#showTotalCount").html().trim(); + var totalCount = 0; + var lastPageNum = $("#lastPageNum").html() == undefined ? '' : $("#lastPageNum").html().trim(); + if(lastPageNum!=''){ + totalCount = lastPageNum*20; + url=url+"&pageLog.count="+totalCount; + }else{ + totalCount = $("#showTotalCount").html() == undefined ? '' : $("#showTotalCount").html().trim(); + } if(totalCount > maxRow){ top.$.jBox.confirm("<spring:message code='export_confirm_message'/>"+maxRow+"!","<spring:message code='info'/>",function(v,h,f){ if(v=="ok"){ |