From ab4ea8fa69612c145e4475c5134eed1f6192fc48 Mon Sep 17 00:00:00 2001
From: doufenghu <doufenghu@iie.ac.cn>
Date: Sun, 24 Feb 2019 17:06:53 +0600
Subject: [PATCH] =?UTF-8?q?fix(logs):=20=E9=82=AE=E4=BB=B6=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81from=E3=80=81to=E3=80=81subject=E6=A8=A1=E7=B3=8A?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8Capp=20top100=20=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AB=AFIP=EF=BC=8C=E8=AE=BE=E7=BD=AE=E5=8F=AA=E6=94=AF?=
 =?UTF-8?q?=E6=8C=811=E5=B0=8F=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../restful/DashboardServiceController.java   | 55 ++++++++-----------
 .../com/nis/web/service/LogDataService.java   | 12 +++-
 2 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java b/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java
index 085afba..83ce616 100644
--- a/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java
+++ b/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java
@@ -1,42 +1,13 @@
 package com.nis.web.controller.restful;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.nis.datasource.CustomerContextHolder;
 import com.nis.domain.Page;
 import com.nis.domain.restful.NtcConnNumReport;
-import com.nis.domain.restful.dashboard.AppConnRecordStatistic;
-import com.nis.domain.restful.dashboard.AppTrendEntity;
-import com.nis.domain.restful.dashboard.TrafficAppFocusStatistic;
-import com.nis.domain.restful.dashboard.TrafficAppBpsStatistic;
-import com.nis.domain.restful.dashboard.TrafficAppPpsStatistic;
-import com.nis.domain.restful.dashboard.TrafficAsnStatistic;
+import com.nis.domain.restful.dashboard.*;
 import com.nis.restful.RestBusinessCode;
 import com.nis.restful.RestServiceException;
 import com.nis.restful.ServiceRuntimeException;
-import com.nis.util.Constants;
-import com.nis.util.DateUtils;
-import com.nis.util.ExceptionUtil;
-import com.nis.util.JsonMapper;
-import com.nis.util.StringUtils;
+import com.nis.util.*;
 import com.nis.web.controller.BaseRestController;
 import com.nis.web.service.AuditLogThread;
 import com.nis.web.service.ServicesRequestLogService;
@@ -44,6 +15,18 @@ import com.nis.web.service.restful.DashboardService;
 import com.wordnik.swagger.annotations.Api;
 import com.wordnik.swagger.annotations.ApiOperation;
 import com.zdjizhi.utils.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @SuppressWarnings("all")
 @RestController
@@ -1074,11 +1057,19 @@ public class DashboardServiceController extends BaseRestController {
 		try {
 			// 验证
 			checkAppTrendCondition(entity);
-			if (StringUtil.isEmpty(entity.getSearchStartTime()) && StringUtil.isEmpty(entity.getSearchEndTime())) {
+
+			if (StringUtil.isBlank(entity.getSearchStartTime()) && StringUtil.isBlank(entity.getSearchEndTime())) {
+				Map<String, String> map = DateUtils.getLocalTime(null, null, Constants.LOG_LOCAL_TIME, "hour");
+				entity.setSearchStartTime(map.get("startTime"));
+				entity.setSearchEndTime(map.get("endTime"));
+			} else {
+				//显示最近1小时APP Top100,clickhouse扩容后开放
 				Map<String, String> map = DateUtils.getLocalTime(null, null, Constants.LOG_LOCAL_TIME, "hour");
 				entity.setSearchStartTime(map.get("startTime"));
 				entity.setSearchEndTime(map.get("endTime"));
 			}
+
+
 			// 查询运营商编码所对应的设备号跟出入口编号
 			String ispNum = "";
 			if (StringUtils.isNotBlank(entity.getSearchIspCode())) {
diff --git a/src/main/java/com/nis/web/service/LogDataService.java b/src/main/java/com/nis/web/service/LogDataService.java
index 2db7dbd..5f47afe 100644
--- a/src/main/java/com/nis/web/service/LogDataService.java
+++ b/src/main/java/com/nis/web/service/LogDataService.java
@@ -350,7 +350,11 @@ public class LogDataService {
 									if (type.equals("java.lang.String")) {
 
 										if (field.contains("url")
-												|| field.equals("website")) {
+												|| field.equals("website")
+												|| field.equals("mail_from")
+												|| field.equals("mail_to")
+												|| field.equals("subject")
+												) {
 											whereSB.append(" and "
 													+ field
 													+ " like '%"
@@ -983,7 +987,11 @@ public class LogDataService {
 									if (type.equals("java.lang.String")) {
 
 										if (field.contains("url")
-												|| field.equals("website")) {
+												|| field.equals("website")
+												|| field.equals("mail_from")
+												|| field.equals("mail_to")
+												|| field.equals("subject")
+												) {
 											whereSB.append(" and "
 													+ field
 													+ " like '%"