From 6d6eb60cd9ab40d41675bcf8f80c4b5f9cf03e8b Mon Sep 17 00:00:00 2001
From: zhouxiunai <154707516@qq.com>
Date: Wed, 12 Dec 2018 10:15:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96redis=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?=E8=88=AA=E7=8F=AD=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?map=E7=B1=BB=E5=9E=8B=E3=80=82=E9=81=BF=E5=85=8D=E4=B8=8D?=
 =?UTF-8?q?=E5=BF=85=E8=A6=81=E7=9A=84=E7=BD=91=E7=BB=9C=E4=BC=A0=E8=BE=93?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flightInfo/FlightInfoServiceImpl.java     | 70 ++++++-------------
 1 file changed, 20 insertions(+), 50 deletions(-)

diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/FlightInfoServiceImpl.java b/src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/FlightInfoServiceImpl.java
index b90e38b8..4c0356dc 100644
--- a/src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/FlightInfoServiceImpl.java
+++ b/src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/FlightInfoServiceImpl.java
@@ -1,9 +1,10 @@
 package com.gzzn.omms.msgexchangeapi.service.flightInfo;
 
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Set;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,71 +40,40 @@ public class FlightInfoServiceImpl implements IFlightInfoService {
                 .getSCHD()
                 .getFLTR();
 		
-        for(SCHD.FLTR fltr : lsFltr)
-        {
-          Boolean result = redisSet(fltr);
-          if(result == false)
-          {
-        	  return false;
-          }
-        }//end for
-        
-        return true;
+        Map<String, Object> mapFltr = new HashMap();
+		for(FLTR fltr : lsFltr) 
+		{
+			mapFltr.put(fltr.getFLID().toString(), fltr);
+		}
+		return redisService.hmset(redisKey, mapFltr);
 	} //end function
 	
 	
 	@Override
 	public SCHD.FLTR getByFlid(String flid) {
-		SCHD.FLTR fltr = (SCHD.FLTR) redisGet(flid);
+		SCHD.FLTR fltr = (SCHD.FLTR) redisService.hget(redisKey, flid);
 		return fltr;
 	}
 
 
 	@Override
 	public boolean saveFltr(SCHD.FLTR fltr) {
-		return redisSet(fltr);
+		return redisService.hset(redisKey, fltr.getFLID().toString(),(Object)fltr);
 	}
 	
 	
-	/**
-	 * 重新包装的set
-	 * @param fltr
-	 * @return
-	 */
-	private boolean redisSet(SCHD.FLTR fltr) 
-	{
-		return redisService.set(redisKey + fltr.getFLID(), fltr);
-	}
 	
-	/**
-	 * 重新包装的get
-	 * @param flid
-	 * @return
-	 */
-	private Object redisGet(String flid) 
-	{
-		return redisService.get(redisKey + flid);
-	}
-	
-	/**
-	 * 情况所有动态航班信息
-	 */
-	private void removeAll()
-	{
-		Set<String> keys = redisService.keys(redisKey + "*");
-		redisService.del(keys);
-	}
-
-
 	@Override
 	public List<SCHD.FLTR> findAll() {
-		Set<String> keys = redisService.keys(redisKey + "*");
 		
-		List<SCHD.FLTR> lsResult = new ArrayList();
-		keys.forEach(key->{
-			SCHD.FLTR fltr = (SCHD.FLTR) redisService.get(key);
-			lsResult.add(fltr);
-		});
+		Map<Object,Object>  mapResult =  redisService.hmget(redisKey);
+		if(mapResult == null)
+		{
+			throw new RuntimeException("findAll fltr from redis fail");
+		}
+		
+		Collection<Object> valueCollection = mapResult.values();
+		List<SCHD.FLTR> lsResult = new ArrayList(valueCollection);
 		
 		return lsResult;
 	}//end method
@@ -111,7 +81,7 @@ public class FlightInfoServiceImpl implements IFlightInfoService {
 
 	@Override
 	public boolean deleteFltr(FLTR fltr) {
-		redisService.del(Arrays.asList(redisKey + fltr.getFLID()));
+		redisService.hdel(redisKey, fltr.getFLID());
 		return true;
 	}
 }