From 65a12fccec8ad0306817eb057adb102c54f2046f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 28 五月 2025 15:57:17 +0800
Subject: [PATCH] 添加出租车的视频设备号
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CarController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 008df12..8d69f84 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
@@ -138,8 +138,8 @@
// live_hls(data.getUrl(), car);
// resp.setServerIp(hlsIp);
// resp.setServerPort(hlsPort);
-
- live_flv(data.getUrl(), car.getId());
+ resp.setUrl(data.getUrl());
+// live_flv(data.getUrl(), car.getId());
resp.setServerIp(flvIp);
resp.setServerPort(flvHttpPort);
return R.ok(resp);
@@ -195,8 +195,8 @@
// live_hls(data.getUrl(), car);
// resp.setServerIp(hlsIp);
// resp.setServerPort(hlsPort);
-
- live_flv(data.getUrl(), car.getId());
+ resp.setUrl(data.getUrl());
+// live_flv(data.getUrl(), car.getId());
resp.setServerIp(flvIp);
resp.setServerPort(flvHttpPort);
return R.ok(resp);
@@ -240,7 +240,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 +248,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);
}
@@ -336,4 +336,8 @@
});
carService.taskPlayDetection(id);
}
+
+
+
+
}
--
Gitblit v1.7.1