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 | 13 ++++++++-----
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/HttpUtils.java | 4 ++--
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java | 3 ++-
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SynchronizationController.java | 3 ++-
4 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SynchronizationController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SynchronizationController.java
index cba2fe8..521af12 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SynchronizationController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SynchronizationController.java
@@ -16,6 +16,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.text.ParseException;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -35,7 +36,7 @@
* @return
*/
@PostMapping(value = "/upload")
- public R synchronization(SynchronousRequest request) {
+ public R synchronization(SynchronousRequest request) throws ParseException {
if (ObjectUtil.isNull(request.getFile())) {
return R.fail("涓婁紶鏂囦欢涓嶈兘涓虹┖");
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java
index c84739d..d6f0935 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java
@@ -11,6 +11,7 @@
import java.io.File;
import java.io.IOException;
+import java.text.ParseException;
import java.util.Collection;
import java.util.List;
@@ -29,7 +30,7 @@
SysOssVo upload(MultipartFile file) throws IOException;
- SysOssVo upload2(SynchronousRequest request);
+ SysOssVo upload2(SynchronousRequest request) throws ParseException;
// SysOssVo upload(File file);
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 9fb83c1..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,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -164,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();
@@ -176,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
@@ -210,7 +211,7 @@
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);
@@ -231,8 +232,9 @@
@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);
@@ -242,6 +244,7 @@
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);
@@ -258,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;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/HttpUtils.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/HttpUtils.java
index f0d3d03..937a7e2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/HttpUtils.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/HttpUtils.java
@@ -139,8 +139,8 @@
builder.addTextBody("ossId", entity.getOssId(), ContentType.TEXT_PLAIN);
builder.addTextBody("createBy", entity.getCreateBy(), ContentType.TEXT_PLAIN);
builder.addTextBody("password", entity.getPassword(), ContentType.TEXT_PLAIN);
- builder.addTextBody("fileName", entity.getFileName(),contentType);
-// builder.addTextBody("createTime", entity.getCreateTime(),);
+ builder.addTextBody("fileName", entity.getFileName(), contentType);
+ builder.addTextBody("createTime", entity.getCreateTime(), ContentType.TEXT_PLAIN);
HttpEntity multipart = builder.build();
httpPost.setEntity(multipart);
--
Gitblit v1.8.0