From b8a3a680f3e6720a8329bfaae571b09659aace52 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 09 四月 2025 19:47:55 +0800
Subject: [PATCH] 开发推流拉流工具类

---
 ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/PlaybackMsgController.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/PlaybackMsgController.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/PlaybackMsgController.java
index 5ee471f..0a349a0 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/PlaybackMsgController.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/PlaybackMsgController.java
@@ -15,7 +15,10 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 
 /**
  * @author zhibing.pu
@@ -48,13 +51,13 @@
 	@PostMapping("/playbackMsgStartup")
 	public R<UPPlaybackMsgStartupAckVo> playbackMsgStartup(@RequestParam("inferiorPlatformId") Integer inferiorPlatformId, @RequestParam("vehicleNo") String vehicleNo,
 	                                                       @RequestParam("startTime") Long startTime, @RequestParam("endTime") Long endTime) {
-		R r = downPlaybackMsgStartupService.playbackMsgStartup(inferiorPlatformId, vehicleNo, startTime, endTime);
+		R<String> r = downPlaybackMsgStartupService.playbackMsgStartup(inferiorPlatformId, vehicleNo, startTime, endTime);
 		if (200 != r.getCode()) {
-			return r;
+			return R.fail(r.getMsg());
 		}
 		//发送成功,定时任务获取响应结果
 		int num = 0;
-		LocalDateTime now = LocalDateTime.now();
+		Long now = LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8));
 		while (true) {
 			UPPlaybackMsgStartupAck upPlaybackMsgStartupAck = upPlaybackMsgStartupAckDao.findByInferiorPlatformIdAndVehicleNoAndCreateTimeAfter(inferiorPlatformId, vehicleNo, now);
 			if (null == upPlaybackMsgStartupAck) {
@@ -72,6 +75,13 @@
 					case 0:
 						UPPlaybackMsgStartupAckVo vo = new UPPlaybackMsgStartupAckVo();
 						BeanUtils.copyProperties(upPlaybackMsgStartupAck, vo);
+						String encode = null;
+						try {
+							encode = URLEncoder.encode(vehicleNo, "UTF-8");
+						} catch (UnsupportedEncodingException e) {
+							throw new RuntimeException(e);
+						}
+						vo.setUrl("http://" + vo.getServerIP() + ":" + vo.getServerPort() + "/" + encode + "." + vo.getVehicleColor() + ".1.0." + r.getData());
 						return R.ok(vo);
 					case 1:
 						return R.fail("失败");
@@ -112,7 +122,7 @@
 		}
 		//发送成功,定时任务获取响应结果
 		int num = 0;
-		LocalDateTime now = LocalDateTime.now();
+		long now = LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8));
 		while (true) {
 			UPPlaybackMsgControlAck upPlaybackMsgControlAck = upPlaybackMsgControlAckDao.findByInferiorPlatformIdAndVehicleNoAndCreateTimeAfter(inferiorPlatformId, vehicleNo, now);
 			if (null == upPlaybackMsgControlAck) {

--
Gitblit v1.7.1