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

1、回调类添加service和action匹配验证；

Browse Source 
2、将查询hive无用代码注释掉
This commit is contained in:
zhangdongxu
2018-07-06 18:07:16 +08:00
parent 6f23ea08b9
commit b6f2e08840
4 changed files with 115 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/restful/RestBusinessCode.java
View File

@@ -316,9 +316,9 @@ public enum RestBusinessCode {
*/ */
FatherCfgIdIsWrongRange(20004, "Maat配置的fatherCfgId值不在有效范围"), FatherCfgIdIsWrongRange(20004, "Maat配置的fatherCfgId值不在有效范围"),
/** /**
* 编译配置的service与action不匹配 * 配置的service与action不匹配
*/ */
ServiceUnmatchAction(20005, "Maat配置的service与action不匹配"), ServiceUnmatchAction(20005, "配置的service与action不匹配"),
/** /**
* 编译配置的的startTime不能晚于endTime * 编译配置的的startTime不能晚于endTime
*/ */

23
src/main/java/com/nis/util/HiveJDBC.java
View File

@@ -181,26 +181,25 @@ public class HiveJDBC {
Integer startNum = (page.getPageNo() - 1) * page.getPageSize(); Integer startNum = (page.getPageNo() - 1) * page.getPageSize();
Integer endNum = startNum - 1 + page.getPageSize() + 1; Integer endNum = startNum - 1 + page.getPageSize() + 1;
if (listString.size() >= startNum) { if (listString.size() >= startNum) {
// if (listString.size() >= endNum) { if (listString.size() >= endNum) {
// mapList.put("str", listString.subList(startNum, endNum)); mapList.put("str", listString.subList(startNum, endNum));
// } else { } else {
// mapList.put("str", listString.subList(startNum, listString.size())); mapList.put("str", listString.subList(startNum, listString.size()));
// } }
mapList.put("str", listString);
} else { } else {
mapList.put("str", new ArrayList()); mapList.put("str", new ArrayList());
} }
if (listObject.size() >= startNum) { if (listObject.size() >= startNum) {
// if (listObject.size() >= endNum) { if (listObject.size() >= endNum) {
// mapList.put("obj", listObject.subList(startNum, endNum)); mapList.put("obj", listObject.subList(startNum, endNum));
// } else { } else {
// mapList.put("obj", listObject.subList(startNum, listObject.size())); mapList.put("obj", listObject.subList(startNum, listObject.size()));
// } }
mapList.put("str", listObject);
} else { } else {
mapList.put("obj", new ArrayList()); mapList.put("obj", new ArrayList());
} }
System.out.println(mapList.get("obj").size());
return mapList; return mapList;
} }

159
src/main/java/com/nis/web/controller/restful/LogController.java
View File

