From 5d6fa137babae3e8d36279121d1a05dbc219fde1 Mon Sep 17 00:00:00 2001 From: doufenghu Date: Thu, 21 Feb 2019 21:11:52 +0600 Subject: [PATCH] =?UTF-8?q?fix:=E5=8D=95=E5=90=91=E6=B5=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=BF=90=E8=90=A5=E5=95=86=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/domain/restful/NtcConnRecordPercent.java | 3 ++- .../nis/web/controller/restful/NtcLogSearchController.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/nis/domain/restful/NtcConnRecordPercent.java b/src/main/java/com/nis/domain/restful/NtcConnRecordPercent.java index 2c7aa30..9ba5850 100644 --- a/src/main/java/com/nis/domain/restful/NtcConnRecordPercent.java +++ b/src/main/java/com/nis/domain/restful/NtcConnRecordPercent.java @@ -25,7 +25,7 @@ public class NtcConnRecordPercent implements Serializable { private String searchFoundStartTime;// 开始发现时间 private String searchFoundEndTime;// 结束发现时间 private String searchEntranceId; - protected String searchIspCode;// 运营商 + private String searchIspCode;// 运营商 public String getBps() { return bps; @@ -84,6 +84,7 @@ public class NtcConnRecordPercent implements Serializable { public void setSearchEntranceId(String searchEntranceId) { this.searchEntranceId = searchEntranceId; } + @JsonIgnore public String getSearchIspCode() { return searchIspCode; diff --git a/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java b/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java index 09b30cd..8445fdf 100644 --- a/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java +++ b/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java @@ -711,8 +711,8 @@ public class NtcLogSearchController extends BaseRestController { AuditLogThread auditLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, null); try { - if (StringUtil.isEmpty(ntcConnRecordPercent.getSearchFoundStartTime()) - && StringUtil.isEmpty(ntcConnRecordPercent.getSearchFoundEndTime())) { + if (StringUtil.isBlank(ntcConnRecordPercent.getSearchFoundStartTime()) + && StringUtil.isBlank(ntcConnRecordPercent.getSearchFoundEndTime())) { Map map = DateUtils.getLocalTime(null, null, Constants.LOG_LOCAL_TIME, "minute"); ntcConnRecordPercent.setSearchFoundStartTime(map.get("startTime")); ntcConnRecordPercent.setSearchFoundEndTime(map.get("endTime"));