Merge branch 'master' of git@git.int.it2000.com.cn:airport-chengdu/msgexchange-api.git

src/main/java/com/gzzn/omms/msgexchangeapi/scheduled/FlightHisScheduled.java

@@ -1,6 +1,5 @@
 package com.gzzn.omms.msgexchangeapi.scheduled;
 
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -78,7 +77,7 @@ public class FlightHisScheduled {
 		logger.info("开始采集历史数据...");
         //1.从redis中获取 当前的动态消息
 		List<FLTR> fltrs = flightInfoService.findAll();
-		List<BigInteger> fltrIdForHistory = new ArrayList<BigInteger>();
+		List<String> fltrIdForHistory = new ArrayList<String>();
 		List<FLTR> fltrsHistory = new ArrayList<FLTR>();
 		
 		//遍历   查找出已经 可以作为历史数据的动态消息
@@ -161,11 +160,11 @@ public class FlightHisScheduled {
 						Map<String, Object> map = listInEs.get(0);
 						String id = (String) map.get("id");
 						ElasticsearchUtil.updateDataById(jsondata, INDEX_NAME, ES_TYPE, id);
-						fltrIdForHistory.add(fltr.getFLID());
+						fltrIdForHistory.add(fltr.getFLID().toString());
 					}else{
 						//新增历史数据
 						ElasticsearchUtil.addData(jsondata, INDEX_NAME, ES_TYPE);
-						fltrIdForHistory.add(fltr.getFLID());
+						fltrIdForHistory.add(fltr.getFLID().toString());
 					}
 				}
 			}

src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/FlightInfoServiceImpl.java

@@ -1,6 +1,5 @@
 package com.gzzn.omms.msgexchangeapi.service.flightInfo;
 
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -88,7 +87,7 @@ public class FlightInfoServiceImpl implements IFlightInfoService {
 	}
 	
 	@Override
-	public boolean batchDeleteFltr(List<BigInteger> flids) {
+	public boolean batchDeleteFltr(List<String> flids) {
 		if(null!=flids){
 			flids.removeAll(Collections.singleton(null));
 		}

src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/IFlightInfoService.java

@@ -1,6 +1,5 @@
 package com.gzzn.omms.msgexchangeapi.service.flightInfo;
 
-import java.math.BigInteger;
 import java.util.List;
 
 import com.gzzn.omms.msgexchangeapi.entity.Cminmsg;
@@ -45,5 +44,5 @@ public interface IFlightInfoService {
    * @param flids
    * @return
    */
-  public boolean batchDeleteFltr(List<BigInteger> flids);
+  public boolean batchDeleteFltr(List<String> flids);
 }