|
@@ -122,6 +122,7 @@ public class WatchJWServerHandler extends HexBinaryAcceptanceHandlerAdapter {
|
|
|
swm.setSwitchTime(time);
|
|
|
switchMap.put(deviceId, swm);
|
|
|
}
|
|
|
+ voiceReplyToClient(deviceId, channel);//语音下行发送
|
|
|
}
|
|
|
switch (type) {
|
|
|
case "AP00": // 初始化登录
|
|
@@ -132,7 +133,6 @@ public class WatchJWServerHandler extends HexBinaryAcceptanceHandlerAdapter {
|
|
|
checkSwitchMap(factory, deviceId, channel);// 心跳校验 下发报文
|
|
|
sendMsg2Kafka((msg + deviceId + "," + DateUtil.formatDate2String(new Date())).getBytes(), deviceId, channel);// 心跳报文下发
|
|
|
logger.warn("心跳报文下发 msg+" + msg);
|
|
|
- voiceReplyToClient(deviceId, channel);//语音下行发送
|
|
|
sendApthReplyToClient(deviceId, channel);
|
|
|
break;
|
|
|
case "AP01": // 位置信息
|
|
@@ -202,7 +202,7 @@ public class WatchJWServerHandler extends HexBinaryAcceptanceHandlerAdapter {
|
|
|
voiceMsg = voiceMsgClient.queryVoiceMsg(deviceId, ap28Msg.getNu() + 1);
|
|
|
} else {
|
|
|
// 更新数据状态为发送完毕
|
|
|
- voiceMsgClient.updateVoiceMsgSendFinish(deviceId, ap28Msg.getMsgId());
|
|
|
+ voiceMsgClient.updateVoiceMsgSendFinish(deviceId, ap28Msg.getMsgId(), 4);
|
|
|
}
|
|
|
} else {
|
|
|
// 回复上个语音包
|
|
@@ -233,6 +233,8 @@ public class WatchJWServerHandler extends HexBinaryAcceptanceHandlerAdapter {
|
|
|
VoiceMsgVo voiceF = voiceMsgClient.queryVoiceMsg(deviceId, 1);
|
|
|
if (voiceF.getLag() == 1) {
|
|
|
normalBP28Reply(channel, voiceF);
|
|
|
+ // 更新数据状态为发送完毕
|
|
|
+ voiceMsgClient.updateVoiceMsgSendFinish(deviceId, voiceF.getMsgId(), 3);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
logger.error("语音下行发送异常!!!!! deviceId=" + deviceId);
|