修改视频播放bug

Pu Zhibing

2025-04-11 2b4f8907a65c347400432c8db1bccb97c6a26d30

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CarController.java

@@ -1,5 +1,6 @@
package com.ruoyi.system.controller;

import cn.hutool.core.io.FileUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
@@ -24,6 +25,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -31,6 +33,8 @@
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.io.File;
import java.io.IOException;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
@@ -48,7 +52,23 @@
@RequestMapping("/car")
public class CarController {
   
   private String outputUrl = "F:\\nginx 1.7.11.3 Gryphon\\html\\";
   @Value("${live.hls.output-path}")
   private String hlsOutputPath;
	
   @Value("${live.hls.ip}")
   private String hlsIp;
	
   @Value("${live.hls.port}")
   private Integer hlsPort;
	
   @Value("${live.flv.ip}")
   private String flvIp;
	
   @Value("${live.flv.rtmp-port}")
   private Integer flvRtmpPort;
	
   @Value("${live.flv.http-port}")
   private Integer flvHttpPort;
   @Resource
   private ICarService carService;
   @Resource
@@ -106,23 +126,22 @@
      if (null == car) {
         return R.fail("失败");
      }
      //手动加一次状态数据，避免定时任务结束任务线程
      redisTemplate.opsForValue().set("live:" + id, true, 1, TimeUnit.MINUTES);
      Enterprise enterprise = enterpriseService.getById(car.getEnterpriseId());
      R<UPRealvideoMsgStartupAckVo> msgStartupAckVoR = realVideoMsgClient.startupRealVideo(Integer.valueOf(enterprise.getCode()), car.getVehicleNumber());
      if (200 == msgStartupAckVoR.getCode()) {
         UPRealvideoMsgStartupAckVo data = msgStartupAckVoR.getData();
			
         RealVideoResp resp = new RealVideoResp();
         String url = "rtmp://192.168.110.85:1935/flv-live/" + car.getVehicleNumber();
         //执行拉流和推流
         ExecutorService executorService = new ThreadPoolExecutor(1, 1,
               0L, TimeUnit.MILLISECONDS,
               new LinkedBlockingQueue<Runnable>());
         executorService.execute(new Runnable() {
            @Override
            public void run() {
               JavaCVStreamUtil.push_flv(data.getUrl(), url, id);
            }
         });
         resp.setUrl(url);
//         live_hls(data.getUrl(), car);
//         resp.setServerIp(hlsIp);
//         resp.setServerPort(hlsPort);
			
         live_flv(data.getUrl(), car.getId());
         resp.setServerIp(flvIp);
         resp.setServerPort(flvHttpPort);
         return R.ok(resp);
      }
      
@@ -135,13 +154,26 @@
   @ApiImplicitParams({
         @ApiImplicitParam(value = "车辆id", name = "id", required = true)
   })
   public R closeRealVideo(@PathVariable("id") Integer id){
      JavaCVStreamUtil.close(id);
   public R closeRealVideo(@PathVariable("id") Integer id) {
      Car car = carService.getById(id);
      if (null == car) {
         return R.fail("失败");
      }
      String folderPath = hlsOutputPath + "hls\\" + car.getVehicleNumber();
      JavaCVStreamUtil.close(id, folderPath);
      return R.ok();
   }
   
   
	
   @GetMapping("/playDetection/{id}")
   @ApiOperation(value = "播放检测", tags = {"车辆管理"})
   @ApiImplicitParams({
         @ApiImplicitParam(value = "车辆id", name = "id", required = true)
   })
   public R playDetection(@PathVariable("id") Integer id) {
      redisTemplate.opsForValue().set("live:" + id, true, 1, TimeUnit.MINUTES);
      return R.ok();
   }
   
   
   @GetMapping("/getPlaybackVideo")
@@ -151,24 +183,22 @@
      if (null == car) {
         return R.fail("失败");
      }
      //手动加一次状态数据，避免定时任务结束任务线程
      redisTemplate.opsForValue().set("live:" + req.getId(), true, 1, TimeUnit.MINUTES);
      Enterprise enterprise = enterpriseService.getById(car.getEnterpriseId());
      R<UPPlaybackMsgStartupAckVo> startupAckVoR = playbackMsgClient.playbackMsgStartup(Integer.valueOf(enterprise.getCode()), car.getVehicleNumber(),
            req.getStartTime(), req.getEndTime());
      if (200 == startupAckVoR.getCode()) {
         UPPlaybackMsgStartupAckVo data = startupAckVoR.getData();
         RealVideoResp resp = new RealVideoResp();
         String url = "rtmp://192.168.110.85:1935/flv-live/" + car.getVehicleNumber();
         //执行拉流和推流
         ExecutorService executorService = new ThreadPoolExecutor(1, 1,
               0L, TimeUnit.MILLISECONDS,
               new LinkedBlockingQueue<Runnable>());
         executorService.execute(new Runnable() {
            @Override
            public void run() {
               JavaCVStreamUtil.push_flv(data.getUrl(), url, req.getId());
            }
         });
         resp.setUrl(url);
//         live_hls(data.getUrl(), car);
//         resp.setServerIp(hlsIp);
//         resp.setServerPort(hlsPort);
			
         live_flv(data.getUrl(), car.getId());
         resp.setServerIp(flvIp);
         resp.setServerPort(flvHttpPort);
         return R.ok(resp);
      }
      return R.fail(startupAckVoR.getMsg());
@@ -261,4 +291,46 @@
      }
      return R.ok(list);
   }
	
	
   public void live_hls(String input, Car car){
      String path = hlsOutputPath + "hls\\" + car.getVehicleNumber() + "\\live.m3u8";
      String folderPath = hlsOutputPath + "hls\\" + car.getVehicleNumber();
      FileUtil.mkParentDirs(path);
      File file = new File(path);
      if (!file.exists()) {
         try {
            file.createNewFile();
         } catch (IOException e) {
            throw new RuntimeException(e);
         }
      }

      //执行拉流和推流
      ExecutorService executorService = new ThreadPoolExecutor(1, 1,
            0L, TimeUnit.MILLISECONDS,
            new LinkedBlockingQueue<Runnable>());
      executorService.execute(new Runnable() {
         @Override
         public void run() {
            JavaCVStreamUtil.push_hls(input, path, car.getId(), folderPath);
         }
      });
      carService.taskPlayDetection(car.getId());
   }
	
   public void live_flv(String input, Integer id){
      String url = "rtmp://" + flvIp + ":" + flvRtmpPort + "/flv/" + id;
      //执行拉流和推流
      ExecutorService executorService = new ThreadPoolExecutor(1, 1,
            0L, TimeUnit.MILLISECONDS,
            new LinkedBlockingQueue<Runnable>());
      executorService.execute(new Runnable() {
         @Override
         public void run() {
            JavaCVStreamUtil.push_flv(input, url, id);
         }
      });
      carService.taskPlayDetection(id);
   }
}