gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

所有日志的last改由接口获取的last；

Browse Source 
app特征maat多域批量生效和失效功能提交
This commit is contained in:
DuanDongmei
2018-12-07 14:28:14 +08:00
parent 95dbe2a123
commit f93b86708d
41 changed files with 209 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/nis/domain/PageLog.java
View File

@@ -267,12 +267,12 @@ public class PageLog<T> {
//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<T> {
return count;
}
/**
* 设置数据总数
* @param count
*/
public void setLast(Integer last) {
this.last = last;
}
/**
* 设置数据总数
* @param count

6
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -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();

8
src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java
View File

@@ -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<DkBehaviorLog> fromJson = gson.fromJson(jsonString, new TypeToken<LogRecvData<DkBehaviorLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
Page<DkBehaviorLog> data = fromJson.getData();
page.setCount(fromJson.getData().getCount());
page.setList(fromJson.getData().getList());
Page<DkBehaviorLog> data=fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<DkBehaviorLog> list = page.getList();
for (DkBehaviorLog l : list) {
l.setFunctionId(entry.getFunctionId());

7
src/main/java/com/nis/web/controller/log/ntc/AppLogController.java
View File

@@ -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<NtcAppLog> fromJson = gson.fromJson(jsonString, new TypeToken<LogRecvData<NtcAppLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
Page<NtcAppLog> data = fromJson.getData();
page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList());
Page<NtcAppLog> data=fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<NtcAppLog> list = page.getList();
for (NtcAppLog l : list) {
l.setFunctionId(entry.getFunctionId());

8
src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java
View File

@@ -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<NtcBGPLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcBGPLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList());
Page<NtcBGPLog> data=fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<NtcBGPLog> list = page.getList();
for (NtcBGPLog l : list) {
l.setFunctionId(log.getFunctionId());

7
src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java
View File

@@ -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<NtcCollectVoipLog> 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泛收日志成功");
}

5
src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java
View File

@@ -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<NtcDdosLog> 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<NtcDdosLog> list = page.getList();
for (NtcDdosLog l : list) {
l.setFunctionId(entry.getFunctionId());

7
src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java
View File

@@ -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<NtcDnsLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcDnsLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
// BeanUtils.copyProperties(fromJson.getData(), page);
page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList());
Page<NtcDnsLog> data = fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<NtcDnsLog> list = page.getList();
for (NtcDnsLog l : list) {
l.setFunctionId(log.getFunctionId());

6
src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java
View File

@@ -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<NtcFtpLog> fromJson = gson.fromJson(jsonString, new TypeToken<LogRecvData<NtcFtpLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
// BeanUtils.copyProperties(fromJson.getData(), page);
Page<NtcFtpLog> 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<NtcFtpLog> list = page.getList();
for (NtcFtpLog l : list) {
l.setFunctionId(entry.getFunctionId());

5
src/main/java/com/nis/web/controller/log/ntc/HttpKeyLogController.java
View File

@@ -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<NtcKeywordsUrlLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcKeywordsUrlLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
Page<NtcKeywordsUrlLog> 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<NtcKeywordsUrlLog> list = page.getList();
for (NtcKeywordsUrlLog l : list) {
l.setFunctionId(log.getFunctionId());

5
src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java
View File

@@ -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<NtcHttpLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcHttpLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
Page<NtcHttpLog> 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<NtcHttpLog> list = page.getList();
for (NtcHttpLog l : list) {
l.setFunctionId(log.getFunctionId());

7
src/main/java/com/nis/web/controller/log/ntc/IpLogController.java
View File

@@ -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<NtcIpLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcIpLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
page.setCount(fromJson.getData().getCount());
page.setList(fromJson.getData().getList());
Page<NtcIpLog> data = fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<NtcIpLog> list = page.getList();
for (NtcIpLog l : list) {
l.setFunctionId(log.getFunctionId());

9
src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java
View File

@@ -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<NtcIpsecLog> fromJson = gson.fromJson(jsonString, new TypeToken<LogRecvData<NtcIpsecLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
List<NtcIpsecLog> list = fromJson.getData().getList();
page.setCount(fromJson.getData().getCount());
page.setList(list);
Page<NtcIpsecLog> data = fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<NtcIpsecLog> list = page.getList();
for (NtcIpsecLog l : list) {
l.setFunctionId(entry.getFunctionId());
setLogAction(l,serviceList);

7
src/main/java/com/nis/web/controller/log/ntc/IrDnatLogController.java
View File

@@ -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<IrDnatLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<IrDnatLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList());
Page<IrDnatLog> data = fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<IrDnatLog> list = page.getList();
for (IrDnatLog l : list) {
l.setFunctionId(log.getFunctionId());

7
src/main/java/com/nis/web/controller/log/ntc/IrSnatLogController.java
View File

@@ -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<IrSnatLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<IrSnatLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList());
Page<IrSnatLog> data = fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<IrSnatLog> list = page.getList();
for (IrSnatLog l : list) {
l.setFunctionId(log.getFunctionId());

9
src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java
View File

@@ -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<NtcL2tpLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<NtcL2tpLog>>() {}.getType());
if(fromJson.getStatus().intValue() == 200) {
Page<NtcL2tpLog> fromPage = fromJson.getData();
page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList());
List<NtcL2tpLog> list = fromPage.getList();
Page<NtcL2tpLog> data = fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<NtcL2tpLog> list = page.getList();
for (NtcL2tpLog log : list) {
log.setFunctionId(ntcL2tpLog.getFunctionId());
setLogAction(log,serviceList);

6
src/main/java/com/nis/web/controller/log/ntc/MailLogController.java
View File

@@ -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<NtcMailLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcMailLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList());
Page<NtcMailLog> data = fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<NtcMailLog> list = page.getList();
for (NtcMailLog l : list) {
l.setFunctionId(log.getFunctionId());

5
src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java
View File

@@ -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<MmAvIpLog> 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<MmAvIpLog> list = page.getList();
for (MmAvIpLog l : list) {
l.setFunctionId(entry.getFunctionId());

5
src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java
View File

@@ -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<NtcStreamMediaLog> 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<NtcStreamMediaLog> list = page.getList();
for (NtcStreamMediaLog l : list) {
l.setFunctionId(entry.getFunctionId());

5
src/main/java/com/nis/web/controller/log/ntc/MmFileDigestLogController.java
View File

@@ -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<MmFileDigestLog> 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<MmFileDigestLog> list = page.getList();
for (MmFileDigestLog l : list) {
l.setFunctionId(entry.getFunctionId());

9
src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java
View File

@@ -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<MmPicIpLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmPicIpLog>>() {}.getType());
if(fromJson.getStatus().intValue() == 200) {
Page<MmPicIpLog> fromPage = fromJson.getData();
page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList());
List<MmPicIpLog> list = fromPage.getList();
Page<MmPicIpLog> data = fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<MmPicIpLog> list = page.getList();
for (MmPicIpLog log : list) {
log.setFunctionId(mmPicIpLog.getFunctionId());
setLogAction(log,serviceList);

9
src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java
View File

@@ -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<MmPicUrlLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmPicUrlLog>>() {}.getType());
if(fromJson.getStatus().intValue() == 200) {
Page<MmPicUrlLog> fromPage = fromJson.getData();
page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList());
List<MmPicUrlLog> list = fromPage.getList();
Page<MmPicUrlLog> data = fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<MmPicUrlLog> list = page.getList();
for (MmPicUrlLog log : list) {
log.setFunctionId(mmPicUrlLog.getFunctionId());
setLogAction(log,serviceList);

5
src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java
View File

@@ -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<MmAvIpLog> 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<MmAvIpLog> list = page.getList();
for (MmAvIpLog l : list) {
l.setFunctionId(entry.getFunctionId());

9
src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java
View File

@@ -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<MmSampleAudioLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSampleAudioLog>>() {}.getType());
if(fromJson.getStatus().intValue() == 200) {
Page<MmSampleAudioLog> fromPage = fromJson.getData();
page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList());
List<MmSampleAudioLog> list = fromPage.getList();
Page<MmSampleAudioLog> data = fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<MmSampleAudioLog> list = page.getList();
for (MmSampleAudioLog log : list) {
log.setFunctionId(sampleAudioLog.getFunctionId());
setLogAction(log,serviceList);

9
src/main/java/com/nis/web/controller/log/ntc/MmSampleFaceController.java
View File

@@ -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<MmSamplePicLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSamplePicLog>>() {}.getType());
if(fromJson.getStatus().intValue() == 200) {
Page<MmSamplePicLog> fromPage = fromJson.getData();
page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList());
List<MmSamplePicLog> list = fromPage.getList();
Page<MmSamplePicLog> data = fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<MmSamplePicLog> list = page.getList();
for (MmSamplePicLog log : list) {
log.setFunctionId(samplePicLog.getFunctionId());
setLogAction(log,serviceList);

8
src/main/java/com/nis/web/controller/log/ntc/MmSampleLogoController.java
View File

@@ -51,9 +51,11 @@ public class MmSampleLogoController extends BaseController{
Gson gson = new GsonBuilder().create();
LogRecvData<MmSamplePicLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSamplePicLog>>() {}.getType());
if(fromJson.getStatus().intValue() == 200) {
Page<MmSamplePicLog> fromPage = fromJson.getData();
page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList());
List<MmSamplePicLog> list = fromPage.getList();
Page<MmSamplePicLog> data = fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<MmSamplePicLog> list = page.getList();
for (MmSamplePicLog log : list) {
log.setFunctionId(samplePicLog.getFunctionId());
setLogAction(log,serviceList);

8
src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java
View File

@@ -52,9 +52,11 @@ public class MmSamplePicController extends BaseController{
Gson gson = new GsonBuilder().create();
LogRecvData<MmSamplePicLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSamplePicLog>>() {}.getType());
if(fromJson.getStatus().intValue() == 200) {
Page<MmSamplePicLog> fromPage = fromJson.getData();
page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList());
List<MmSamplePicLog> list = fromPage.getList();
Page<MmSamplePicLog> data = fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<MmSamplePicLog> list = page.getList();
for (MmSamplePicLog log : list) {
log.setFunctionId(samplePicLog.getFunctionId());
setLogAction(log,serviceList);

8
src/main/java/com/nis/web/controller/log/ntc/MmSampleSpeakerController.java
View File

@@ -51,9 +51,11 @@ public class MmSampleSpeakerController extends BaseController{
Gson gson = new GsonBuilder().create();
LogRecvData<MmSamplePicLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSamplePicLog>>() {}.getType());
if(fromJson.getStatus().intValue() == 200) {
Page<MmSamplePicLog> fromPage = fromJson.getData();
page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList());
List<MmSamplePicLog> list = fromPage.getList();
Page<MmSamplePicLog> data = fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<MmSamplePicLog> list = page.getList();
for (MmSamplePicLog log : list) {
log.setFunctionId(samplePicLog.getFunctionId());
setLogAction(log,serviceList);

9
src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java
View File

@@ -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<MmSampleVideoLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSampleVideoLog>>() {}.getType());
if(fromJson.getStatus().intValue() == 200) {
Page<MmSampleVideoLog> fromPage = fromJson.getData();
page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList());
List<MmSampleVideoLog> list = fromPage.getList();
Page<MmSampleVideoLog> data = fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<MmSampleVideoLog> list = page.getList();
for (MmSampleVideoLog log : list) {
log.setFunctionId(sampleVideoLog.getFunctionId());
setLogAction(log,serviceList);

5
src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java
View File

@@ -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<MmVoipLog> 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<MmVoipLog> list = page.getList();
for (MmVoipLog l : list) {
l.setFunctionId(entry.getFunctionId());

4
src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java
View File

@@ -66,7 +66,9 @@ public class MmVoipAccountLogController extends BaseController{
if (fromJson.getStatus().intValue() == 200) {
Page<MmVoipLog> 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<MmVoipLog> list = page.getList();
for (MmVoipLog l : list) {
l.setFunctionId(entry.getFunctionId());

4
src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java
View File

@@ -66,7 +66,9 @@ public class MmVoipIpLogController extends BaseController{
if (fromJson.getStatus().intValue() == 200) {
Page<MmVoipLog> 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<MmVoipLog> list = page.getList();
for (MmVoipLog l : list) {
l.setFunctionId(entry.getFunctionId());

4
src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java
View File

@@ -66,7 +66,9 @@ public class MmVoipLogController extends BaseController{
if (fromJson.getStatus().intValue() == 200) {
Page<MmVoipLog> 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<MmVoipLog> list = page.getList();
for (MmVoipLog l : list) {
l.setFunctionId(entry.getFunctionId());

5
src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java
View File

@@ -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<NtcOpenVpnLog> 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<NtcOpenVpnLog> list = page.getList();
for (NtcOpenVpnLog l : list) {
l.setFunctionId(entry.getFunctionId());

7
src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java
View File

@@ -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<NtcP2pLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcP2pLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList());
Page<NtcP2pLog> data = fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<NtcP2pLog> list = page.getList();
for (NtcP2pLog l : list) {
l.setFunctionId(log.getFunctionId());

10
src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java
View File

@@ -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<NtcPptpLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<NtcPptpLog>>() {}.getType());
if(fromJson.getStatus().intValue() == 200) {
Page<NtcPptpLog> fromPage = fromJson.getData();
List<NtcPptpLog> list = fromPage.getList();
page.setCount(fromJson.getData().getCount());
page.setList(list);
Page<NtcPptpLog> data = fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<NtcPptpLog> list = page.getList();
for (NtcPptpLog log : list) {
log.setFunctionId(ntcPptpLog.getFunctionId());
setLogAction(log,serviceList);

5
src/main/java/com/nis/web/controller/log/ntc/SshLogController.java
View File

@@ -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<NtcSshLog> 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<NtcSshLog> list = page.getList();
for (NtcSshLog l : list) {
l.setFunctionId(entry.getFunctionId());

10
src/main/java/com/nis/web/controller/log/ntc/SslLogController.java
View File

@@ -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<NtcSslLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<NtcSslLog>>() {}.getType());
if(fromJson.getStatus().intValue() == 200) {
Page<NtcSslLog> fromPage = fromJson.getData();
List<NtcSslLog> list = fromPage.getList();
page.setCount(fromJson.getData().getCount());
page.setList(list);
Page<NtcSslLog> data = fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<NtcSslLog> list = page.getList();
for (NtcSslLog log : list) {
log.setFunctionId(ntcSslLog.getFunctionId());
setLogAction(log,serviceList);

7
src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java
View File

@@ -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<PxyHttpLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<PxyHttpLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
page.setCount(fromJson.getData().getCount());page.setList(fromJson.getData().getList());
Page<PxyHttpLog> data = fromJson.getData();
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());
List<PxyHttpLog> list = page.getList();
for (PxyHttpLog l : list) {
l.setFunctionId(log.getFunctionId());

10
src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
View File

@@ -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<String,Object> 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

4
src/main/resources/messages/message_ru.properties
View File

@@ -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