From 9dbd1b03adca3920a249b9079153d5f53d01a47d Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 01 十一月 2023 15:25:03 +0800
Subject: [PATCH] 清淤数据逻辑
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
index 6cd7616..479655e 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
@@ -17,6 +17,7 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.sy.domain.ArdAccessFence;
import com.ruoyi.utils.gis.GisUtil;
import com.ruoyi.utils.gis.Point;
import com.ruoyi.scheduling.domian.SchedulingParam;
@@ -42,6 +43,7 @@
import okhttp3.Response;
import okhttp3.ResponseBody;
import org.apache.commons.codec.digest.DigestUtils;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.ruoyi.sy.mapper.ArdSyCarMapper;
import com.ruoyi.sy.domain.ArdSyCar;
@@ -79,6 +81,9 @@
RedisCache redisCache;
@Resource
private ArdSyCarDayMapper ardSyCarDayMapper;
+
+ @Value("${minio.endpoint}")
+ private String minioEndpoint;
private Map<Integer, Map<String, String>> logInMap = new HashMap();
@@ -269,8 +274,10 @@
for (Result<Item> result : myObjects) {
Item item = result.get();
Map<String, String> map = new HashMap();
+ String[] strArr = item.objectName().split("/");
+ map.put("carType", strArr[1]);
map.put("carModel", "sycar/" + item.objectName());
- switch (item.objectName()) {
+ /*switch (item.objectName()) {
case "carmodel/aodi.glb":
map.put("carType", "濂ヨ开");
break;
@@ -309,11 +316,12 @@
break;
default:
break;
- }
+ }*/
listObjetcName.add(map);
}
return listObjetcName;
} catch (Exception ex) {
+ ex.printStackTrace();
//log.error("minio鑾峰彇妗朵笅瀵硅薄寮傚父锛�" + ex.getMessage());
}
}
@@ -405,8 +413,9 @@
if (result != null) {
if (result.get("carPicture") != null) {
if (!((String) result.get("carPicture")).equals("")) {
- String url = ((String) result.get("carPicture")).split("sycar")[0];
- String carModel = url + (String) result.get("carModel");
+ /*String url = ((String) result.get("carPicture")).split("sycar")[0];
+ String carModel = url + (String) result.get("carModel");*/
+ String carModel = this.minioEndpoint + "/" + (String) result.get("carModel");
result.put("carModel", carModel);
}
}
@@ -617,13 +626,13 @@
for (int i = 0; i < carList.size(); i++) {
ArdSyCar ardSyCar = carList.get(i);
if (carId.equals(ardSyCar.getCarId())) {
- String url = "";
+ /*String url = "";
if (ardSyCar.getCarPicture() != null) {
if (!ardSyCar.getCarPicture().equals("")) {
url = ardSyCar.getCarPicture().split("sycar")[0];
}
- }
- m.put("carModel", url + ardSyCar.getCarModel());//zns
+ }*/
+ m.put("carModel", this.minioEndpoint + "/" + ardSyCar.getCarModel());//zns
//m.put("carModel",ardSyCar.getCarModel());
m.put("carTypeArd", ardSyCar.getCarType());
m.put("carBrand", ardSyCar.getCarBrand());
@@ -1155,4 +1164,12 @@
}
return filteredList;
}
+
+ @Override
+ public List<ArdSyCar> all() {
+ QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+ queryWrapper.ne("reserved_1","");
+ return ardSyCarMapper.selectList(queryWrapper);
+ }
+
}
--
Gitblit v1.9.3