信标优化和测试

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/netty/NettyServerHandler.java

@@ -92,9 +92,12 @@ public class NettyServerHandler implements ChannelInboundHandler {
         }else if(JsonUtils.isJsonString(dataStr)){
             beaconMate.sendBeaconMate(dataStr);
         }else{
-            if(dataStr.indexOf("{")>-1 && dataStr.lastIndexOf("}")==-1){
+            if(dataStr.indexOf("{") > -1 && dataStr.lastIndexOf("}") == -1){
                 ChannelMapJson.getChannelMap().put(channelHandlerContext,dataStr);
-            }else if(dataStr.indexOf("{")==-1 && dataStr.lastIndexOf("}")>-1){
+            }else if(dataStr.indexOf("{") == -1 && dataStr.lastIndexOf("}") == -1){
+                String newDataStr = ChannelMapJson.getChannelMap().get(channelHandlerContext)+dataStr;
+                ChannelMapJson.getChannelMap().put(channelHandlerContext,newDataStr);
+            }else if(dataStr.indexOf("{") == -1 && dataStr.lastIndexOf("}") > -1){
                 if(ChannelMapJson.getChannelMap().get(channelHandlerContext)!=null){
                     String newDataStr = ChannelMapJson.getChannelMap().get(channelHandlerContext)+dataStr;
                     beaconMate.sendBeaconMate(newDataStr);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/socket/service/impl/BeaconMateImpl.java

@@ -91,7 +91,7 @@ public class BeaconMateImpl implements BeaconMate {
                                         if(beaconList.get(x).get("beaconTag").equals(beaconStr)){
                                             log.info("{} 4.=====================================》上报的信标处理后返回信标编码："+beaconStr+"; {} 实验室下匹配后的信标："+beaconList.get(x).get("beaconTag"),uuid,subId);
                                             // redis存储蓝牙信标编码和实验室id和mac地址
-                                            redisService.setCacheObject(BaseConstants.BEACON_MATE_DET+"~"+ beaconStr+"~"+subId+"~"+beaconList.get(x).get("gasName"),beaconStr, 10L, TimeUnit.MINUTES);
+                                            redisService.setCacheObject(BaseConstants.BEACON_MATE_DET+"~"+ beaconStr+"~"+subId+"~"+beaconList.get(x).get("gasName"),beaconStr, 30L, TimeUnit.MINUTES);
                                             // 循环信标通知，把还回来的气瓶提示移除。
                                             if(beaconNoticeList != null){
                                                 for(Map notice:beaconNoticeList){