From dc85547a4e5b3d377c7613efa32fc6cc0ab2e8c1 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 11 四月 2024 09:23:14 +0800
Subject: [PATCH] app光电查询rtsp路径修改提交
---
ard-work/src/main/java/com/ruoyi/app/application/service/impl/ArdAppApplicationServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/application/service/impl/ArdAppApplicationServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/application/service/impl/ArdAppApplicationServiceImpl.java
index 88ff9ca..5918261 100644
--- a/ard-work/src/main/java/com/ruoyi/app/application/service/impl/ArdAppApplicationServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/application/service/impl/ArdAppApplicationServiceImpl.java
@@ -23,6 +23,7 @@
import com.ruoyi.utils.websocket.util.WebSocketUtils;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.ruoyi.common.utils.StringUtils;
@@ -71,6 +72,9 @@
@Resource
private SYClient sYClient;
+
+ @Value("${minio.endpoint}")
+ private String minioEndpoint;
private Map<String,Thread> threadMap = new HashMap();
@@ -544,12 +548,16 @@
//for(Map<String,Object> sycar : onlineSYCarPositionList){
for(Map<String,Object> sycar : onlineSYCarPositionNearList){
Map<String,Object> map = ardSyCarMapper.getArdSyCarAndDeptByCarId((String)sycar.get("carId"));
+ String carModel = this.minioEndpoint + "/" + (String) map.get("carModel");
+ map.put("carModel",carModel);
sycar.putAll(map);
}
//绛涢�夌绾�
List<Map<String,Object>> offlineSYCarPositionList = SYCarPositionList.stream().filter(map -> ((String)map.get("stateCn")).startsWith("绂荤嚎")).collect(Collectors.toList());
for(Map<String,Object> sycar : offlineSYCarPositionList){
Map<String,Object> map = ardSyCarMapper.getArdSyCarAndDeptByCarId((String)sycar.get("carId"));
+ String carModel = this.minioEndpoint + "/" + (String) map.get("carModel");
+ map.put("carModel",carModel);
sycar.putAll(map);
}
Map<String,List<Map<String,Object>>> carMap = new HashMap();
--
Gitblit v1.9.3