From 98860034a3f662dfd015bccf9c4aeb686f697e78 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 9 Nov 2018 14:20:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BF=AE=E6=94=B9=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/log/manipulation/DkBehaviorLogController.java | 2 +- .../java/com/nis/web/controller/log/ntc/AppLogController.java | 2 +- .../java/com/nis/web/controller/log/ntc/BgpLogController.java | 2 +- .../nis/web/controller/log/ntc/CollectVoipLogController.java | 3 ++- .../com/nis/web/controller/log/ntc/DdosLogController.java | 2 +- .../java/com/nis/web/controller/log/ntc/DnsLogController.java | 2 +- .../java/com/nis/web/controller/log/ntc/FtpLogController.java | 2 +- .../com/nis/web/controller/log/ntc/HttpKeyLogController.java | 2 +- .../com/nis/web/controller/log/ntc/HttpLogController.java | 2 +- .../java/com/nis/web/controller/log/ntc/IpLogController.java | 2 +- .../com/nis/web/controller/log/ntc/IpsecLogController.java | 2 +- .../com/nis/web/controller/log/ntc/L2tpLogController.java | 2 +- .../com/nis/web/controller/log/ntc/MailLogController.java | 2 +- .../com/nis/web/controller/log/ntc/MmAvIpLogController.java | 2 +- .../com/nis/web/controller/log/ntc/MmAvUrlLogController.java | 2 +- .../nis/web/controller/log/ntc/MmFileDigestLogController.java | 2 +- .../com/nis/web/controller/log/ntc/MmPicIpLogController.java | 2 +- .../com/nis/web/controller/log/ntc/MmPicUrlController.java | 2 +- .../nis/web/controller/log/ntc/MmPornAvSampleController.java | 4 ++-- .../nis/web/controller/log/ntc/MmSampleAudioController.java | 2 +- .../nis/web/controller/log/ntc/MmSampleFaceController.java | 2 +- .../nis/web/controller/log/ntc/MmSampleLogoController.java | 2 +- .../com/nis/web/controller/log/ntc/MmSamplePicController.java | 2 +- .../nis/web/controller/log/ntc/MmSampleSpeakerController.java | 2 +- .../nis/web/controller/log/ntc/MmSampleVideoController.java | 2 +- .../nis/web/controller/log/ntc/MmSampleVoipLogController.java | 2 +- .../web/controller/log/ntc/MmVoipAccountLogController.java | 2 +- .../com/nis/web/controller/log/ntc/MmVoipIpLogController.java | 2 +- .../com/nis/web/controller/log/ntc/MmVoipLogController.java | 2 +- .../com/nis/web/controller/log/ntc/OpenVpnLogController.java | 2 +- .../java/com/nis/web/controller/log/ntc/P2pLogController.java | 2 +- .../com/nis/web/controller/log/ntc/PptpLogController.java | 2 +- .../java/com/nis/web/controller/log/ntc/SshLogController.java | 2 +- .../java/com/nis/web/controller/log/ntc/SslLogController.java | 2 +- .../com/nis/web/controller/log/pxy/PxyHttpLogController.java | 2 +- 35 files changed, 37 insertions(+), 36 deletions(-) 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 f352f84d7..d421e54be 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 @@ -82,7 +82,7 @@ public class DkBehaviorLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"}); + page.setCount(fromJson.getData().getCount()); page.setList(fromJson.getData().getList()); List list = page.getList(); for (DkBehaviorLog l : list) { 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 ab55d483c..9d4b890ee 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(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 bb30411e1..6c60559ed 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 @@ -51,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) { - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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/CollectVoipLogController.java b/src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java index f0086ee83..a8d56cd17 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java @@ -141,7 +141,8 @@ public class CollectVoipLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"}); +// page.setCount(fromJson.getData().getCount()); + page.setCount(fromJson.getData().getCount()); page.setList(fromJson.getData().getList()); model.addAttribute("page", page); logger.info("查询VoIP泛收日志成功"); 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 87828b411..697e2b1e0 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 @@ -85,7 +85,7 @@ public class DdosLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 1cd1af1bc..1040ffaaa 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); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 73212f093..8f6737ef0 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(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 ff72cbd7a..f324178fb 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(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 2d574d2e8..48a25b144 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(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 575b9d30e..9020bf9fd 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, new String[] {"pageSize","pageNo"}); + page.setCount(fromJson.getData().getCount()); 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 6c73c707e..011d791f3 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,7 +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.setCount(fromJson.getData().getCount()); 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 a50836790..6b9f0917a 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(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 a2795e549..4b6fbdafa 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) { - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 2f0cc68f1..f265bc268 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 @@ -67,7 +67,7 @@ public class MmAvIpLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 64cad595e..22bf208e6 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 @@ -67,7 +67,7 @@ public class MmAvUrlLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 13e91f773..402acec35 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 @@ -67,7 +67,7 @@ public class MmFileDigestLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 8711fd712..498754fa1 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 @@ -52,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(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 11829e283..02a7414d7 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 @@ -52,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(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 726900f84..fdf453ee6 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 @@ -54,7 +54,7 @@ public class MmPornAvSampleController extends BaseController { if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); List list = page.getList(); for (MmAvIpLog l : list) { l.setFunctionId(entry.getFunctionId()); @@ -95,7 +95,7 @@ public class MmPornAvSampleController extends BaseController { if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 2ab031198..2085dafaa 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 @@ -52,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(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 b2f3a098f..3351ff603 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 @@ -52,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(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 004fb69ec..e5946fe78 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 @@ -52,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(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 90fc5bb6c..2706e3c5d 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 @@ -53,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(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 8b2b0b14b..31f7a147f 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 @@ -52,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(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 79e137df1..2ebf6adee 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 @@ -52,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(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 c018e3631..952446342 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 @@ -57,7 +57,7 @@ public class MmSampleVoipLogController extends BaseController { if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 84c9408e3..3c58e18ee 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 @@ -66,7 +66,7 @@ public class MmVoipAccountLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 428820396..3144e92ea 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 @@ -66,7 +66,7 @@ public class MmVoipIpLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 23090303a..7d874c5a4 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 @@ -66,7 +66,7 @@ public class MmVoipLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 49d3db382..a90185a34 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(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 eea9c92c9..7ceab1122 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 @@ -49,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) { - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 8c2419948..29b14587f 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,7 +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.setCount(fromJson.getData().getCount()); 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 bdbf70d42..5ca248eef 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(); - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());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 cef7b6824..9007a64cd 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,7 +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.setCount(fromJson.getData().getCount()); 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 00680a152..84d3d09cb 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 @@ -54,7 +54,7 @@ public class PxyHttpLogController extends BaseController { LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { - BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList()); + page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); List list = page.getList(); for (PxyHttpLog l : list) { l.setFunctionId(log.getFunctionId());