From 93c20ce82e56710f7cf93789e7ac7a06153111a1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 04 六月 2025 16:13:28 +0800
Subject: [PATCH] 优化附件
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CarController.java | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 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 cc4bb7e..e8e139c 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
@@ -5,6 +5,7 @@
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;
@@ -86,6 +87,9 @@
@Resource
private RedisTemplate redisTemplate;
+ @Resource
+ private HaiKangClient haiKangClient;
+
@GetMapping("/getCarList")
@ApiOperation(value = "获取车辆列表", tags = {"车辆管理"})
public R<PageInfo<CarListResp>> getCarList(CarListReq carListReq) {
@@ -107,6 +111,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());
@@ -129,23 +134,32 @@
//手动加一次状态数据，避免定时任务结束任务线程
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();
- //执行拉流和推流
+ //富临走协议返回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());
+ resp.setUrl(data.getUrl());
// live_flv(data.getUrl(), car.getId());
- resp.setServerIp(flvIp);
- resp.setServerPort(flvHttpPort);
+ 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.setUrl(data);
return R.ok(resp);
}
-
- return R.fail(msgStartupAckVoR.getMsg());
+ return R.ok();
}
@@ -240,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);
}
@@ -248,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);
}
@@ -291,6 +305,9 @@
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);
}
@@ -336,4 +353,8 @@
});
carService.taskPlayDetection(id);
}
+
+
+
+
}
--
Gitblit v1.7.1