From 937daff0ebc1aa16a852d5a86434ab1994d8a02d Mon Sep 17 00:00:00 2001
From: 胡仁荣 <897853850@qq.com>
Date: 星期一, 11 九月 2023 10:41:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/qxueyou/scc/teach/res/service/impl/FileService.java | 85 ++++++++++++++++++++++++++++++++++++------
1 files changed, 72 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/teach/res/service/impl/FileService.java b/src/main/java/com/qxueyou/scc/teach/res/service/impl/FileService.java
index 46cee30..e67a090 100644
--- a/src/main/java/com/qxueyou/scc/teach/res/service/impl/FileService.java
+++ b/src/main/java/com/qxueyou/scc/teach/res/service/impl/FileService.java
@@ -26,8 +26,8 @@
import com.qxueyou.scc.teach.res.service.IFileService;
/**
- * 所有文件上传的操作，单独到文件上传工程后，后续业务操作需要下载文件调用的方法
- *
+ * 鎵�鏈夋枃浠朵笂浼犵殑鎿嶄綔锛屽崟鐙埌鏂囦欢涓婁紶宸ョ▼鍚庯紝鍚庣画涓氬姟鎿嶄綔闇�瑕佷笅杞芥枃浠惰皟鐢ㄧ殑鏂规硶
+ *
* @author xiadehu
*
*/
@@ -37,7 +37,7 @@
private final Logger log = LogManager.getLogger(FileService.class);
/*
- * 文件类型:目前支持四种
+ * 鏂囦欢绫诲瀷:鐩墠鏀寔鍥涚
*/
public final static String FILE_TYPE_VIDEO = "video";
@@ -95,18 +95,18 @@
}
/**
- * 插入文件信息到数据库
- *
+ * 鎻掑叆鏂囦欢淇℃伅鍒版暟鎹簱
+ *
* @param name
* @param fullPath
- * 全路径
+ * 鍏ㄨ矾寰�
* @param relativePath
- * 相对路径
+ * 鐩稿璺緞
* @param type
- * 文件类型，非文件格式
+ * 鏂囦欢绫诲瀷锛岄潪鏂囦欢鏍煎紡
* @return
*/
- private ResFile insertFileToDB(String name, String fullPath, String relativePath, String type) {
+ public ResFile insertFileToDB(String name, String fullPath, String relativePath, String type) {
ResFile file = new ResFile();
@@ -127,10 +127,41 @@
return file;
}
+ /**
+ * 鎻掑叆鏂囦欢淇℃伅鍒版暟鎹簱
+ *
+ * @param name
+ * @param relativePath
+ * 鐩稿璺緞
+ * @param type
+ * 鏂囦欢绫诲瀷锛岄潪鏂囦欢鏍煎紡
+ * @return
+ */
+ public ResFile insertFileToDBTwo(String name, Long Size, String relativePath, String type) {
+
+ ResFile file = new ResFile();
+
+ TraceUtils.setCreateTrace(file);
+ file.setFileName(name);
+ file.setFileFormat(QFileUtils.getFileFormat(name));
+ file.setFileType(type);
+ // TODO
+ file.setMd5Hash(null);
+ file.setPath(relativePath);
+ file.setSize(Size);
+ // TODO
+ file.setTenantId(null);
+ file.setDeleteFlag(false);
+
+ save(file);
+
+ return file;
+
+ }
/**
- * 获取文件类型
- *
+ * 鑾峰彇鏂囦欢绫诲瀷
+ *
* @param name
* @return
*/
@@ -140,8 +171,8 @@
}
/**
- * 获取文件目标路径
- *
+ * 鑾峰彇鏂囦欢鐩爣璺緞
+ *
* @param name
* @return
*/
@@ -208,4 +239,32 @@
}
return null;
}
+
+ @Override
+ public Result checkMd5(String md5, String fileName) {
+// if(StringUtils.isBlank(md5)){
+// return Result.FAIL;
+// }
+//
+//
+// Boolean objectExist;
+// objectExist = authOssService.doseObjectExist(resFile.getPath());
+//
+// if (objectExist) {
+//
+// ResFileDO resFileToDB = new ResFileDO();
+// BeanUtils.copyProperties(resFile, resFileToDB);
+// resFileToDB.setId(null);
+// TraceUtils.setCreateTrace(resFileToDB);
+// ResFileDO resFileDB = save(resFileToDB);
+//
+// Result result = new Result(true, "fileId", resFileDB.getId(), "path", resFileDB.getPath(),"fileName",fileName,
+// "fileSize",resFileToDB.getSize(),"fileType",resFileToDB.getFileType(),"hit",true);
+// result.setResultCode(201);
+// return result;
+//
+// }
+
+ return Result.FAIL;
+ }
}
--
Gitblit v1.8.0