From 5393e1b43f7148adc93dd5a29f7b6fd4a054eec6 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期四, 05 六月 2025 16:13:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/DOWNPlaybackMsgStartupService.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/DOWNPlaybackMsgStartupService.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/DOWNPlaybackMsgStartupService.java index da6f776..b5c8821 100644 --- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/DOWNPlaybackMsgStartupService.java +++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/DOWNPlaybackMsgStartupService.java @@ -38,7 +38,7 @@ * @param vehicleNo * @return */ - public R playbackMsgStartup(Integer inferiorPlatformId, String vehicleNo, Long startTime, Long endTime) { + public R<String> playbackMsgStartup(Integer inferiorPlatformId, String vehicleNo, Long startTime, Long endTime) { Channel channel = ChannelMap.getClientChannel(inferiorPlatformId); if (!channel.isActive()) { return R.fail("失败"); @@ -63,9 +63,9 @@ downPlaybackMsgStartup.setAuthorizeCode(authorizeMsgStartup.getAuthorizeCode1()); downPlaybackMsgStartup.setGnssData(""); byte[] body = downPlaybackMsgStartup.encode(); - OuterPacket out = new OuterPacket(DataType.DOWN_PLAYBACK_MSG.getCode(), body); + OuterPacket out = new OuterPacket(DataType.DOWN_PLAYBACK_MSG.getCode(), inferiorPlatformId, body); channel.writeAndFlush(out); log.info("远程录像回放请求({}):{}", DataType.DOWN_PLAYBACK_MSG_STARTUP.getCode(), JSON.toJSONString(downPlaybackMsgStartup)); - return R.ok(); + return R.ok(authorizeMsgStartup.getAuthorizeCode1()); } } -- Gitblit v1.7.1