From c66ed1dcf64032a45ba053cd9ae71317d29d1fe3 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 21 一月 2025 14:18:11 +0800
Subject: [PATCH] 针对远程RTU升级，增加快速命令类型，为此增加相关配置，增加相关处理逻辑
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/webCtrls/WebFileCtrl.java | 15 ++++++++++++---
1 files changed, 12 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 dcf8b38..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
@@ -1,4 +1,5 @@
package com.dy.pipIrrGlobal.webCtrls;
+
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pipIrrGlobal.dyFile.FileConstant;
@@ -36,6 +37,9 @@
@Value("${dy.webFile.supportedFileTypes}")
private String supportedFileTypes ;
+ //瑙嗛鐨勭缉鐣ュ浘鐨勬墿灞曞悕
+ private static final String VideoZipPicFileType = "jpg";
+
/**
* 涓婁紶鐓х墖鍥剧墖鏂囦欢 锛堝綋鍓嶅彧瀵筽ng jpg鏍煎紡鍥剧墖鏀寔缂╃暐鍥撅級
* @param file web绔笂浼犳枃浠剁殑post瀵硅薄
@@ -62,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 {
@@ -106,6 +111,7 @@
frVo.fileNameHash,
fileNameGrp[0],
fileNameGrp[1],
+ frVo.getFileWebPath(),
frVo.getFileWebUrl() + frVo.getFileWebPath(),
null,
frVo.fileWebDownloadPath + id) ;
@@ -151,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 {
@@ -198,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