فهرست منبع

lapi配置修改

zhengqiang 5 سال پیش
والد
کامیت
7b12c3025b

+ 5 - 5
lapi/src/main/java/com/jpsoft/smart/lapi/config/LapiConfig.java

@@ -11,9 +11,9 @@ import java.util.concurrent.ConcurrentHashMap;
 @Component
 @Configuration
 public class LapiConfig {
-    @Bean(name="activeLapiChannelMap")
-    public Map<String, LapiChannel> activeLapiChannelMap(){
-        Map<String, LapiChannel> channelMap = new ConcurrentHashMap<>();
-        return channelMap;
-    }
+//    @Bean(name="activeLapiChannelMap")
+//    public Map<String, LapiChannel> activeLapiChannelMap(){
+//        Map<String, LapiChannel> channelMap = new ConcurrentHashMap<>();
+//        return channelMap;
+//    }
 }

+ 2 - 4
lapi/src/main/java/com/jpsoft/smart/lapi/handler/ResponseDataHandler.java

@@ -4,6 +4,7 @@ import cn.hutool.json.JSONObject;
 import com.jpsoft.smart.lapi.dto.LapiResponse;
 import com.jpsoft.smart.modules.lapi.channel.LapiAttrKeys;
 import com.jpsoft.smart.modules.lapi.channel.LapiChannel;
+import com.jpsoft.smart.modules.lapi.utils.LapiSessionUtil;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
@@ -17,9 +18,6 @@ import java.util.concurrent.BlockingQueue;
 @Component
 @ChannelHandler.Sharable
 public class ResponseDataHandler extends SimpleChannelInboundHandler<LapiResponse> {
-    @Autowired
-    private Map<String, LapiChannel> activeLapiChannelMap;
-
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, LapiResponse msg) throws Exception {
         JSONObject jsonObject = msg.getData();
@@ -27,7 +25,7 @@ public class ResponseDataHandler extends SimpleChannelInboundHandler<LapiRespons
         String uri = jsonObject.getJSONObject("Response").get("ResponseURL").toString();
         String deviceNo = ctx.channel().attr(LapiAttrKeys.DEVICE_NO).get();
 
-        BlockingQueue<String> queue = activeLapiChannelMap.get(deviceNo).getReceivePacketQueue(uri);
+        BlockingQueue<String> queue = LapiSessionUtil.get(deviceNo).getReceivePacketQueue(uri);
 
         queue.put(jsonObject.toString());
     }