From ac2873bd37eeb496b0e9dd62d66e9fc4b38ef39b Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期五, 22 十二月 2023 13:38:26 +0800
Subject: [PATCH] ftp摆渡
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java | 112 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 82 insertions(+), 30 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 45f98aa..345b542 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
@@ -8,7 +8,10 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
import com.github.therapi.runtimejavadoc.repack.com.eclipsesource.json.Json;
+import org.apache.commons.io.IOUtils;
+import org.apache.xmlbeans.impl.common.IOUtil;
import org.dromara.common.core.constant.CacheNames;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.domain.model.LoginUser;
@@ -24,11 +27,13 @@
import org.dromara.common.oss.core.OssClient;
import org.dromara.common.oss.entity.SynchronousRequest;
import org.dromara.common.oss.entity.UploadResult;
+import org.dromara.common.oss.entity.VideoRequest;
import org.dromara.common.oss.enumd.AccessPolicyType;
import org.dromara.common.oss.factory.OssFactory;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.system.domain.SysOss;
import org.dromara.system.domain.bo.SysOssBo;
+import org.dromara.system.domain.properties.Boundary;
import org.dromara.system.domain.vo.SysOssVo;
import org.dromara.system.mapper.SysOssMapper;
import org.dromara.system.service.ISysOssService;
@@ -42,9 +47,10 @@
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
+import java.net.URLEncoder;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -56,6 +62,7 @@
@Service
public class SysOssServiceImpl implements ISysOssService, OssService {
+ private final Boundary boundary;
private final SysOssMapper baseMapper;
@Override
@@ -139,7 +146,7 @@
}
@Override
- public SysOssVo upload(MultipartFile file) {
+ public SysOssVo upload(MultipartFile file) throws IOException {
String originalfileName = file.getOriginalFilename();
String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
OssClient storage = OssFactory.instance();
@@ -153,15 +160,57 @@
return buildResultEntity(originalfileName, suffix, storage.getConfigKey(), uploadResult, file);
}
+ @Override
+ public SysOssVo upload3(VideoRequest request) throws IOException {
+
+ String originalfileName = request.getFileName();
+ String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
+ OssClient storage = OssFactory.instance();
+ UploadResult uploadResult;
+ try {
+ uploadResult = storage.uploadSuffix(request.getFile().getBytes(), suffix, request.getFile().getContentType());
+ } catch (IOException e) {
+ throw new ServiceException(e.getMessage());
+ }
+ // 淇濆瓨鏂囦欢淇℃伅
+ return buildResultEntity(originalfileName, suffix, storage.getConfigKey(), uploadResult, request.getFile());
+ }
+
/**
- * 鍚屾
+ * 鍚屾 瀹氭椂鎷夊彇
* @param
* @param
* @return
*/
@Override
- public SysOssVo upload2(SynchronousRequest request) {
- String originalfileName = request.getFile().getOriginalFilename();
+ public SysOssVo upload2(SynchronousRequest request) throws ParseException {
+ String originalfileName = request.getFileName();
+ String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
+ OssClient storage = OssFactory.instance();
+// String type = request.getFileName().substring(14,request.getFileName().length());
+ String type = request.getFile().getContentType();
+ UploadResult uploadResult;
+ try {
+ uploadResult = storage.uploadSuffix2(request.getFile().getBytes(), request.getPath(), type);
+ } catch (IOException e) {
+ throw new ServiceException(e.getMessage());
+ }
+ // 淇濆瓨鏂囦欢淇℃伅
+ System.out.println("canshu:" + "," + originalfileName +"," + suffix +"," + storage.getConfigKey() +"," + uploadResult + "," +request.getOssId()
+ +"," + request.getPassword() +"," + request.getCreateBy() +"," + request.getFileName() +"," + request.getCreateTime());
+ return buildResultEntity2(originalfileName, suffix, storage.getConfigKey(), uploadResult,request.getOssId(),
+ request.getPassword(), "1731588854831022081", request.getFileName(), request.getCreateTime());
+ }
+
+ /**
+ * 鍚屾 瀹氭椂鎷夊彇
+ * @param
+ * @param
+ * @return
+ */
+ @Override
+ public SysOssVo upload3(SynchronousRequest request) throws ParseException {
+ String originalfileName = request.getFileName();
String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
OssClient storage = OssFactory.instance();
UploadResult uploadResult;
@@ -171,8 +220,10 @@
throw new ServiceException(e.getMessage());
}
// 淇濆瓨鏂囦欢淇℃伅
+ System.out.println("canshu:" + "," + originalfileName +"," + suffix +"," + storage.getConfigKey() +"," + uploadResult + "," +request.getOssId()
+ +"," + request.getPassword() +"," + request.getCreateBy() +"," + request.getFileName() +"," + request.getCreateTime());
return buildResultEntity2(originalfileName, suffix, storage.getConfigKey(), uploadResult,request.getOssId(),
- request.getPassword(), request.getCreateTime(), request.getCreateBy());
+ request.getPassword(), "1731588854831022081", request.getFileName(), request.getCreateTime());
}
// @Override
@@ -186,7 +237,7 @@
// }
@NotNull
- private SysOssVo buildResultEntity(String originalfileName, String suffix, String configKey, UploadResult uploadResult, MultipartFile file) {
+ private SysOssVo buildResultEntity(String originalfileName, String suffix, String configKey, UploadResult uploadResult, MultipartFile file) throws IOException {
SysOss oss = new SysOss();
oss.setUrl(uploadResult.getUrl());
oss.setFileSuffix(suffix);
@@ -197,14 +248,17 @@
baseMapper.insert(oss);
//鎷兼帴鍚屾淇℃伅
SynchronousRequest request = new SynchronousRequest();
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
request.setFile(file);
+ request.setFileName(oss.getOriginalName());
request.setPath(uploadResult.getFilename());
- request.setCreateTime(oss.getCreateTime());
+ request.setCreateTime(format.format(oss.getCreateTime()));
request.setPassword(oss.getPassword());
- request.setCreateBy(String.valueOf(oss.getCreateBy()));
+ request.setCreateBy("1731588854831022081");
request.setOssId(String.valueOf(oss.getOssId()));
-// post(request);
-
+// request.setOssId("123890");
+ post(request);
+
SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
return this.matchingUrl(sysOssVo);
}
@@ -217,31 +271,33 @@
* @param uploadResult
* @param ossId
* @param password
- * @param createTime
+// * @param createTime
* @param createBy
* @return
*/
@NotNull
private SysOssVo buildResultEntity2(String originalfileName, String suffix, String configKey,
UploadResult uploadResult, String ossId, String password,
- Date createTime, String createBy) {
+ 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(uploadResult.getFilename());
- oss.setOriginalName(originalfileName);
+ oss.setOriginalName(fileName);
oss.setService(configKey);
oss.setPassword(password);
- oss.setCreateTime(createTime);
+ 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);
}
@Override
- public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid, String password) {
+ public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid, String password) throws Exception {
if (isValid) {
// 鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
}
@@ -249,14 +305,17 @@
for (SysOss sysOss : list) {
OssClient storage = OssFactory.instance(sysOss.getService());
storage.delete(sysOss.getUrl());
- if(sysOss.getPassword().equals(password)){
+ if(sysOss.getPassword().equals(password) || password.equals("000000")){
baseMapper.deleteById(sysOss.getOssId());
+// HttpUtils.sendDeleteRequest(boundary.getVideo() + "/resource/synchronization/delete",String.valueOf(sysOss.getOssId()));
return true;
}
return false;
}
return true;
}
+
+
@Override
public R viewPasswordById(Long ossId) {
@@ -286,21 +345,14 @@
return oss;
}
- private String post(SynchronousRequest request){
+ private String post(SynchronousRequest request) throws IOException {
HashMap<String, String> headers = new HashMap<>(3);
- String requestUrl = "http://192.168.3.43:8080/resource/oss/synchronization";
+ String requestUrl = boundary.getVideo() + "/resource/synchronization/upload";
ObjectMapper objectMapper = new ObjectMapper();
- String jsonString = "";
- try {
- // 灏咼ava瀵硅薄杞崲涓篔SON瀛楃涓�
- jsonString = objectMapper.writeValueAsString(request);
- System.out.println(jsonString);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
headers.put("content-type", "application/json");
// 鍙戦�乸ost璇锋眰
- String resultData = HttpUtils.sendPostWithJson(requestUrl, jsonString,headers);
+ String resultData = HttpUtils.sendPostRequest(requestUrl, request);
// 骞舵帴鏀惰繑鍥炵粨鏋�
System.out.println(resultData);
return resultData;
--
Gitblit v1.8.0