Merge branch 'master' of http://106.15.194.121:8083/sunke/smf-core

src/main/java/com/neotel/smfcore/common/utils/ReelLockPosUtil.java

 package com.neotel.smfcore.common.utils;
 
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.common.bean.ReelLockPosInfo;
 import org.apache.logging.log4j.LogManager;
@@ -25,15 +26,15 @@ public class ReelLockPosUtil {
     /**
      * 料盘锁定库位信息,用于包装料分配到其他料仓
      */
-    private static Map<String, ReelLockPosInfo> reelLocKPosMap;
+    private static Map<String, ReelLockPosInfo> reelLocKPosMap = Maps.newConcurrentMap();
 
 
     @PostConstruct
     public void init() {
         dataCache = autodataCache;
-        reelLocKPosMap=dataCache.getCache(REEL_LOCK_POS_MAP_KEY);
-        if(reelLocKPosMap==null){
-            reelLocKPosMap=new HashMap<String,ReelLockPosInfo>(){};
+        Map<String, ReelLockPosInfo> cacheReelLocKPosMap = dataCache.getCache(REEL_LOCK_POS_MAP_KEY);
+        if (cacheReelLocKPosMap != null) {
+            reelLocKPosMap.putAll(cacheReelLocKPosMap);
         }
     }