From 74af7e7e3ee39e25f73525391b13face373e350e Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 23 三月 2026 16:45:25 +0800
Subject: [PATCH] 3.23

---
 jyz-base-start/src/main/java/com/tievd/jyz/controller/OilRecordController.java |   66 ++++++++++++++++++++++++++++++--
 1 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/jyz-base-start/src/main/java/com/tievd/jyz/controller/OilRecordController.java b/jyz-base-start/src/main/java/com/tievd/jyz/controller/OilRecordController.java
index c74fc40..84a6f27 100644
--- a/jyz-base-start/src/main/java/com/tievd/jyz/controller/OilRecordController.java
+++ b/jyz-base-start/src/main/java/com/tievd/jyz/controller/OilRecordController.java
@@ -22,14 +22,17 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Random;
 
 /**
  * OilRecord
@@ -48,6 +51,38 @@
   @Autowired
   private IOilRecordService oilRecordService;
   
+  @Value("${init.local.image-path}")
+  private String localImagePath;
+  
+  @Value("${server.port:8080}")
+  private String serverPort;
+  
+  private Random random = new Random();
+  
+  private String getRandomImagePath() {
+    File imageDir = new File(localImagePath);
+    if (!imageDir.exists() || !imageDir.isDirectory()) {
+      log.warn("鏈湴鍥剧墖鐩綍涓嶅瓨鍦�: {}", localImagePath);
+      return null;
+    }
+    
+    File[] imageFiles = imageDir.listFiles((dir, name) -> {
+      String lowerName = name.toLowerCase();
+      return lowerName.endsWith(".jpg") || lowerName.endsWith(".jpeg") 
+          || lowerName.endsWith(".png") || lowerName.endsWith(".bmp");
+    });
+    
+    if (imageFiles == null || imageFiles.length == 0) {
+      log.warn("鏈湴鍥剧墖鐩綍涓病鏈夊浘鐗囨枃浠�: {}", localImagePath);
+      return null;
+    }
+    
+    int randomIndex = random.nextInt(imageFiles.length);
+    File selectedFile = imageFiles[randomIndex];
+    String fileName = selectedFile.getName();
+    return "http://localhost:" + serverPort + "/cube/jyz/images/" + fileName;
+  }
+  
   /**
    * 鍒嗛〉鍒楄〃鏌ヨ
    */
@@ -61,20 +96,41 @@
     Page<OilRecord> page = new Page<>(pageNo, pageSize);
     queryWrapper.orderByDesc("start_time");
     IPage<OilRecord> pageList = oilRecordService.page(page, queryWrapper);
+//
+//    for(OilRecord tmpOilRecord:pageList.getRecords()){
+//      try{
+//        if(StringUtils.isNotEmpty(tmpOilRecord.getImgPath())){
+//          String[] arr = tmpOilRecord.getImgPath().split(":");
+//          tmpOilRecord.setImgPath(MultiMinioUtil.getObjectURL(arr[0],arr[1],3600));
+//        }
+//        if(StringUtils.isNotEmpty(tmpOilRecord.getOutImgPath())){
+//          String[] arr = tmpOilRecord.getOutImgPath().split(":");
+//          tmpOilRecord.setOutImgPath(MultiMinioUtil.getObjectURL(arr[0],arr[1],3600));
+//        }
+//      }catch (Exception ex){
+//        log.error("鐢熸垚s3璧勬簮閾炬帴鍦板潃澶辫触",ex);
+//      }
+//    }
+    
     for(OilRecord tmpOilRecord:pageList.getRecords()){
       try{
         if(StringUtils.isNotEmpty(tmpOilRecord.getImgPath())){
-          String[] arr = tmpOilRecord.getImgPath().split(":");
-          tmpOilRecord.setImgPath(MultiMinioUtil.getObjectURL(arr[0],arr[1],3600));
+          String randomImagePath = getRandomImagePath();
+          if(randomImagePath != null){
+            tmpOilRecord.setImgPath(randomImagePath);
+          }
         }
         if(StringUtils.isNotEmpty(tmpOilRecord.getOutImgPath())){
-          String[] arr = tmpOilRecord.getOutImgPath().split(":");
-          tmpOilRecord.setOutImgPath(MultiMinioUtil.getObjectURL(arr[0],arr[1],3600));
+          String randomImagePath = getRandomImagePath();
+          if(randomImagePath != null){
+            tmpOilRecord.setOutImgPath(randomImagePath);
+          }
         }
       }catch (Exception ex){
-        log.error("鐢熸垚s3璧勬簮閾炬帴鍦板潃澶辫触",ex);
+        log.error("鐢熸垚鍥剧墖璺緞澶辫触",ex);
       }
     }
+    
     return Result.ok(pageList);
   }
   

--
Gitblit v1.8.0