修改bug

Pu Zhibing

7 天以前 1ee76c252f2dbba62e0ec34cccf9eaac51de9083

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

@@ -1,10 +1,10 @@
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;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.dataInterchange.api.feignClient.HaiKangClient;
import com.ruoyi.dataInterchange.api.feignClient.PlaybackMsgClient;
import com.ruoyi.dataInterchange.api.feignClient.RealVideoMsgClient;
import com.ruoyi.dataInterchange.api.feignClient.UPExgMsgRealLocationClient;
@@ -21,7 +21,6 @@
import com.ruoyi.system.service.ICarTypeService;
import com.ruoyi.system.service.IDriverService;
import com.ruoyi.system.service.IEnterpriseService;
import com.ruoyi.system.util.JavaCVStreamUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -33,15 +32,10 @@
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;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;

/**
@@ -52,14 +46,23 @@
@RequestMapping("/car")
public class CarController {
   
   @Value("${live.output.path}")
   private String outputPath;
   @Value("${live.hls.output-path}")
   private String hlsOutputPath;
   
   @Value("${live.ip}")
   private String liveIp;
   @Value("${live.hls.ip}")
   private String hlsIp;
   
   @Value("${live.port}")
   private Integer livePort;
   @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
@@ -76,6 +79,9 @@
   private ICarTypeService carTypeService;
   @Resource
   private RedisTemplate redisTemplate;
	
   @Resource
   private HaiKangClient haiKangClient;
   
   @GetMapping("/getCarList")
   @ApiOperation(value = "获取车辆列表", tags = {"车辆管理"})
@@ -98,6 +104,7 @@
      Driver driver = driverService.getOne(new LambdaQueryWrapper<Driver>().eq(Driver::getVehicleNumber, car.getVehicleNumber()).eq(Driver::getStatus, 1));
      Enterprise enterprise = enterpriseService.getById(car.getEnterpriseId());
      car.setEnterpriseName(enterprise.getName());
      car.setCompanyCode(enterprise.getCode());
      if (null != driver) {
         car.setDriverName(driver.getName());
         car.setDriverPhone(driver.getPhone());
@@ -115,43 +122,37 @@
   public R<RealVideoResp> getRealVideo(@PathVariable("id") Integer id) {
      Car car = carService.getById(id);
      if (null == car) {
         return R.fail("失败");
         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()) {
         String path = outputPath + "hls\\" + car.getVehicleNumber() + "\\live.m3u8";
         String folderPath = outputPath + "hls\\" + car.getVehicleNumber();
         FileUtil.mkParentDirs(path);
         File file = new File(path);
         if (!file.exists()) {
            try {
               file.createNewFile();
            } catch (IOException e) {
               throw new RuntimeException(e);
            }
      //富临走协议返回flv格式视频流
      if(enterprise.getCode().equals("17458936")){
         R<UPRealvideoMsgStartupAckVo> msgStartupAckVoR = realVideoMsgClient.startupRealVideo(Integer.valueOf(enterprise.getCode()), car.getVehicleNumber());
         if (200 == msgStartupAckVoR.getCode()) {
            UPRealvideoMsgStartupAckVo data = msgStartupAckVoR.getData();
				
            RealVideoResp resp = new RealVideoResp();
            resp.setCompanyCode(enterprise.getCode());
            //执行拉流和推流
//         live_hls(data.getUrl(), car);
//         resp.setServerIp(hlsIp);
//         resp.setServerPort(hlsPort);
            resp.setUrl(data.getUrl());
//         live_flv(data.getUrl(), car.getId());
            resp.setServerIp(flvIp);
            resp.setServerPort(flvHttpPort);
            return R.ok(resp);
         }
			
         UPRealvideoMsgStartupAckVo data = msgStartupAckVoR.getData();
      }else if(enterprise.getCode().equals("25439966")){
         //海康走API获取预览url，trsp格式
         String data = haiKangClient.getCarPreviewURLs(car.getVehicleNumber()).getData();
         RealVideoResp resp = new RealVideoResp();
         //执行拉流和推流
         ExecutorService executorService = new ThreadPoolExecutor(1, 1,
               0L, TimeUnit.MILLISECONDS,
               new LinkedBlockingQueue<Runnable>());
         executorService.execute(new Runnable() {
            @Override
            public void run() {
               JavaCVStreamUtil.push_hls(data.getUrl(), path, id, folderPath);
            }
         });
         resp.setServerIp(liveIp);
         resp.setServerPort(livePort);
         resp.setUrl(data);
         return R.ok(resp);
      }
		
      return R.fail(msgStartupAckVoR.getMsg());
      return R.ok();
   }
   
   
@@ -165,8 +166,7 @@
      if (null == car) {
         return R.fail("失败");
      }
      String folderPath = outputPath + "hls\\" + car.getVehicleNumber();
      JavaCVStreamUtil.close(id, folderPath);
      String folderPath = hlsOutputPath + "hls\\" + car.getVehicleNumber();
      return R.ok();
   }
   
@@ -197,30 +197,14 @@
      if (200 == startupAckVoR.getCode()) {
         UPPlaybackMsgStartupAckVo data = startupAckVoR.getData();
         RealVideoResp resp = new RealVideoResp();
         String path = outputPath + "hls\\" + car.getVehicleNumber() + "\\live.m3u8";
         String folderPath = outputPath + "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(data.getUrl(), path, req.getId(), folderPath);
            }
         });
         resp.setServerIp(liveIp);
         resp.setServerPort(livePort);
//         live_hls(data.getUrl(), car);
//         resp.setServerIp(hlsIp);
//         resp.setServerPort(hlsPort);
         resp.setUrl(data.getUrl());
//         live_flv(data.getUrl(), car.getId());
         resp.setServerIp(flvIp);
         resp.setServerPort(flvHttpPort);
         return R.ok(resp);
      }
      return R.fail(startupAckVoR.getMsg());
@@ -262,7 +246,7 @@
   @GetMapping("/getCarTypeList")
   @ApiOperation(value = "获取车辆类型列表数据", tags = {"车辆类型"})
   public R<List<CarType>> getCarTypeList(String name) {
      List<CarType> list = carTypeService.list(new LambdaQueryWrapper<CarType>().like(StringUtils.isNotEmpty(name), CarType::getName, name));
      List<CarType> list = carTypeService.list(new LambdaQueryWrapper<CarType>().like(StringUtils.isNotEmpty(name), CarType::getName, name).orderByAsc(CarType::getSort));
      return R.ok(list);
   }
   
@@ -270,7 +254,7 @@
   @GetMapping("/getCarCount")
   @ApiOperation(value = "获取各种车辆类型车辆总数", tags = {"首页"})
   public R<List<CarType>> getCarCount() {
      List<CarType> list = carTypeService.list();
      List<CarType> list = carTypeService.list(new LambdaQueryWrapper<CarType>().orderByAsc(CarType::getSort));
      return R.ok(list);
   }
   
@@ -302,15 +286,25 @@
   public R<List<Car>> getMapCarList() {
      List<Car> list = carService.list(new LambdaQueryWrapper<Car>().eq(Car::getStatus, 1));
      for (Car car : list) {
         Long s = (null == car.getDownlineTime() ? LocalDateTime.now() : car.getDownlineTime()).toEpochSecond(ZoneOffset.ofHours(8)) - car.getOnlineTime().toEpochSecond(ZoneOffset.ofHours(8));
         car.setDrivingTime(s / 60);
         car.setDrivingTime(0L);
         if(null != car.getOnlineTime()){
            Long s = (null == car.getDownlineTime() ? LocalDateTime.now() : car.getDownlineTime()).toEpochSecond(ZoneOffset.ofHours(8)) - car.getOnlineTime().toEpochSecond(ZoneOffset.ofHours(8));
            car.setDrivingTime(s / 60);
         }
         GnssDataVo gnssDataVo = (GnssDataVo) redisTemplate.opsForValue().get("location:" + car.getVehicleNumber());
         if (null != gnssDataVo) {
            car.setLongitude(new BigDecimal(gnssDataVo.getLon()).divide(new BigDecimal(1000000)).toString());
            car.setLatitude(new BigDecimal(gnssDataVo.getLat()).divide(new BigDecimal(1000000)).toString());
            car.setSpeed(gnssDataVo.getVec1());
         }
         Enterprise enterprise = enterpriseService.getById(car.getEnterpriseId());
         car.setEnterpriseName(enterprise.getName());
         car.setCompanyCode(enterprise.getCode());
      }
      return R.ok(list);
   }
	
	
	
	
}