@@ -93,11 +93,12 @@ public class LogController extends BaseRestController {
ntcIpLogPage.setList(new ArrayList()); ntcIpLogPage.setList(new ArrayList());
} else { } else {
List list = new ArrayList(); List list = new ArrayList();
if (tableMapping.get("obj").size() > page.getPageSize()) { list = tableMapping.get("obj");
list = tableMapping.get("obj").subList(0, page.getPageSize()); // if (tableMapping.get("obj").size() > page.getPageSize()) {
} else { // list = tableMapping.get("obj").subList(0, page.getPageSize());
list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size()); // } else {
} // list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
// }
if (list.size() > 0) { if (list.size() > 0) {
String jsonString = JsonMapper.toJsonString(list); String jsonString = JsonMapper.toJsonString(list);
List<NtcIpLog> List = (java.util.List<NtcIpLog>) JsonMapper.fromJsonList(jsonString, List<NtcIpLog> List = (java.util.List<NtcIpLog>) JsonMapper.fromJsonList(jsonString,
@@ -157,12 +158,12 @@ public class LogController extends BaseRestController {
if (tableMapping == null) { if (tableMapping == null) {
ntcHttpLogPage.setList(new ArrayList()); ntcHttpLogPage.setList(new ArrayList());
} else { } else {
List list = new ArrayList(); List list = tableMapping.get("obj");
if (tableMapping.get("obj").size() > page.getPageSize()) { // if (tableMapping.get("obj").size() > page.getPageSize()) {
list = tableMapping.get("obj").subList(0, page.getPageSize()); // list = tableMapping.get("obj").subList(0, page.getPageSize());
} else { // } else {
list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size()); // list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
} // }
if (list.size() > 0) { if (list.size() > 0) {
String jsonString = JsonMapper.toJsonString(list); String jsonString = JsonMapper.toJsonString(list);
List<NtcHttpLog> List = (java.util.List<NtcHttpLog>) JsonMapper.fromJsonList(jsonString, List<NtcHttpLog> List = (java.util.List<NtcHttpLog>) JsonMapper.fromJsonList(jsonString,
@@ -217,12 +218,12 @@ public class LogController extends BaseRestController {
if (tableMapping == null) { if (tableMapping == null) {
ntcDnsLogPage.setList(new ArrayList()); ntcDnsLogPage.setList(new ArrayList());
} else { } else {
List list = new ArrayList(); List list = tableMapping.get("obj");
if (tableMapping.get("obj").size() > page.getPageSize()) { // if (tableMapping.get("obj").size() > page.getPageSize()) {
list = tableMapping.get("obj").subList(0, page.getPageSize()); // list = tableMapping.get("obj").subList(0, page.getPageSize());
} else { // } else {
list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size()); // list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
} // }
if (list.size() > 0) { if (list.size() > 0) {
String jsonString = JsonMapper.toJsonString(list); String jsonString = JsonMapper.toJsonString(list);
List<NtcDnsLog> List = (java.util.List<NtcDnsLog>) JsonMapper.fromJsonList(jsonString, List<NtcDnsLog> List = (java.util.List<NtcDnsLog>) JsonMapper.fromJsonList(jsonString,
@@ -277,12 +278,12 @@ public class LogController extends BaseRestController {
if (tableMapping == null) { if (tableMapping == null) {
ntcMailLogPage.setList(new ArrayList()); ntcMailLogPage.setList(new ArrayList());
} else { } else {
List list = new ArrayList(); List list = tableMapping.get("obj");
if (tableMapping.get("obj").size() > page.getPageSize()) { // if (tableMapping.get("obj").size() > page.getPageSize()) {
list = tableMapping.get("obj").subList(0, page.getPageSize()); // list = tableMapping.get("obj").subList(0, page.getPageSize());
} else { // } else {
list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size()); // list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
} // }
if (list.size() > 0) { if (list.size() > 0) {
String jsonString = JsonMapper.toJsonString(list); String jsonString = JsonMapper.toJsonString(list);
List<NtcMailLog> List = (java.util.List<NtcMailLog>) JsonMapper.fromJsonList(jsonString, List<NtcMailLog> List = (java.util.List<NtcMailLog>) JsonMapper.fromJsonList(jsonString,
@@ -337,12 +338,12 @@ public class LogController extends BaseRestController {
if (tableMapping == null) { if (tableMapping == null) {
ntcSslLogPage.setList(new ArrayList()); ntcSslLogPage.setList(new ArrayList());
} else { } else {
List list = new ArrayList(); List list = tableMapping.get("obj");
if (tableMapping.get("obj").size() > page.getPageSize()) { // if (tableMapping.get("obj").size() > page.getPageSize()) {
list = tableMapping.get("obj").subList(0, page.getPageSize()); // list = tableMapping.get("obj").subList(0, page.getPageSize());
} else { // } else {
list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size()); // list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
} // }
if (list.size() > 0) { if (list.size() > 0) {
String jsonString = JsonMapper.toJsonString(list); String jsonString = JsonMapper.toJsonString(list);
List<NtcSslLog> List = (java.util.List<NtcSslLog>) JsonMapper.fromJsonList(jsonString, List<NtcSslLog> List = (java.util.List<NtcSslLog>) JsonMapper.fromJsonList(jsonString,
@@ -397,12 +398,12 @@ public class LogController extends BaseRestController {
if (tableMapping == null) { if (tableMapping == null) {
ntcPptpLogPage.setList(new ArrayList()); ntcPptpLogPage.setList(new ArrayList());
} else { } else {
List list = new ArrayList(); List list = tableMapping.get("obj");
if (tableMapping.get("obj").size() > page.getPageSize()) { // if (tableMapping.get("obj").size() > page.getPageSize()) {
list = tableMapping.get("obj").subList(0, page.getPageSize()); // list = tableMapping.get("obj").subList(0, page.getPageSize());
} else { // } else {
list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size()); // list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
} // }
if (list.size() > 0) { if (list.size() > 0) {
String jsonString = JsonMapper.toJsonString(list); String jsonString = JsonMapper.toJsonString(list);
List<NtcPptpLog> List = (java.util.List<NtcPptpLog>) JsonMapper.fromJsonList(jsonString, List<NtcPptpLog> List = (java.util.List<NtcPptpLog>) JsonMapper.fromJsonList(jsonString,
@@ -456,12 +457,12 @@ public class LogController extends BaseRestController {
if (tableMapping == null) { if (tableMapping == null) {
ntcL2tpLogPage.setList(new ArrayList()); ntcL2tpLogPage.setList(new ArrayList());
} else { } else {
List list = new ArrayList(); List list = tableMapping.get("obj");
if (tableMapping.get("obj").size() > page.getPageSize()) { // if (tableMapping.get("obj").size() > page.getPageSize()) {
list = tableMapping.get("obj").subList(0, page.getPageSize()); // list = tableMapping.get("obj").subList(0, page.getPageSize());
} else { // } else {
list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size()); // list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
} // }
if (list.size() > 0) { if (list.size() > 0) {
String jsonString = JsonMapper.toJsonString(list); String jsonString = JsonMapper.toJsonString(list);
List<NtcL2tpLog> List = (java.util.List<NtcL2tpLog>) JsonMapper.fromJsonList(jsonString, List<NtcL2tpLog> List = (java.util.List<NtcL2tpLog>) JsonMapper.fromJsonList(jsonString,
@@ -516,12 +517,12 @@ public class LogController extends BaseRestController {
if (tableMapping == null) { if (tableMapping == null) {
ntcOpenvpnLogPage.setList(new ArrayList()); ntcOpenvpnLogPage.setList(new ArrayList());
} else { } else {
List list = new ArrayList(); List list = tableMapping.get("obj");
if (tableMapping.get("obj").size() > page.getPageSize()) { // if (tableMapping.get("obj").size() > page.getPageSize()) {
list = tableMapping.get("obj").subList(0, page.getPageSize()); // list = tableMapping.get("obj").subList(0, page.getPageSize());
} else { // } else {
list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size()); // list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
} // }
if (list.size() > 0) { if (list.size() > 0) {
String jsonString = JsonMapper.toJsonString(list); String jsonString = JsonMapper.toJsonString(list);
List<NtcOpenvpnLog> List = (java.util.List<NtcOpenvpnLog>) JsonMapper.fromJsonList(jsonString, List<NtcOpenvpnLog> List = (java.util.List<NtcOpenvpnLog>) JsonMapper.fromJsonList(jsonString,
@@ -576,12 +577,12 @@ public class LogController extends BaseRestController {
if (tableMapping == null) { if (tableMapping == null) {
ntcIpsecLogPage.setList(new ArrayList()); ntcIpsecLogPage.setList(new ArrayList());
} else { } else {
List list = new ArrayList(); List list = tableMapping.get("obj");
if (tableMapping.get("obj").size() > page.getPageSize()) { // if (tableMapping.get("obj").size() > page.getPageSize()) {
list = tableMapping.get("obj").subList(0, page.getPageSize()); // list = tableMapping.get("obj").subList(0, page.getPageSize());
} else { // } else {
list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size()); // list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
} // }
if (list.size() > 0) { if (list.size() > 0) {
String jsonString = JsonMapper.toJsonString(list); String jsonString = JsonMapper.toJsonString(list);
List<NtcIpsecLog> List = (java.util.List<NtcIpsecLog>) JsonMapper.fromJsonList(jsonString, List<NtcIpsecLog> List = (java.util.List<NtcIpsecLog>) JsonMapper.fromJsonList(jsonString,
@@ -636,12 +637,12 @@ public class LogController extends BaseRestController {
if (tableMapping == null) { if (tableMapping == null) {
ntcSshLogPage.setList(new ArrayList()); ntcSshLogPage.setList(new ArrayList());
} else { } else {
List list = new ArrayList(); List list = tableMapping.get("obj");
if (tableMapping.get("obj").size() > page.getPageSize()) { // if (tableMapping.get("obj").size() > page.getPageSize()) {
list = tableMapping.get("obj").subList(0, page.getPageSize()); // list = tableMapping.get("obj").subList(0, page.getPageSize());
} else { // } else {
list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size()); // list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
} // }
if (list.size() > 0) { if (list.size() > 0) {
String jsonString = JsonMapper.toJsonString(list); String jsonString = JsonMapper.toJsonString(list);
List<NtcSshLog> List = (java.util.List<NtcSshLog>) JsonMapper.fromJsonList(jsonString, List<NtcSshLog> List = (java.util.List<NtcSshLog>) JsonMapper.fromJsonList(jsonString,
@@ -696,12 +697,12 @@ public class LogController extends BaseRestController {
if (tableMapping == null) { if (tableMapping == null) {
ntcFtpLogPage.setList(new ArrayList()); ntcFtpLogPage.setList(new ArrayList());
} else { } else {
List list = new ArrayList(); List list = tableMapping.get("obj");
if (tableMapping.get("obj").size() > page.getPageSize()) { // if (tableMapping.get("obj").size() > page.getPageSize()) {
list = tableMapping.get("obj").subList(0, page.getPageSize()); // list = tableMapping.get("obj").subList(0, page.getPageSize());
} else { // } else {
list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size()); // list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
} // }
if (list.size() > 0) { if (list.size() > 0) {
String jsonString = JsonMapper.toJsonString(list); String jsonString = JsonMapper.toJsonString(list);
List<NtcFtpLog> List = (java.util.List<NtcFtpLog>) JsonMapper.fromJsonList(jsonString, List<NtcFtpLog> List = (java.util.List<NtcFtpLog>) JsonMapper.fromJsonList(jsonString,
@@ -754,12 +755,12 @@ public class LogController extends BaseRestController {
if (tableMapping == null) { if (tableMapping == null) {
ntcAppLogPage.setList(new ArrayList()); ntcAppLogPage.setList(new ArrayList());
} else { } else {
List list = new ArrayList(); List list = tableMapping.get("obj");
if (tableMapping.get("obj").size() > page.getPageSize()) { // if (tableMapping.get("obj").size() > page.getPageSize()) {
list = tableMapping.get("obj").subList(0, page.getPageSize()); // list = tableMapping.get("obj").subList(0, page.getPageSize());
} else { // } else {
list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size()); // list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
} // }
if (list.size() > 0) { if (list.size() > 0) {
String jsonString = JsonMapper.toJsonString(list); String jsonString = JsonMapper.toJsonString(list);
List<NtcAppLog> List = (java.util.List<NtcAppLog>) JsonMapper.fromJsonList(jsonString, List<NtcAppLog> List = (java.util.List<NtcAppLog>) JsonMapper.fromJsonList(jsonString,
@@ -812,12 +813,12 @@ public class LogController extends BaseRestController {
if (tableMapping == null) { if (tableMapping == null) {
ntcDdosLogPage.setList(new ArrayList()); ntcDdosLogPage.setList(new ArrayList());
} else { } else {
List list = new ArrayList(); List list = tableMapping.get("obj");
if (tableMapping.get("obj").size() > page.getPageSize()) { // if (tableMapping.get("obj").size() > page.getPageSize()) {
list = tableMapping.get("obj").subList(0, page.getPageSize()); // list = tableMapping.get("obj").subList(0, page.getPageSize());
} else { // } else {
list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size()); // list = tableMapping.get("obj").subList(0, tableMapping.get("obj").size());
} // }
if (list.size() > 0) { if (list.size() > 0) {
String jsonString = JsonMapper.toJsonString(list); String jsonString = JsonMapper.toJsonString(list);
List<NtcDdosLog> List = (java.util.List<NtcDdosLog>) JsonMapper.fromJsonList(jsonString, List<NtcDdosLog> List = (java.util.List<NtcDdosLog>) JsonMapper.fromJsonList(jsonString,
@@ -861,6 +862,10 @@ public class LogController extends BaseRestController {
ntcPzReportPage, 0); ntcPzReportPage, 0);
} }
/** /**
*判断开始和结束时间是否为null,如果为null则初始化时间 *判断开始和结束时间是否为null,如果为null则初始化时间
* @param entity * @param entity

20
src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
View File

@@ -2947,6 +2947,8 @@ public class ConfigSourcesService extends BaseService {
// 获取IP类型 // 获取IP类型
Integer ipType = null; Integer ipType = null;
String ipTypeName = ""; String ipTypeName = "";
Integer action = null;
for (CommonSourceFieldCfg commonSourceFieldCfg : commonSourceFieldCfgList) { for (CommonSourceFieldCfg commonSourceFieldCfg : commonSourceFieldCfgList) {
if (commonSourceFieldCfg.getDstName().equals("ip_type")) { if (commonSourceFieldCfg.getDstName().equals("ip_type")) {
String dstVal = srcMap.get( String dstVal = srcMap.get(
@@ -2975,6 +2977,24 @@ public class ConfigSourcesService extends BaseService {
} }
ipType = Integer.parseInt(dstVal); ipType = Integer.parseInt(dstVal);
} }
//验证service与action是否匹配
if (commonSourceFieldCfg.getDstName().equals("action")) {
String dstVal = srcMap.get(
commonSourceFieldCfg.getSrcName()).toString().trim();
if (Integer.valueOf(dstVal).compareTo(ServiceAndRDBIndexReal.getActionByService(Integer.valueOf(srcMap.get("service")
.toString().trim())))!=0) {
logger1.error(RestBusinessCode.ServiceUnmatchAction
.getErrorReason());
thread.setExceptionInfo(RestBusinessCode.ServiceUnmatchAction
.getErrorReason());
throw new RestServiceException(thread,
System.currentTimeMillis() - start,
RestBusinessCode.ServiceUnmatchAction
.getErrorReason(),
RestBusinessCode.ServiceUnmatchAction
.getValue());
}
}
} }
for (CommonSourceFieldCfg commonSourceFieldCfg : commonSourceFieldCfgList) { for (CommonSourceFieldCfg commonSourceFieldCfg : commonSourceFieldCfgList) {
// 是否必填 // 是否必填