From a05b419384e148fc950c77553816a2d05144f4ae Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 19 六月 2025 19:36:22 +0800
Subject: [PATCH] 修改生产环境配置
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CarServiceImpl.java | 91 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 80 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CarServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CarServiceImpl.java
index 240dc19..9e46f1f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CarServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CarServiceImpl.java
@@ -1,6 +1,13 @@
package com.ruoyi.system.service.impl;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.web.page.PageInfo;
@@ -31,6 +38,9 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
/**
* @author zhibing.pu
@@ -39,8 +49,8 @@
@Service
public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarService {
- @Value("${live.output.path}")
- private String outputPath;
+ @Value("${live.hls.output-path}")
+ private String hlsOutputPath;
@Resource
private UPExgMsgRegisterClient upExgMsgRegisterClient;
@@ -108,6 +118,22 @@
/**
+ * 定时保存车辆司机id
+ */
+ @Override
+ public void taskSaveDriverId() {
+ List<Driver> driverList = driverService.list(new LambdaQueryWrapper<Driver>().eq(Driver::getStatus, 1));
+ List<Car> list = this.list(new LambdaQueryWrapper<Car>().isNull(Car::getDriverId));
+ for (Car car : list) {
+ Optional<Driver> optional = driverList.stream().filter(s -> s.getVehicleNumber().equals(car.getVehicleNumber())).findFirst();
+ if (optional.isPresent()) {
+ car.setDriverId(optional.get().getId());
+ this.updateById(car);
+ }
+ }
+ }
+
+ /**
* 获取车辆列表数据
*
* @param carListReq
@@ -133,7 +159,8 @@
if (car.getStatus() == 1) {
updateWrapper.set(Car::getDownlineTime, LocalDateTime.now());
}
- updateWrapper.set(Car::getStatus, 4);
+ updateWrapper.set(Car::getStatus, 3);
+ updateWrapper.eq(Car::getId, car.getId());
this.update(updateWrapper);
} else {
String dateTime = gnssDataVo.getDate() + " " + gnssDataVo.getTime();
@@ -143,7 +170,8 @@
if (car.getStatus() == 1) {
updateWrapper.set(Car::getDownlineTime, LocalDateTime.now());
}
- updateWrapper.set(Car::getStatus, 4);
+ updateWrapper.set(Car::getStatus, 3);
+ updateWrapper.eq(Car::getId, car.getId());
this.update(updateWrapper);
} else {
if (car.getStatus() != 1) {
@@ -151,6 +179,7 @@
updateWrapper.set(Car::getOnlineTime, LocalDateTime.now());
}
updateWrapper.set(Car::getStatus, 1);
+ updateWrapper.eq(Car::getId, car.getId());
this.update(updateWrapper);
}
}
@@ -162,15 +191,55 @@
* 检测视频播放，清除没有播放的视频流
*/
@Override
- public void taskPlayDetection() {
- List<Car> list = this.list();
- for (Car car : list) {
- if(!redisTemplate.hasKey("live:" + car.getId())){
- String folderPath = outputPath + "hls\\" + car.getVehicleNumber();
- JavaCVStreamUtil.close(car.getId(), folderPath);
+ public void taskPlayDetection(Integer deviceNumber) {
+ Car car = this.getById(deviceNumber);
+ try {
+ ScheduledExecutorService executorService = Executors.newScheduledThreadPool(1);
+ executorService.scheduleWithFixedDelay(new Runnable() {
+ @Override
+ public void run() {
+ if(!redisTemplate.hasKey("live:" + car.getId())){
+ String folderPath = hlsOutputPath + "hls\\" + car.getVehicleNumber();
+ JavaCVStreamUtil.close(car.getId(), folderPath);
+ }
+ }}, 1, 1, TimeUnit.MINUTES);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+
+
+ public void taskGetCarDeviceId(){
+ Object o = redisTemplate.opsForValue().get("chuzu:token");
+ String access_Token = "";
+ if(null == o){
+ HttpRequest get = HttpUtil.createGet("http://116.169.59.170:9986/MediaAPI/Token?token=shehongchuzu");
+ HttpResponse execute = get.execute();
+ String body = execute.body();
+ Integer expires_in = JSON.parseObject(body).getInteger("Expires_In");
+ access_Token = JSON.parseObject(body).getString("Access_Token");
+ redisTemplate.opsForValue().set("chuzu:token", access_Token, expires_in, TimeUnit.SECONDS);
+ }
+ //获取车辆数据
+ List<Car> cars = this.list(new QueryWrapper<Car>().eq("enterprise_id", 5));
+ HttpRequest get = HttpUtil.createGet("http://116.169.59.170:9986/MediaAPI/BaseInfo/GetVehicleInfo?accessToken=" + access_Token + "&tenantNo=射洪出租");
+ HttpResponse execute = get.execute();
+ String body = execute.body();
+ JSONObject jsonObject = JSON.parseObject(body);
+ Integer resultState = jsonObject.getInteger("ResultState");
+ if(null != resultState && 1 == resultState){
+ JSONArray resultData = jsonObject.getJSONArray("ResultData");
+ for (int i = 0; i < resultData.size(); i++) {
+ JSONObject jsonObject1 = resultData.getJSONObject(i);
+ String vehicleNo = jsonObject1.getString("VehicleNo");
+ String Deviceid = jsonObject1.getString("Deviceid");
+ cars.stream().filter(s->s.getVehicleNumber().equals(vehicleNo)).findFirst().ifPresent(car -> {
+ car.setDeviceId(Deviceid);
+ this.updateById(car);
+ });
}
}
}
-
}
--
Gitblit v1.7.1