| 
					
				 | 
			
			
				@@ -133,7 +133,7 @@ public class WatchJWServerHandler extends HexBinaryAcceptanceHandlerAdapter { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     sendMsg2Kafka((msg + deviceId + "," + DateUtil.formatDate2String(new Date())).getBytes(), deviceId, channel);// 心跳报文下发 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     logger.warn("心跳报文下发 msg+" + msg); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     voiceReplyToClient(deviceId, channel);//语音下行发送 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    snedApthReplyToClient(deviceId, channel); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    sendApthReplyToClient(deviceId, channel); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     break; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 case "AP01": // 位置信息 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     String gpsState = msg.substring(12, 13); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -244,19 +244,18 @@ public class WatchJWServerHandler extends HexBinaryAcceptanceHandlerAdapter { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @param deviceId 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @param channel 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    protected void snedApthReplyToClient(String deviceId, Channel channel) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    protected void sendApthReplyToClient(String deviceId, Channel channel) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (!beatMap.isEmpty() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    || beatMap.containsKey(deviceId) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    || Integer.valueOf(2).equals(beatMap.get(deviceId))) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            //  时间校验  1: 是否需要下发心率获取 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            Boolean lag = deviceCronClient.getSendApThByDeviceId(deviceId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (lag) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                setBPXLToClient(deviceId, channel); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                beatMap.remove(deviceId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (beatMap.isEmpty() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    || !beatMap.containsKey(deviceId) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    || beatMap.get(deviceId) == 1) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                //  时间校验  1: 是否需要下发心率获取 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                Boolean lag = deviceCronClient.getSendApThByDeviceId(deviceId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if (lag) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    setBPXLToClient(deviceId, channel); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    beatMap.remove(deviceId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } catch (Exception e) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             logger.error("心率下行发送异常!!!!! deviceId=" + deviceId); 
			 |