From 35b0088fa28dab8a28758dcbcc056620c1ea5e2c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 30 五月 2025 11:02:35 +0800
Subject: [PATCH] 修改公交公司的事件订阅功能
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CarController.java | 188 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 162 insertions(+), 26 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CarController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CarController.java
index 3255d47..1111a36 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CarController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CarController.java
@@ -1,9 +1,11 @@
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;
@@ -20,9 +22,11 @@
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;
+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;
@@ -30,9 +34,16 @@
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;
/**
* @author zhibing.pu
@@ -42,30 +53,42 @@
@RequestMapping("/car")
public class CarController {
+ @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
private IDriverService driverService;
-
@Resource
private IEnterpriseService enterpriseService;
-
@Resource
private RealVideoMsgClient realVideoMsgClient;
-
@Resource
private PlaybackMsgClient playbackMsgClient;
-
@Resource
private UPExgMsgRealLocationClient upExgMsgRealLocationClient;
-
@Resource
private ICarTypeService carTypeService;
-
@Resource
private RedisTemplate redisTemplate;
+ @Resource
+ private HaiKangClient haiKangClient;
@GetMapping("/getCarList")
@ApiOperation(value = "获取车辆列表", tags = {"车辆管理"})
@@ -88,7 +111,12 @@
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.setDriverName(driver.getName());
+ car.setCompanyCode(enterprise.getCode());
+ if (null != driver) {
+ car.setDriverName(driver.getName());
+ car.setDriverPhone(driver.getPhone());
+ car.setDrivingLicenseNumber(driver.getDrivingLicenceFile());
+ }
return R.ok(car);
}
@@ -101,18 +129,64 @@
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()) {
- UPRealvideoMsgStartupAckVo data = msgStartupAckVoR.getData();
+ //富临走协议返回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);
+ }
+ }else if(enterprise.getCode().equals("25439966")){
+ //海康走API获取预览url，trsp格式
+ String data = haiKangClient.getCarPreviewURLs(car.getVehicleNumber()).getData();
RealVideoResp resp = new RealVideoResp();
- resp.setServerIp(data.getServerIP());
- resp.setServerPort(data.getServerPort());
+ resp.setUrl(data);
return R.ok(resp);
}
- return R.fail(msgStartupAckVoR.getMsg());
+ return R.ok();
+ }
+
+
+ @GetMapping("/closeRealVideo/{id}")
+ @ApiOperation(value = "关闭实时音视频", tags = {"车辆管理"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "车辆id", name = "id", required = true)
+ })
+ 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();
}
@@ -123,14 +197,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();
- resp.setServerIp(data.getServerIP());
- resp.setServerPort(data.getServerPort());
+ //执行拉流和推流
+// 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());
@@ -172,7 +254,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);
}
@@ -180,7 +262,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);
}
@@ -189,10 +271,10 @@
@ApiOperation(value = "获取车辆状态汇总数据和公司总数等", tags = {"首页"})
public R<CarStatusCount> getCarStatusCount() {
List<Car> list = carService.list();
- long online = list.stream().filter(s -> s.getStatus() == 1).count();
- long offline = list.stream().filter(s -> s.getStatus() == 3).count();
- long breakdown = list.stream().filter(s -> s.getStatus() == 4).count();
- long abnormal = list.stream().filter(s -> s.getStatus() == 2).count();
+ long online = list.isEmpty() ? 0 : list.stream().filter(s -> s.getStatus() == 1).count();
+ long offline = list.isEmpty() ? 0 : list.stream().filter(s -> s.getStatus() == 3).count();
+ long breakdown = list.isEmpty() ? 0 : list.stream().filter(s -> s.getStatus() == 4).count();
+ long abnormal = list.isEmpty() ? 0 : list.stream().filter(s -> s.getStatus() == 2).count();
CarStatusCount carStatusCount = new CarStatusCount();
carStatusCount.setOffline(offline);
carStatusCount.setOnline(online);
@@ -210,12 +292,66 @@
@GetMapping("/getMapCarList")
@ApiOperation(value = "获取地图司机数据", tags = {"首页"})
public R<List<Car>> getMapCarList() {
- List<Car> list = carService.list();
+ List<Car> list = carService.list(new LambdaQueryWrapper<Car>().eq(Car::getStatus, 1));
for (Car car : list) {
+ 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());
- car.setLongitude(Double.valueOf(gnssDataVo.getLon() / 1000000).toString());
- car.setLatitude(Double.valueOf(gnssDataVo.getLat() / 1000000).toString());
+ 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());
+ }
}
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);
+ }
+
+
+
+
}
--
Gitblit v1.7.1