From 7870222f8f5b603bc22f8a02a9877c93f6259802 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 03 二月 2024 14:15:36 +0800
Subject: [PATCH] 三一车辆模型查询修改提交

---
 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java |   59 +++++++++++++----------------------------------------------
 1 files changed, 13 insertions(+), 46 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 b2642f3..69cf50d 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
@@ -328,59 +328,26 @@
 
     @Override
     public List<Map<String, String>> getAllCarModel() {
-        boolean exsit = MinioUtil.exitsBucket("sycar");
+        boolean exsit = MinioUtil.exitsBucket("system");
         if (exsit) {
             List<Map<String, String>> listObjetcName = new ArrayList<>();
             try {
-               // ListObjectsArgs listObjectsArgs = ListObjectsArgs.builder().prefix("carmodel/").bucket("sycar").build();
-                Iterable<Result<Item>> myObjects = MinioUtil.getObjectsByBucket("sycar","carmodel");
+                //Iterable<Result<Item>> myObjects = MinioUtil.getObjectsByBucket("sycar","carmodel");
+                Iterable<Result<Item>> myObjects = MinioUtil.getObjectsByBucket("system","model/car");
                 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()) {
-                        case "carmodel/aodi.glb":
-                            map.put("carType", "濂ヨ开");
-                            break;
-                        case "carmodel/baolai.glb":
-                            map.put("carType", "瀹濇潵");
-                            break;
-                        case "carmodel/bieke.glb":
-                            map.put("carType", "鍒厠");
-                            break;
-                        case "carmodel/bus1.glb":
-                            map.put("carType", "澶у杞�");
-                            break;
-                        case "carmodel/car.glb":
-                            map.put("carType", "灏忓瀷杞�");
-                            break;
-                        case "carmodel/fire(1).glb":
-                            map.put("carType", "娑堥槻杞�");
-                            break;
-                        case "carmodel/fute.glb":
-                            map.put("carType", "绂忕壒");
-                            break;
-                        case "carmodel/jingche_a.glb":
-                            map.put("carType", "璀﹁溅");
-                            break;
-                        case "carmodel/jiuhu.glb":
-                            map.put("carType", "鏁戞姢杞�");
-                            break;
-                        case "carmodel/oil.glb":
-                            map.put("carType", "娌圭綈杞�");
-                            break;
-                        case "carmodel/truck.glb":
-                            map.put("carType", "宸ョ▼鐢ㄨ溅");
-                            break;
-                        case "carmodel/van1.glb":
-                            map.put("carType", "澶ц揣杞�");
-                            break;
-                        default:
-                            break;
-                    }*/
-                    listObjetcName.add(map);
+                    try{
+                        String carType = strArr[2];
+                        if(!carType.contains(".")){
+                            map.put("carType", carType);
+                            map.put("carModel", "system/" + item.objectName());
+                            listObjetcName.add(map);
+                        }
+                    }catch(Exception e){
+
+                    }
                 }
                 return listObjetcName;
             } catch (Exception ex) {

--
Gitblit v1.9.3