summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoufenghu <[email protected]>2019-02-21 21:11:52 +0600
committerdoufenghu <[email protected]>2019-02-21 21:11:52 +0600
commit5d6fa137babae3e8d36279121d1a05dbc219fde1 (patch)
tree6d153d4c1889b73abf9323f2a819a4f5f02dd9d6
parented6ef2de1377f2b4936e62b8fed08308cc9c0357 (diff)
fix:单向流查询运营商增加
-rw-r--r--src/main/java/com/nis/domain/restful/NtcConnRecordPercent.java3
-rw-r--r--src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java4
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<String, String> map = DateUtils.getLocalTime(null, null, Constants.LOG_LOCAL_TIME, "minute");
ntcConnRecordPercent.setSearchFoundStartTime(map.get("startTime"));
ntcConnRecordPercent.setSearchFoundEndTime(map.get("endTime"));