From a1744d0bf7f0ad8ac861d672cffd7c710dac4e7e Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 11 四月 2025 14:17:36 +0800
Subject: [PATCH] 获取未绑定轮灌组的取水口

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/webCtrls/WebFileCtrl.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/webCtrls/WebFileCtrl.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/webCtrls/WebFileCtrl.java
index bb9db20..6f26cd1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/webCtrls/WebFileCtrl.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/webCtrls/WebFileCtrl.java
@@ -37,6 +37,9 @@
     @Value("${dy.webFile.supportedFileTypes}")
     private String supportedFileTypes ;
 
+    //瑙嗛鐨勭缉鐣ュ浘鐨勬墿灞曞悕
+    private static final String VideoZipPicFileType = "jpg";
+
     /**
      * 涓婁紶鐓х墖鍥剧墖鏂囦欢 锛堝綋鍓嶅彧瀵筽ng jpg鏍煎紡鍥剧墖鏀寔缂╃暐鍥撅級
      * @param file web绔笂浼犳枃浠剁殑post瀵硅薄
@@ -63,8 +66,9 @@
                                 frVo.fileNameHash,
                                 fileNameGrp[0],
                                 fileNameGrp[1],
+                                frVo.getFileWebPath(),
                                 (frVo.getFileWebUrl() + frVo.getFileWebPath()),
-                                fileOp.getImgFileZipPath(frVo.getFileWebUrl() + frVo.getFileWebPath()),
+                                fileOp.getFileZipPath(frVo.getFileWebUrl() + frVo.getFileWebPath()),
                                 frVo.fileWebDownloadPath + id) ;
                         return  BaseResponseUtils.buildSuccess(fvo) ;
                     }else {
@@ -107,6 +111,7 @@
                                 frVo.fileNameHash,
                                 fileNameGrp[0],
                                 fileNameGrp[1],
+                                frVo.getFileWebPath(),
                                 frVo.getFileWebUrl() + frVo.getFileWebPath(),
                                 null,
                                 frVo.fileWebDownloadPath + id) ;
@@ -152,8 +157,9 @@
                                 frVo.fileNameHash,
                                 fileNameGrp[0],
                                 fileNameGrp[1],
+                                frVo.getFileWebPath(),
                                 frVo.getFileWebUrl() + frVo.getFileWebPath(),
-                                null,
+                                fileOp.getFileZipPath(frVo.getFileWebUrl() + frVo.getFileWebPath(), VideoZipPicFileType),
                                 frVo.fileWebDownloadPath + id) ;
                         return  BaseResponseUtils.buildSuccess(fvo) ;
                     }else {
@@ -199,7 +205,9 @@
                         Long id = this.saveFileInfo(fileNameGrp[0], fileNameGrp[1], fileMainName, frVo.fileNameHash, frVo.fileWebPath);
                         FileVo fvo = new FileVo(id,
                                 frVo.fileNameHash,
-                                fileNameGrp[0], fileNameGrp[1],
+                                fileNameGrp[0],
+                                fileNameGrp[1],
+                                frVo.getFileWebPath(),
                                 frVo.getFileWebUrl() + frVo.getFileWebPath(),
                                 null,
                                 frVo.fileWebDownloadPath + id) ;

--
Gitblit v1.8.0