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

Merge branch 'develop' of http://192.168.10.125/galaxy/galaxy-service.git into develop

Browse Source
This commit is contained in:
wangwenrui
2018-12-18 00:38:26 +08:00
parent 13b279de13 474aa995fd
commit 60a85266de
20 changed files with 1810 additions and 877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/service/LogDataService.java
View File

@@ -228,7 +228,7 @@ public class LogDataService {
String type = filedsType.get(key).trim();
if (type.equals("java.lang.String")) {
String field = filedAndColumnMap.get(key).toLowerCase();
if (field.equals("url")) {
if (field.equals("url")||field.equals("website")) {
whereSB.append(" and " + field + " like '" + value.toString().trim() + "%'");
} else {
whereSB.append(" and " + field + "='"

799
src/main/java/com/nis/web/service/restful/DashboardService.java
View File

File diff suppressed because it is too large Load Diff

9
src/main/java/com/nis/web/service/restful/NtcReportService.java
View File

@@ -14,6 +14,7 @@ import com.nis.domain.Page;
import com.nis.domain.restful.NtcAttrTypeReport;
import com.nis.domain.restful.NtcDestipCountryReport;
import com.nis.domain.restful.NtcEntranceReport;
import com.nis.domain.restful.NtcIpRangeReport;
import com.nis.domain.restful.NtcIpURLReport;
import com.nis.domain.restful.NtcLwhhReport;
import com.nis.domain.restful.NtcPzReport;
@@ -183,4 +184,12 @@ public class NtcReportService extends BaseLogService {
return resultList;
}
public List<NtcIpRangeReport> findNtcIpRangeReport(NtcIpRangeReport entity) throws Exception {
List<NtcIpRangeReport> list = dao.findNtcIpRangeReport(entity);
return list;
}
}