From 8b7ce95e1f486603247f5cae882c4595e351af21 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 23 四月 2024 17:04:56 +0800
Subject: [PATCH] 分布式web文件子系统增加下载web文件功能
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/global/WebFileCtrl.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/global/WebFileCtrl.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/global/WebFileCtrl.java
index 7472b24..97470ab 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/global/WebFileCtrl.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/global/WebFileCtrl.java
@@ -9,7 +9,6 @@
import com.dy.pmsGlobal.dyFile.FileRestVo;
import com.dy.pmsGlobal.dyFile.FileVo;
import com.dy.pmsGlobal.pojoOth.OthFile;
-import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -39,7 +38,7 @@
@PostMapping("/upPhoto")
@SsoPowerAop(power = "-1") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
//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, HttpServletRequest req) {
+ public BaseResponse<?> upPhoto(MultipartFile file) {
try {
if (file != null) {
String[] fileNameGrp = fileOp.splitFileName(file) ;
@@ -53,8 +52,8 @@
fileNameGrp[1],
null);
String fileMainName = fileOp.getFileMainName(frVo.fileName) ;
- Long id = this.saveFileInfo(fileNameGrp[0], fileNameGrp[1], fileMainName, frVo.fileNameHash, frVo.fileWebPath);
- FileVo fvo = new FileVo(id, frVo.fileNameHash, fileNameGrp[0], fileNameGrp[1], (frVo.getFileWebUrl() + frVo.getFileWebPath()), fileOp.getImgFileZipPath(frVo.getFileWebUrl() + frVo.getFileWebPath())) ;
+ Long id = this.saveFileInfo(fileNameGrp[0], fileNameGrp[1], fileMainName, frVo.fileNameHash, frVo.fileWebPath, frVo.fileWebDownloadUrl);
+ FileVo fvo = new FileVo(id, frVo.fileNameHash, fileNameGrp[0], fileNameGrp[1], (frVo.getFileWebUrl() + frVo.getFileWebPath()), fileOp.getImgFileZipPath(frVo.getFileWebUrl() + frVo.getFileWebPath()), frVo.fileWebDownloadUrl) ;
return BaseResponseUtils.buildSuccess(fvo) ;
}else {
return BaseResponseUtils.buildError("鏈緱鍒颁笂浼犳枃浠剁殑鎵╁睍鍚�");
@@ -73,7 +72,7 @@
@PostMapping("/upPhone")
@SsoPowerAop(power = "-1")
- public BaseResponse<?> upPhone(MultipartFile file, HttpServletRequest req) {
+ public BaseResponse<?> upPhone(MultipartFile file) {
try {
if (file != null) {
String[] fileNameGrp = fileOp.splitFileName(file) ;
@@ -87,8 +86,8 @@
fileNameGrp[1],
null);
String fileMainName = fileOp.getFileMainName(frVo.fileName) ;
- Long id = this.saveFileInfo(fileNameGrp[0], fileNameGrp[1], fileMainName, frVo.fileNameHash, frVo.fileWebPath);
- FileVo fvo = new FileVo(id, frVo.fileNameHash, fileNameGrp[0], fileNameGrp[1],frVo.getFileWebUrl() + frVo.getFileWebPath(), null) ;
+ Long id = this.saveFileInfo(fileNameGrp[0], fileNameGrp[1], fileMainName, frVo.fileNameHash, frVo.fileWebPath, frVo.fileWebDownloadUrl);
+ FileVo fvo = new FileVo(id, frVo.fileNameHash, fileNameGrp[0], fileNameGrp[1],frVo.getFileWebUrl() + frVo.getFileWebPath(), null, frVo.fileWebDownloadUrl) ;
return BaseResponseUtils.buildSuccess(fvo) ;
}else {
return BaseResponseUtils.buildError("鏈緱鍒颁笂浼犳枃浠剁殑鎵╁睍鍚�");
@@ -109,7 +108,7 @@
@PostMapping("/upVideo")
@SsoPowerAop(power = "-1")
- public BaseResponse<?> upVideo(MultipartFile file, HttpServletRequest req) {
+ public BaseResponse<?> upVideo(MultipartFile file) {
try {
if (file != null) {
String[] fileNameGrp = fileOp.splitFileName(file) ;
@@ -123,8 +122,8 @@
fileNameGrp[1],
null);
String fileMainName = fileOp.getFileMainName(frVo.fileName) ;
- Long id = this.saveFileInfo(fileNameGrp[0], fileNameGrp[1], fileMainName, frVo.fileNameHash, frVo.fileWebPath);
- FileVo fvo = new FileVo(id, frVo.fileNameHash, fileNameGrp[0], fileNameGrp[1],frVo.getFileWebUrl() + frVo.getFileWebPath(), null) ;
+ Long id = this.saveFileInfo(fileNameGrp[0], fileNameGrp[1], fileMainName, frVo.fileNameHash, frVo.fileWebPath, frVo.fileWebDownloadUrl);
+ FileVo fvo = new FileVo(id, frVo.fileNameHash, fileNameGrp[0], fileNameGrp[1],frVo.getFileWebUrl() + frVo.getFileWebPath(), null, frVo.fileWebDownloadUrl) ;
return BaseResponseUtils.buildSuccess(fvo) ;
}else {
return BaseResponseUtils.buildError("鏈緱鍒颁笂浼犳枃浠剁殑鎵╁睍鍚�");
@@ -145,7 +144,7 @@
@PostMapping("/upDocument")
@SsoPowerAop(power = "-1")
- public BaseResponse<?> upDocument(MultipartFile file, HttpServletRequest req) {
+ public BaseResponse<?> upDocument(MultipartFile file) {
try {
if (file != null) {
String[] fileNameGrp = fileOp.splitFileName(file) ;
@@ -159,8 +158,8 @@
fileNameGrp[1],
null);
String fileMainName = fileOp.getFileMainName(frVo.fileName) ;
- Long id = this.saveFileInfo(fileNameGrp[0], fileNameGrp[1], fileMainName, frVo.fileNameHash, frVo.fileWebPath);
- FileVo fvo = new FileVo(id, frVo.fileNameHash, fileNameGrp[0], fileNameGrp[1],frVo.getFileWebUrl() + frVo.getFileWebPath(), null) ;
+ Long id = this.saveFileInfo(fileNameGrp[0], fileNameGrp[1], fileMainName, frVo.fileNameHash, frVo.fileWebPath, frVo.fileWebDownloadUrl);
+ FileVo fvo = new FileVo(id, frVo.fileNameHash, fileNameGrp[0], fileNameGrp[1],frVo.getFileWebUrl() + frVo.getFileWebPath(), null, frVo.fileWebDownloadUrl) ;
return BaseResponseUtils.buildSuccess(fvo) ;
}else {
return BaseResponseUtils.buildError("鏈緱鍒颁笂浼犳枃浠剁殑鎵╁睍鍚�");
@@ -187,13 +186,14 @@
* @param filePath 鏂囦欢鏈嶅姟绔瓨鍌ㄧ浉瀵硅矾寰�
* @return
*/
- private Long saveFileInfo(String orgName, String extName, String newName, Integer hash, String filePath){
+ private Long saveFileInfo(String orgName, String extName, String newName, Integer hash, String filePath, String downloadPath){
OthFile po = new OthFile() ;
po.orgName = orgName ;
po.extName = extName ;
po.newName = newName ;
po.hash = hash ;
po.filePath = filePath ;
+ po.downloadPath = downloadPath ;
return this.sv.save(po) ;
}
--
Gitblit v1.8.0