diff --git a/src/main/java/com/nis/domain/PageLog.java b/src/main/java/com/nis/domain/PageLog.java index 67d94728f..e8da615fa 100644 --- a/src/main/java/com/nis/domain/PageLog.java +++ b/src/main/java/com/nis/domain/PageLog.java @@ -267,12 +267,12 @@ 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!=0 && this.last!=0) { + //this.last = (int)(count / (this.pageSize < 1 ? 20 : this.pageSize) + first - 1); - if (this.count % this.pageSize != 0 || this.last == 0) { + /*if (this.count % this.pageSize != 0 || this.last == 0) { this.last++; - } + }*/ if (this.last < this.first) { this.last = this.first; @@ -477,6 +477,13 @@ public class PageLog { return count; } + /** + * 设置数据总数 + * @param count + */ + public void setLast(Integer last) { + this.last = last; + } /** * 设置数据总数 * @param count diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 296e78e92..1e821522d 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -2546,7 +2546,11 @@ public class BaseController { pageResult=httpRedirectCfgService.getHttpRedirectList(searchPage, searchCfg); }else if(baseCfg.getFunctionId().equals(213)) {// cache pageResult=cachePolicyService.getCachePolicyList(searchPage, searchCfg); - }else if(baseCfg.getFunctionId().equals(52)) {//appFeatre + }else if(baseCfg.getFunctionId().equals(563) //app payload + ||baseCfg.getFunctionId().equals(564)//app dns + ||baseCfg.getFunctionId().equals(565)//app http + ||baseCfg.getFunctionId().equals(566)//app ssl + ||baseCfg.getFunctionId().equals(567)) {//dk_gl pageResult=appMultiFeatureCfgService.findAppFeatureIndexList(searchPage,searchAppFeatureIndex); } return pageResult.getList(); 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 d421e54be..b0648a6d3 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 @@ -22,6 +22,7 @@ import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; import com.nis.domain.log.DkBehaviorLog; +import com.nis.domain.log.NtcHttpLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.CodeDicUtils; import com.nis.util.Constants; @@ -81,9 +82,10 @@ public class DkBehaviorLogController extends BaseController{ LogRecvData fromJson = gson.fromJson(jsonString, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { - Page data = fromJson.getData(); - page.setCount(fromJson.getData().getCount()); - page.setList(fromJson.getData().getList()); + Page data=fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.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 9d4b890ee..13e086fa9 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 @@ -21,6 +21,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.DkBehaviorLog; import com.nis.domain.log.NtcAppLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.CodeDicUtils; @@ -74,8 +75,10 @@ public class AppLogController extends BaseController{ LogRecvData fromJson = gson.fromJson(jsonString, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { - Page data = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + Page data=fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.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 6c60559ed..17c94fab3 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 @@ -18,7 +18,9 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; +import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.NtcAppLog; import com.nis.domain.log.NtcBGPLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; @@ -45,13 +47,15 @@ public class BgpLogController extends BaseController { String url = Constants.LOG_BASE_URL + Constants.NTC_BGP_LOG; String recv = HttpClientUtil.getMsg(url, params, request); - logger.info("查询结果:" + recv); if (StringUtils.isNotBlank(recv)) { Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + Page data=fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.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 d1de782d6..d311a3784 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 @@ -28,6 +28,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.NtcBGPLog; import com.nis.domain.log.NtcCollectVoipLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.CodeDicUtils; @@ -144,9 +145,9 @@ public class CollectVoipLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); -// page.setCount(fromJson.getData().getCount()); - page.setCount(fromJson.getData().getCount()); - page.setList(fromJson.getData().getList()); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.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 3a64bf723..010daca01 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 @@ -26,6 +26,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.NtcCollectVoipLog; import com.nis.domain.log.NtcDdosLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; @@ -85,7 +86,9 @@ public class DdosLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.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 1040ffaaa..f24e9e58d 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 @@ -21,6 +21,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.NtcDdosLog; import com.nis.domain.log.NtcDnsLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; @@ -55,8 +56,10 @@ public class DnsLogController extends BaseController { LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { -// BeanUtils.copyProperties(fromJson.getData(), page); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + Page data = fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.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 8f6737ef0..f7339d512 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 @@ -21,6 +21,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.NtcDnsLog; import com.nis.domain.log.NtcFtpLog; import com.nis.domain.log.NtcOpenVpnLog; import com.nis.domain.maat.LogRecvData; @@ -66,9 +67,10 @@ public class FtpLogController extends BaseController{ LogRecvData fromJson = gson.fromJson(jsonString, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { -// BeanUtils.copyProperties(fromJson.getData(), page); Page data = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.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 f324178fb..5af42452c 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 @@ -20,6 +20,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.NtcFtpLog; import com.nis.domain.log.NtcHttpLog; import com.nis.domain.log.NtcKeywordsUrlLog; import com.nis.domain.maat.LogRecvData; @@ -56,7 +57,9 @@ public class HttpKeyLogController extends BaseController { LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.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 48a25b144..7af16e5ad 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 @@ -21,6 +21,7 @@ import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; import com.nis.domain.log.NtcHttpLog; +import com.nis.domain.log.NtcKeywordsUrlLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; import com.nis.util.DictUtils; @@ -55,7 +56,9 @@ public class HttpLogController extends BaseController { LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.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 9020bf9fd..ba1c47f2e 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 @@ -24,6 +24,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.NtcHttpLog; import com.nis.domain.log.NtcIpLog; import com.nis.domain.maat.LogRecvData; import com.nis.exceptions.MaatConvertException; @@ -56,8 +57,10 @@ public class IpLogController extends BaseController { Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { - page.setCount(fromJson.getData().getCount()); - page.setList(fromJson.getData().getList()); + Page data = fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.getList()); List list = page.getList(); for (NtcIpLog l : list) { l.setFunctionId(log.getFunctionId()); 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 011d791f3..dd5cc826b 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 @@ -21,6 +21,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.NtcIpLog; import com.nis.domain.log.NtcIpsecLog; import com.nis.domain.log.NtcIpsecLog; import com.nis.domain.maat.LogRecvData; @@ -66,9 +67,11 @@ public class IpsecLogController extends BaseController{ LogRecvData fromJson = gson.fromJson(jsonString, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { - List list = fromJson.getData().getList(); - page.setCount(fromJson.getData().getCount()); - page.setList(list); + Page data = fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.getList()); + List list = page.getList(); for (NtcIpsecLog l : list) { l.setFunctionId(entry.getFunctionId()); setLogAction(l,serviceList); diff --git a/src/main/java/com/nis/web/controller/log/ntc/IrDnatLogController.java b/src/main/java/com/nis/web/controller/log/ntc/IrDnatLogController.java index e8ab01909..54e4f73f1 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/IrDnatLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/IrDnatLogController.java @@ -17,8 +17,10 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; +import com.nis.domain.Page; import com.nis.domain.PageLog; import com.nis.domain.log.IrDnatLog; +import com.nis.domain.log.NtcIpsecLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; import com.nis.util.DictUtils; @@ -50,7 +52,10 @@ public class IrDnatLogController extends BaseController { Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + Page data = fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.getList()); List list = page.getList(); for (IrDnatLog l : list) { l.setFunctionId(log.getFunctionId()); diff --git a/src/main/java/com/nis/web/controller/log/ntc/IrSnatLogController.java b/src/main/java/com/nis/web/controller/log/ntc/IrSnatLogController.java index 967bc9e13..d42d6c4ed 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/IrSnatLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/IrSnatLogController.java @@ -17,7 +17,9 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; +import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.IrDnatLog; import com.nis.domain.log.IrSnatLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; @@ -50,7 +52,10 @@ public class IrSnatLogController extends BaseController { Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + Page data = fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.getList()); List list = page.getList(); for (IrSnatLog l : list) { l.setFunctionId(log.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 6b9f0917a..21a50c2d3 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 @@ -20,6 +20,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.IrSnatLog; import com.nis.domain.log.NtcL2tpLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; @@ -52,9 +53,11 @@ public class L2tpLogController extends BaseController { Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); if(fromJson.getStatus().intValue() == 200) { - Page fromPage = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); - List list = fromPage.getList(); + Page data = fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.getList()); + List list = page.getList(); for (NtcL2tpLog log : list) { log.setFunctionId(ntcL2tpLog.getFunctionId()); setLogAction(log,serviceList); 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 4b6fbdafa..729c61f40 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 @@ -20,6 +20,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.NtcIpLog; import com.nis.domain.log.NtcMailLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; @@ -51,7 +52,10 @@ public class MailLogController extends BaseController { Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + Page data = fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.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 f265bc268..f95989356 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 @@ -22,6 +22,7 @@ import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; import com.nis.domain.log.MmAvIpLog; +import com.nis.domain.log.NtcMailLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; import com.nis.util.DictUtils; @@ -67,7 +68,9 @@ public class MmAvIpLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.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 22bf208e6..2a9705cc2 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 @@ -21,6 +21,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.MmAvIpLog; import com.nis.domain.log.NtcStreamMediaLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; @@ -67,7 +68,9 @@ public class MmAvUrlLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.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 402acec35..9cd40063c 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 @@ -22,6 +22,7 @@ import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; import com.nis.domain.log.MmFileDigestLog; +import com.nis.domain.log.NtcStreamMediaLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; import com.nis.util.DictUtils; @@ -67,7 +68,9 @@ public class MmFileDigestLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.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 498754fa1..8ae80f045 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 @@ -19,6 +19,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.MmFileDigestLog; import com.nis.domain.log.MmPicIpLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; @@ -51,9 +52,11 @@ public class MmPicIpLogController extends BaseController { Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); if(fromJson.getStatus().intValue() == 200) { - Page fromPage = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); - List list = fromPage.getList(); + Page data = fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.getList()); + List list = page.getList(); for (MmPicIpLog log : list) { log.setFunctionId(mmPicIpLog.getFunctionId()); setLogAction(log,serviceList); 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 02a7414d7..dde4ea418 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 @@ -19,6 +19,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.MmPicIpLog; import com.nis.domain.log.MmPicUrlLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; @@ -51,9 +52,11 @@ public class MmPicUrlController extends BaseController{ Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); if(fromJson.getStatus().intValue() == 200) { - Page fromPage = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); - List list = fromPage.getList(); + Page data = fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.getList()); + List list = page.getList(); for (MmPicUrlLog log : list) { log.setFunctionId(mmPicUrlLog.getFunctionId()); setLogAction(log,serviceList); 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 fdf453ee6..d6a09dc71 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 @@ -20,6 +20,7 @@ import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; import com.nis.domain.log.MmAvIpLog; +import com.nis.domain.log.MmPicUrlLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; import com.nis.util.DictUtils; @@ -54,7 +55,9 @@ public class MmPornAvSampleController extends BaseController { if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.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 2085dafaa..e7685c58f 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 @@ -19,6 +19,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.MmAvIpLog; import com.nis.domain.log.MmSampleAudioLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; @@ -51,9 +52,11 @@ public class MmSampleAudioController extends BaseController{ Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); if(fromJson.getStatus().intValue() == 200) { - Page fromPage = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); - List list = fromPage.getList(); + Page data = fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.getList()); + List list = page.getList(); for (MmSampleAudioLog log : list) { log.setFunctionId(sampleAudioLog.getFunctionId()); setLogAction(log,serviceList); 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 3351ff603..9fc2b1d54 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 @@ -19,6 +19,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.MmSampleAudioLog; import com.nis.domain.log.MmSamplePicLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; @@ -51,9 +52,11 @@ public class MmSampleFaceController extends BaseController{ Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); if(fromJson.getStatus().intValue() == 200) { - Page fromPage = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); - List list = fromPage.getList(); + Page data = fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.getList()); + List list = page.getList(); for (MmSamplePicLog log : list) { log.setFunctionId(samplePicLog.getFunctionId()); setLogAction(log,serviceList); 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 e5946fe78..3546d858a 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 @@ -51,9 +51,11 @@ public class MmSampleLogoController extends BaseController{ Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); if(fromJson.getStatus().intValue() == 200) { - Page fromPage = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); - List list = fromPage.getList(); + Page data = fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.getList()); + List list = page.getList(); for (MmSamplePicLog log : list) { log.setFunctionId(samplePicLog.getFunctionId()); setLogAction(log,serviceList); 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 2706e3c5d..85d5168cd 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 @@ -52,9 +52,11 @@ public class MmSamplePicController extends BaseController{ Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); if(fromJson.getStatus().intValue() == 200) { - Page fromPage = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); - List list = fromPage.getList(); + Page data = fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.getList()); + List list = page.getList(); for (MmSamplePicLog log : list) { log.setFunctionId(samplePicLog.getFunctionId()); setLogAction(log,serviceList); 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 31f7a147f..a7d7fb2ec 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 @@ -51,9 +51,11 @@ public class MmSampleSpeakerController extends BaseController{ Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); if(fromJson.getStatus().intValue() == 200) { - Page fromPage = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); - List list = fromPage.getList(); + Page data = fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.getList()); + List list = page.getList(); for (MmSamplePicLog log : list) { log.setFunctionId(samplePicLog.getFunctionId()); setLogAction(log,serviceList); 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 2ebf6adee..2e2516083 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 @@ -19,6 +19,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.MmSamplePicLog; import com.nis.domain.log.MmSampleVideoLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; @@ -51,9 +52,11 @@ public class MmSampleVideoController extends BaseController{ Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); if(fromJson.getStatus().intValue() == 200) { - Page fromPage = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); - List list = fromPage.getList(); + Page data = fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.getList()); + List list = page.getList(); for (MmSampleVideoLog log : list) { log.setFunctionId(sampleVideoLog.getFunctionId()); setLogAction(log,serviceList); 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 952446342..829e3db47 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 @@ -21,6 +21,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.MmSampleVideoLog; import com.nis.domain.log.MmVoipLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; @@ -57,7 +58,9 @@ public class MmSampleVoipLogController extends BaseController { if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.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 3c58e18ee..f2e391558 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,9 @@ public class MmVoipAccountLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.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 3144e92ea..7a6c0bf26 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,9 @@ public class MmVoipIpLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.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 7d874c5a4..551e4cdf1 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,9 @@ public class MmVoipLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.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 a90185a34..861a20fbd 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 @@ -21,6 +21,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.MmVoipLog; import com.nis.domain.log.NtcOpenVpnLog; import com.nis.domain.log.NtcOpenVpnLog; import com.nis.domain.maat.LogRecvData; @@ -67,7 +68,9 @@ public class OpenVpnLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.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 7ceab1122..bad42ada8 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 @@ -18,7 +18,9 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; +import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.NtcOpenVpnLog; import com.nis.domain.log.NtcP2pLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; @@ -49,7 +51,10 @@ public class P2pLogController extends BaseController { Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + Page data = fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.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 29b14587f..ddadc3368 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 @@ -20,6 +20,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.NtcP2pLog; import com.nis.domain.log.NtcPptpLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; @@ -52,10 +53,11 @@ public class PptpLogController extends BaseController { Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); if(fromJson.getStatus().intValue() == 200) { - Page fromPage = fromJson.getData(); - List list = fromPage.getList(); - page.setCount(fromJson.getData().getCount()); - page.setList(list); + Page data = fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.getList()); + List list = page.getList(); for (NtcPptpLog log : list) { log.setFunctionId(ntcPptpLog.getFunctionId()); setLogAction(log,serviceList); 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 5ca248eef..462561f22 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 @@ -21,6 +21,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.NtcPptpLog; import com.nis.domain.log.NtcSshLog; import com.nis.domain.log.NtcSshLog; import com.nis.domain.maat.LogRecvData; @@ -67,7 +68,9 @@ public class SshLogController extends BaseController{ if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.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 9007a64cd..60cb6ee2f 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 @@ -20,6 +20,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.NtcSshLog; import com.nis.domain.log.NtcSslLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; @@ -56,10 +57,11 @@ public class SslLogController extends BaseController { Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); if(fromJson.getStatus().intValue() == 200) { - Page fromPage = fromJson.getData(); - List list = fromPage.getList(); - page.setCount(fromJson.getData().getCount()); - page.setList(list); + Page data = fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.getList()); + List list = page.getList(); for (NtcSslLog log : list) { log.setFunctionId(ntcSslLog.getFunctionId()); setLogAction(log,serviceList); 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 84d3d09cb..4477c79d3 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 @@ -18,7 +18,9 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; +import com.nis.domain.Page; import com.nis.domain.PageLog; +import com.nis.domain.log.NtcSslLog; import com.nis.domain.log.PxyHttpLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; @@ -54,7 +56,10 @@ public class PxyHttpLogController extends BaseController { LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { - page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList()); + Page data = fromJson.getData(); + page.setCount(data.getCount()); + page.setLast(data.getLast()); + page.setList(data.getList()); List list = page.getList(); for (PxyHttpLog l : list) { l.setFunctionId(log.getFunctionId()); diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java index 6a2a30329..698e3fc38 100644 --- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java +++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java @@ -859,6 +859,11 @@ public class ConfigSynchronizationService extends BaseService{ asnGroupIds.add(cfg.getUserRegion4()); } } + if(isUpdateCfg) { + if(!StringUtil.isEmpty(compileIds) && !StringUtil.isEmpty(entity.getTableName())) { + commonPolicyDao.auditCfgBatch( entity.getTableName(), entity,compileIds,null); + } + } if(cfgList!=null){ for(Map m:cfgList){ String tableName = m.get("tableName").toString(); @@ -873,6 +878,11 @@ public class ConfigSynchronizationService extends BaseService{ }else if("5".equals(m.get("cfgType"))){ fileList.addAll(configSynchronizationDao.getFileDigestList(tableName, compileIds)); } + if(isUpdateCfg) { + if(!StringUtil.isEmpty(compileIds) && !StringUtil.isEmpty(entity.getTableName())) { + commonPolicyDao.auditCfgBatch( entity.getTableName(), entity,compileIds,null); + } + } } } //批量获取regionId,groupId(相同编译下的IP类配置多条ip只获取一个组号),分组复用的域配置不需要重新获取regionId,groupId diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index f956431ca..dc8cd04bd 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -361,7 +361,7 @@ input_integer=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043F\u0440\u0430\u043 protocol_desc=\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435 \u043F\u0440\u043E\u0442\u043E\u043A\u043E\u043B\u0430 max_value=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u043D\u0435 \u0434\u043E\u043B\u0436\u043D\u043E \u0431\u044B\u0442\u044C \u0431\u043E\u043B\u044C\u0448\u0435 min_value=\u041C\u0438\u043D\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u043D\u0435 \u0434\u043E\u043B\u0436\u043D\u043E \u0431\u044B\u0442\u044C \u043C\u0435\u043D\u044C\u0448\u0435 -login=\u041B\u043E\u0433\u0438\u043D +login=\u0412\u043E\u0439\u0442\u0438 owner_company=\u041F\u0440\u0438\u043D\u0430\u0434\u043B\u0435\u0436\u0430\u0449\u0430\u044F \u043A\u043E\u043C\u043F\u0430\u043D\u0438\u044F company=\u041A\u043E\u043C\u043F\u0430\u043D\u0438\u044F owner_group=\u041F\u0440\u0438\u043D\u0430\u0434\u043B\u0435\u0436\u0430\u0449\u0430\u044F \u0433\u0440\u0443\u043F\u043F\u0430 @@ -1348,5 +1348,5 @@ user_type=User Type policy_vpn_user=VPN access user name policy_sipv4_user=Three tier access to IP(IPv4) policy_sipv6_user=Three tier access to IP(IPv6) -traffic=Traffic +traffic=\u0422\u0440\u0430\u0444\u0438\u043A ip_info=IP Info \ No newline at end of file