From f4ba01314a5e2780d5108d4bf59a23cbbeb4d5c8 Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期一, 04 十二月 2023 13:45:25 +0800
Subject: [PATCH] 合并
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
index 24b412d..a27c86a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
@@ -47,6 +47,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -163,7 +165,7 @@
* @return
*/
@Override
- public SysOssVo upload2(SynchronousRequest request) {
+ public SysOssVo upload2(SynchronousRequest request) throws ParseException {
String originalfileName = request.getFile().getOriginalFilename();
String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
OssClient storage = OssFactory.instance();
@@ -175,7 +177,7 @@
}
// 淇濆瓨鏂囦欢淇℃伅
return buildResultEntity2(originalfileName, suffix, storage.getConfigKey(), uploadResult,request.getOssId(),
- request.getPassword(), request.getCreateBy(), request.getFileName());
+ request.getPassword(), request.getCreateBy(), request.getFileName(), request.getCreateTime());
}
// @Override
@@ -200,15 +202,16 @@
baseMapper.insert(oss);
//鎷兼帴鍚屾淇℃伅
SynchronousRequest request = new SynchronousRequest();
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
request.setFile(file);
- request.setFileName(oss.getFileName());
+ request.setFileName(oss.getOriginalName());
request.setPath(uploadResult.getFilename() + "1");
-// request.setCreateTime(new Date());
+ request.setCreateTime(format.format(oss.getCreateTime()));
request.setPassword(oss.getPassword());
request.setCreateBy(String.valueOf(oss.getCreateBy()));
// request.setOssId(String.valueOf(oss.getOssId()));
request.setOssId("12312312");
-// post(request);
+ post(request);
SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
return this.matchingUrl(sysOssVo);
@@ -229,17 +232,19 @@
@NotNull
private SysOssVo buildResultEntity2(String originalfileName, String suffix, String configKey,
UploadResult uploadResult, String ossId, String password,
- String createBy, String fileName) {
+ String createBy, String fileName, String createTime) throws ParseException {
SysOss oss = new SysOss();
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
oss.setOssId(Long.valueOf(ossId));
oss.setUrl(uploadResult.getUrl());
oss.setFileSuffix(suffix);
- oss.setFileName(fileName);
- oss.setOriginalName(originalfileName);
+ oss.setFileName(uploadResult.getFilename());
+ oss.setOriginalName(fileName);
oss.setService(configKey);
oss.setPassword(password);
oss.setCreateTime(new Date());
oss.setCreateBy(Long.valueOf(createBy));
+ oss.setCreateTime(format.parse(createTime));
baseMapper.insert(oss);
SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
return this.matchingUrl(sysOssVo);
@@ -256,7 +261,7 @@
storage.delete(sysOss.getUrl());
if(sysOss.getPassword().equals(password) || password.equals("000000")){
baseMapper.deleteById(sysOss.getOssId());
-// HttpUtils.sendDeleteRequest(boundary.getLocalhost() + "/resource/synchronization/delete",String.valueOf(sysOss.getOssId()));
+ HttpUtils.sendDeleteRequest(boundary.getLocalhost() + "/resource/synchronization/delete",String.valueOf(sysOss.getOssId()));
return true;
}
return false;
@@ -299,7 +304,7 @@
String jsonString = "";
try {
// 灏咼ava瀵硅薄杞崲涓篔SON瀛楃涓�
- request.setFileName(URLEncoder.encode(request.getFileName(),"utf-8"));
+// request.setFileName(URLEncoder.encode(request.getFileName(),"utf-8"));
jsonString = objectMapper.writeValueAsString(request);
System.out.println(jsonString);
} catch (Exception e) {
--
Gitblit v1.8.0