Browse Source

增加经纬 心跳配置 修改bug 回复bug

jianghouwei 6 years ago
parent
commit
fa22b622b7

+ 8 - 8
src/main/java/com/tidecloud/dataacceptance/service/impl/WatchJWServerHandler.java

@@ -246,16 +246,16 @@ public class WatchJWServerHandler extends HexBinaryAcceptanceHandlerAdapter {
      */
     protected void sendApthReplyToClient(String deviceId, Channel channel) {
         try {
-            if (beatMap.isEmpty()
-                    || !beatMap.containsKey(deviceId)
-                    || beatMap.get(deviceId) == 1) {
-                //  时间校验  1: 是否需要下发心率获取
-                Boolean lag = deviceCronClient.getSendApThByDeviceId(deviceId);
-                if (lag) {
+            //  时间校验  1: 是否需要下发心率获取
+            Boolean lag = deviceCronClient.getSendApThByDeviceId(deviceId);
+            if (lag) {
+                if (beatMap.isEmpty()
+                        || !beatMap.containsKey(deviceId)
+                        || 1 == beatMap.get(deviceId)) {
                     setBPXLToClient(deviceId, channel);
-                } else {
-                    beatMap.remove(deviceId);
                 }
+            } else {
+                beatMap.remove(deviceId);
             }
         } catch (Exception e) {
             logger.error("心率下行发送异常!!!!! deviceId=" + deviceId);