From cd8664e7fbbbb94e5b3ad4380361261176b288da Mon Sep 17 00:00:00 2001
From: zhouxiunai <154707516@qq.com>
Date: Mon, 21 Jan 2019 19:04:06 +0800
Subject: [PATCH] =?UTF-8?q?CollectionUtils=20=E4=BF=AE=E6=94=B9=E4=B8=BAsp?=
 =?UTF-8?q?ring=20=E6=A1=86=E6=9E=B6=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gzzn/omms/msgexchangeapi/scheduled/FlightHisScheduled.java  | 2 +-
 .../msgexchangeapi/service/flightInfo/FlightHisServiceImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/scheduled/FlightHisScheduled.java b/src/main/java/com/gzzn/omms/msgexchangeapi/scheduled/FlightHisScheduled.java
index 63b3eed4..394ce8bd 100644
--- a/src/main/java/com/gzzn/omms/msgexchangeapi/scheduled/FlightHisScheduled.java
+++ b/src/main/java/com/gzzn/omms/msgexchangeapi/scheduled/FlightHisScheduled.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.collections.CollectionUtils;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.slf4j.Logger;
@@ -13,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import com.alibaba.fastjson.JSONObject;
 import com.gzzn.omms.msgexchangeapi.elasticsearch.ElasticsearchUtil;
diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/FlightHisServiceImpl.java b/src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/FlightHisServiceImpl.java
index 2ef0af2d..91f47034 100644
--- a/src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/FlightHisServiceImpl.java
+++ b/src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/FlightHisServiceImpl.java
@@ -4,9 +4,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
-import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.gzzn.omms.msgexchangeapi.entity.msg.DIVERSIONDATA;