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 | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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 1f0faac..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,7 +1,5 @@
package com.dy.pipIrrGlobal.webCtrls;
-
-import com.dy.common.aop.SsoAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pipIrrGlobal.dyFile.FileConstant;
@@ -18,7 +16,6 @@
import org.springframework.web.multipart.MultipartFile;
import java.util.Date;
-
/**
* web鏂囦欢涓婁紶
*/
@@ -40,13 +37,15 @@
@Value("${dy.webFile.supportedFileTypes}")
private String supportedFileTypes ;
+ //瑙嗛鐨勭缉鐣ュ浘鐨勬墿灞曞悕
+ private static final String VideoZipPicFileType = "jpg";
+
/**
* 涓婁紶鐓х墖鍥剧墖鏂囦欢 锛堝綋鍓嶅彧瀵筽ng jpg鏍煎紡鍥剧墖鏀寔缂╃暐鍥撅級
* @param file web绔笂浼犳枃浠剁殑post瀵硅薄
* @return 杩斿洖缁撴灉
*/
@PostMapping("/upPhoto")
- @SsoAop()
//鍙傝�冿細https://blog.zhengru.top/posts/33486.html#%E5%8D%95%E6%96%87%E4%BB%B6%E4%B8%8A%E4%BC%A0
public BaseResponse<?> upPhoto(MultipartFile file) {
try {
@@ -67,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 {
@@ -92,7 +92,6 @@
* @return 杩斿洖缁撴灉
*/
@PostMapping("/upPhone")
- @SsoAop()
public BaseResponse<?> upPhone(MultipartFile file) {
try {
if (file != null) {
@@ -112,6 +111,7 @@
frVo.fileNameHash,
fileNameGrp[0],
fileNameGrp[1],
+ frVo.getFileWebPath(),
frVo.getFileWebUrl() + frVo.getFileWebPath(),
null,
frVo.fileWebDownloadPath + id) ;
@@ -138,7 +138,6 @@
* @return 杩斿洖缁撴灉
*/
@PostMapping("/upVideo")
- @SsoAop()
public BaseResponse<?> upVideo(MultipartFile file) {
try {
if (file != null) {
@@ -158,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 {
@@ -184,7 +184,6 @@
* @return 杩斿洖缁撴灉
*/
@PostMapping("/upDocument")
- @SsoAop()
public BaseResponse<?> upDocument(MultipartFile file) {
try {
if (file != null) {
@@ -206,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