diff --git a/src/main/java/com/nis/domain/PageLog.java b/src/main/java/com/nis/domain/PageLog.java index f406359c6..67d94728f 100644 --- a/src/main/java/com/nis/domain/PageLog.java +++ b/src/main/java/com/nis/domain/PageLog.java @@ -34,7 +34,7 @@ public class PageLog { private long count;// 总记录数,设置为“-1”表示不查询总数 private int first;// 首页索引 -// private int last;// 尾页索引 + private int last;// 尾页索引 private int prev;// 上一页索引 private int next;// 下一页索引 @@ -42,8 +42,8 @@ public class PageLog { private boolean firstPage;//是否是第一页 private boolean lastPage;//是否是最后一页 -// private int length = 8;// 显示页面长度 -// private int slider = 1;// 前后显示页面长度 + private int length = 8;// 显示页面长度 + private int slider = 1;// 前后显示页面长度 private List list = new ArrayList(); @@ -266,7 +266,49 @@ public class PageLog { //1 this.first = 1; - + // 控制接口是否启用count last + if (this.count!=0) { + this.last = (int)(count / (this.pageSize < 1 ? 20 : this.pageSize) + first - 1); + + if (this.count % this.pageSize != 0 || this.last == 0) { + this.last++; + } + + if (this.last < this.first) { + this.last = this.first; + } + + if (this.pageNo <= 1) { + this.pageNo = this.first; + this.firstPage=true; + } + + if (this.pageNo >= this.last) { + this.pageNo = this.last; + this.lastPage=true; + } + + if (this.pageNo < this.last - 1) { + this.next = this.pageNo + 1; + } else { + this.next = this.last; + } + + if (this.pageNo > 1) { + this.prev = this.pageNo - 1; + } else { + this.prev = this.first; + } + + //2 + if (this.pageNo < this.first) {// 如果当前页小于首页 + this.pageNo = this.first; + } + + if (this.pageNo > this.last) {// 如果当前页大于尾页 + this.pageNo = this.last; + } + }else { //首页 if (this.pageNo <= 1) { this.pageNo = this.first; @@ -293,7 +335,7 @@ public class PageLog { if (this.pageNo < this.first) {// 如果当前页小于首页 this.pageNo = this.first; } - + } } @@ -303,14 +345,92 @@ public class PageLog { */ @Override public String toString() { - + StringBuilder sb = new StringBuilder(); + // 控制接口返回count last 切换分页 + if (this.count!=0) { + if(list != null && list.isEmpty()) { + return "
  "+requestContext.getMessage("noneData")+"
"; + } + if (pageNo == first) {// 如果是首页 + sb.append("
  • « "+requestContext.getMessage("previousPage")+"
  • \n"); + } else { + sb.append("
  • « "+requestContext.getMessage("previousPage")+"
  • \n"); + } + int begin = pageNo - (length / 2); + + if (begin < first) { + begin = first; + } + + int end = begin + length - 1; + + if (end >= last) { + end = last; + begin = end - length + 1; + if (begin < first) { + begin = first; + } + } + + if (begin > first) { + int i = 0; + for (i = first; i < first + slider && i < begin; i++) { + sb.append("
  • " + + (i + 1 - first) + "
  • \n"); + } + if (i < begin) { + sb.append("
  • ...
  • \n"); + } + } + + for (int i = begin; i <= end; i++) { + if (i == pageNo) { + sb.append("
  • " + (i + 1 - first) + + "
  • \n"); + } else { + sb.append("
  • " + + (i + 1 - first) + "
  • \n"); + } + } + + if (last - end > slider) { + sb.append("
  • ...
  • \n"); + end = last - slider; + } + + for (int i = end + 1; i <= last; i++) { + sb.append("
  • " + + (i + 1 - first) + "
  • \n"); + } + + if (pageNo == last) { + sb.append("
  • "+requestContext.getMessage("nextPage")+" »
  • \n"); + } else { + sb.append("
  • " + + ""+requestContext.getMessage("nextPage")+" »
  • \n"); + } + + sb.append("
  • "+requestContext.getMessage("current")+" "); + sb.append(" / "); + sb.append(" "+requestContext.getMessage("page")+","); + sb.append(""+requestContext.getMessage("total")+" " + count + " "+requestContext.getMessage("count")+""+(message!=null?message:"")+"
  • \n"); + + sb.insert(0,"
      \n").append("
    \n"); + + sb.append("
    "); + +// sb.insert(0,"
    \n").append("
    \n"); + + }else { + if(list != null && list.isEmpty()&&pageNo<=1) { return "
      "+requestContext.getMessage("noneData")+"
    "; } - StringBuilder sb = new StringBuilder(); sb.append("
  • "+requestContext.getMessage("firstPage")+"
  • \n"); if (pageNo == first) {// 如果是首页 @@ -335,7 +455,7 @@ public class PageLog { sb.insert(0,"
      \n").append("
    \n"); sb.append("
    "); - + } return sb.toString(); } @@ -413,7 +533,21 @@ public class PageLog { return first; } - + /** + * 尾页索引 + * @return + */ + public int getLast() { + return last; + } + /** + * 获取页面总数 + * @return getLast(); + */ + @JsonIgnore + public int getTotalPage() { + return getLast(); + } /** * 是否为第一页 * @return diff --git a/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java b/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java index 679ee7821..f352f84d7 100644 --- a/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java +++ b/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.http.client.ClientProtocolException; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -81,7 +82,8 @@ public class DkBehaviorLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setList(data.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"}); + page.setList(fromJson.getData().getList()); List list = page.getList(); for (DkBehaviorLog l : list) { l.setFunctionId(entry.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/AppLogController.java b/src/main/java/com/nis/web/controller/log/ntc/AppLogController.java index 74deaede3..ab55d483c 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/AppLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/AppLogController.java @@ -75,7 +75,7 @@ public class AppLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setList(data.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = page.getList(); for (NtcAppLog l : list) { l.setFunctionId(entry.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java index b34fbab6e..bb30411e1 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java @@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -50,7 +51,7 @@ public class BgpLogController extends BaseController { Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { - page.setList(fromJson.getData().getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = page.getList(); for (NtcBGPLog l : list) { l.setFunctionId(log.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java b/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java index dc1c0f569..87828b411 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java @@ -1,7 +1,6 @@ package com.nis.web.controller.log.ntc; import java.io.IOException; -import java.sql.Timestamp; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -11,6 +10,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.http.client.ClientProtocolException; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -23,7 +23,6 @@ import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonParseException; import com.google.gson.reflect.TypeToken; -import com.google.protobuf.DescriptorProtos.FieldDescriptorProto.Type; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; @@ -33,7 +32,6 @@ import com.nis.util.Constants; import com.nis.util.DictUtils; import com.nis.util.httpclient.HttpClientUtil; import com.nis.web.controller.BaseController; -import com.sun.jna.platform.win32.OaIdl.DATE; @Controller @RequestMapping(value = "${adminPath}/log/ntc/ntcDdosLogs") @@ -87,7 +85,7 @@ public class DdosLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setList(data.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = page.getList(); for (NtcDdosLog l : list) { l.setFunctionId(entry.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java b/src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java index d34031f2f..1cd1af1bc 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java @@ -56,7 +56,7 @@ public class DnsLogController extends BaseController { LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { // BeanUtils.copyProperties(fromJson.getData(), page); - page.setList(fromJson.getData().getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = page.getList(); for (NtcDnsLog l : list) { l.setFunctionId(log.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java index 6abd9c11f..73212f093 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java @@ -68,7 +68,7 @@ public class FtpLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { // BeanUtils.copyProperties(fromJson.getData(), page); Page data = fromJson.getData(); - page.setList(data.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = page.getList(); for (NtcFtpLog l : list) { l.setFunctionId(entry.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/HttpKeyLogController.java b/src/main/java/com/nis/web/controller/log/ntc/HttpKeyLogController.java index 60220ba40..ff72cbd7a 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/HttpKeyLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/HttpKeyLogController.java @@ -56,7 +56,7 @@ public class HttpKeyLogController extends BaseController { LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setList(data.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = page.getList(); for (NtcKeywordsUrlLog l : list) { l.setFunctionId(log.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java index 7825d1859..2d574d2e8 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java @@ -55,7 +55,7 @@ public class HttpLogController extends BaseController { LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setList(data.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = page.getList(); for (NtcHttpLog l : list) { l.setFunctionId(log.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/IpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/IpLogController.java index 68822d153..575b9d30e 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/IpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/IpLogController.java @@ -56,7 +56,7 @@ public class IpLogController extends BaseController { Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { -// BeanUtils.copyProperties(fromJson.getData(), page); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"}); page.setList(fromJson.getData().getList()); List list = page.getList(); for (NtcIpLog l : list) { diff --git a/src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java b/src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java index 04ccf1512..6c73c707e 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java @@ -67,6 +67,7 @@ public class IpsecLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { List list = fromJson.getData().getList(); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"}); page.setList(list); for (NtcIpsecLog l : list) { l.setFunctionId(entry.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java index d93356c1a..a50836790 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java @@ -53,7 +53,7 @@ public class L2tpLogController extends BaseController { LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); if(fromJson.getStatus().intValue() == 200) { Page fromPage = fromJson.getData(); - page.setList(fromPage.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = fromPage.getList(); for (NtcL2tpLog log : list) { log.setFunctionId(ntcL2tpLog.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java index 9d46ead43..a2795e549 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java @@ -51,7 +51,7 @@ public class MailLogController extends BaseController { Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { - page.setList(fromJson.getData().getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = page.getList(); for (NtcMailLog l : list) { l.setFunctionId(log.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java index 8340a38fb..2f0cc68f1 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.http.client.ClientProtocolException; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -66,7 +67,7 @@ public class MmAvIpLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setList(data.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = page.getList(); for (MmAvIpLog l : list) { l.setFunctionId(entry.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java index 73bf8e889..64cad595e 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.http.client.ClientProtocolException; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -66,7 +67,7 @@ public class MmAvUrlLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setList(data.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = page.getList(); for (NtcStreamMediaLog l : list) { l.setFunctionId(entry.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmFileDigestLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmFileDigestLogController.java index 8f0152036..13e91f773 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmFileDigestLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmFileDigestLogController.java @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.http.client.ClientProtocolException; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -66,7 +67,7 @@ public class MmFileDigestLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setList(data.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = page.getList(); for (MmFileDigestLog l : list) { l.setFunctionId(entry.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java index d9a05491e..8711fd712 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java @@ -7,6 +7,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -51,7 +52,7 @@ public class MmPicIpLogController extends BaseController { LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); if(fromJson.getStatus().intValue() == 200) { Page fromPage = fromJson.getData(); - page.setList(fromPage.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = fromPage.getList(); for (MmPicIpLog log : list) { log.setFunctionId(mmPicIpLog.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java b/src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java index 4360e12d5..11829e283 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java @@ -7,6 +7,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -51,7 +52,7 @@ public class MmPicUrlController extends BaseController{ LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); if(fromJson.getStatus().intValue() == 200) { Page fromPage = fromJson.getData(); - page.setList(fromPage.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = fromPage.getList(); for (MmPicUrlLog log : list) { log.setFunctionId(mmPicUrlLog.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java b/src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java index 94691404a..726900f84 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java @@ -7,6 +7,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -53,7 +54,7 @@ public class MmPornAvSampleController extends BaseController { if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setList(data.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = page.getList(); for (MmAvIpLog l : list) { l.setFunctionId(entry.getFunctionId()); @@ -94,7 +95,7 @@ public class MmPornAvSampleController extends BaseController { if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setList(data.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = page.getList(); for (MmAvIpLog l : list) { l.setFunctionId(entry.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java index 2db7f11a4..2ab031198 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java @@ -7,6 +7,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -51,7 +52,7 @@ public class MmSampleAudioController extends BaseController{ LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); if(fromJson.getStatus().intValue() == 200) { Page fromPage = fromJson.getData(); - page.setList(fromPage.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = fromPage.getList(); for (MmSampleAudioLog log : list) { log.setFunctionId(sampleAudioLog.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleFaceController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleFaceController.java index 1095da20c..b2f3a098f 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleFaceController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleFaceController.java @@ -7,6 +7,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -51,7 +52,7 @@ public class MmSampleFaceController extends BaseController{ LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); if(fromJson.getStatus().intValue() == 200) { Page fromPage = fromJson.getData(); - page.setList(fromPage.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = fromPage.getList(); for (MmSamplePicLog log : list) { log.setFunctionId(samplePicLog.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleLogoController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleLogoController.java index 8b8dcf3a0..004fb69ec 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleLogoController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleLogoController.java @@ -7,6 +7,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -51,7 +52,7 @@ public class MmSampleLogoController extends BaseController{ LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); if(fromJson.getStatus().intValue() == 200) { Page fromPage = fromJson.getData(); - page.setList(fromPage.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = fromPage.getList(); for (MmSamplePicLog log : list) { log.setFunctionId(samplePicLog.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java index 9ea88dfef..90fc5bb6c 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java @@ -1,3 +1,4 @@ + package com.nis.web.controller.log.ntc; import java.util.HashMap; @@ -7,6 +8,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -51,7 +53,7 @@ public class MmSamplePicController extends BaseController{ LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); if(fromJson.getStatus().intValue() == 200) { Page fromPage = fromJson.getData(); - page.setList(fromPage.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = fromPage.getList(); for (MmSamplePicLog log : list) { log.setFunctionId(samplePicLog.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleSpeakerController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleSpeakerController.java index 6ba4a1af5..8b2b0b14b 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleSpeakerController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleSpeakerController.java @@ -7,6 +7,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -51,7 +52,7 @@ public class MmSampleSpeakerController extends BaseController{ LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); if(fromJson.getStatus().intValue() == 200) { Page fromPage = fromJson.getData(); - page.setList(fromPage.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = fromPage.getList(); for (MmSamplePicLog log : list) { log.setFunctionId(samplePicLog.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java index f671733c3..79e137df1 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java @@ -7,6 +7,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -51,7 +52,7 @@ public class MmSampleVideoController extends BaseController{ LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); if(fromJson.getStatus().intValue() == 200) { Page fromPage = fromJson.getData(); - page.setList(fromPage.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = fromPage.getList(); for (MmSampleVideoLog log : list) { log.setFunctionId(sampleVideoLog.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java index f5ecf8c56..c018e3631 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java @@ -1,6 +1,5 @@ package com.nis.web.controller.log.ntc; -import java.io.File; import java.io.IOException; import java.util.HashMap; import java.util.List; @@ -10,7 +9,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.http.client.ClientProtocolException; -import org.aspectj.util.FileUtil; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -58,7 +57,7 @@ public class MmSampleVoipLogController extends BaseController { if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setList(data.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = page.getList(); for (MmVoipLog l : list) { l.setFunctionId(entry.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java index 62f29d105..84c9408e3 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.http.client.ClientProtocolException; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -65,7 +66,7 @@ public class MmVoipAccountLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setList(data.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = page.getList(); for (MmVoipLog l : list) { l.setFunctionId(entry.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java index 23a5c244d..428820396 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.http.client.ClientProtocolException; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -65,7 +66,7 @@ public class MmVoipIpLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setList(data.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = page.getList(); for (MmVoipLog l : list) { l.setFunctionId(entry.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java index 6a137d576..23090303a 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.http.client.ClientProtocolException; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -65,7 +66,7 @@ public class MmVoipLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setList(data.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = page.getList(); for (MmVoipLog l : list) { l.setFunctionId(entry.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java b/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java index 439796879..49d3db382 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java @@ -67,7 +67,7 @@ public class OpenVpnLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setList(data.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = page.getList(); for (NtcOpenVpnLog l : list) { l.setFunctionId(entry.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java b/src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java index c1f255789..eea9c92c9 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java @@ -8,10 +8,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; 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.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; @@ -47,7 +49,7 @@ public class P2pLogController extends BaseController { Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { - page.setList(fromJson.getData().getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = page.getList(); for (NtcP2pLog l : list) { l.setFunctionId(log.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java index d67398d9f..8c2419948 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java @@ -54,6 +54,7 @@ public class PptpLogController extends BaseController { if(fromJson.getStatus().intValue() == 200) { Page fromPage = fromJson.getData(); List list = fromPage.getList(); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"}); page.setList(list); for (NtcPptpLog log : list) { log.setFunctionId(ntcPptpLog.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/SshLogController.java b/src/main/java/com/nis/web/controller/log/ntc/SshLogController.java index 96eda247a..bdbf70d42 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/SshLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/SshLogController.java @@ -67,7 +67,7 @@ public class SshLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setList(data.getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = page.getList(); for (NtcSshLog l : list) { l.setFunctionId(entry.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/SslLogController.java b/src/main/java/com/nis/web/controller/log/ntc/SslLogController.java index a5f55f8b7..cef7b6824 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/SslLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/SslLogController.java @@ -58,6 +58,7 @@ public class SslLogController extends BaseController { if(fromJson.getStatus().intValue() == 200) { Page fromPage = fromJson.getData(); List list = fromPage.getList(); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"}); page.setList(list); for (NtcSslLog log : list) { log.setFunctionId(ntcSslLog.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java b/src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java index c2603bba6..00680a152 100644 --- a/src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java +++ b/src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java @@ -7,7 +7,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -54,7 +54,7 @@ public class PxyHttpLogController extends BaseController { LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { - page.setList(fromJson.getData().getList()); + BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); List list = page.getList(); for (PxyHttpLog l : list) { l.setFunctionId(log.getFunctionId());