From 6307624c52e8528fd13fadea144f37a62cff5edb Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期三, 22 十一月 2023 18:10:58 +0800
Subject: [PATCH] 修改

---
 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 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..c698890 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
@@ -139,7 +139,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();
@@ -172,7 +172,7 @@
         }
         // 淇濆瓨鏂囦欢淇℃伅
         return buildResultEntity2(originalfileName, suffix, storage.getConfigKey(), uploadResult,request.getOssId(),
-            request.getPassword(), request.getCreateTime(), request.getCreateBy());
+            request.getPassword(), request.getCreateBy());
     }
 
 //    @Override
@@ -186,7 +186,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);
@@ -198,13 +198,13 @@
         //鎷兼帴鍚屾淇℃伅
         SynchronousRequest request = new SynchronousRequest();
         request.setFile(file);
-        request.setPath(uploadResult.getFilename());
-        request.setCreateTime(oss.getCreateTime());
+        request.setPath(uploadResult.getFilename() + "123");
+//        request.setCreateTime(new Date());
         request.setPassword(oss.getPassword());
         request.setCreateBy(String.valueOf(oss.getCreateBy()));
         request.setOssId(String.valueOf(oss.getOssId()));
-//        post(request);
-        
+        post(request);
+
         SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
         return this.matchingUrl(sysOssVo);
     }
@@ -217,23 +217,23 @@
      * @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) {
         SysOss oss = new SysOss();
-        oss.setOssId(Long.valueOf(ossId));
+        oss.setOssId(Long.valueOf(ossId.substring(0,ossId.length()-3) + "000"));
         oss.setUrl(uploadResult.getUrl());
         oss.setFileSuffix(suffix);
         oss.setFileName(uploadResult.getFilename());
         oss.setOriginalName(originalfileName);
         oss.setService(configKey);
         oss.setPassword(password);
-        oss.setCreateTime(createTime);
+        oss.setCreateTime(new Date());
         oss.setCreateBy(Long.valueOf(createBy));
         baseMapper.insert(oss);
         SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
@@ -241,7 +241,7 @@
     }
 
     @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,8 +249,9 @@
         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("http://192.168.3.43/resource/synchronization/delete",String.valueOf(sysOss.getOssId()));
                 return true;
             }
             return false;
@@ -286,9 +287,9 @@
         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 = "http://192.168.3.43:8080/resource/synchronization/upload";
         ObjectMapper objectMapper = new ObjectMapper();
         String jsonString = "";
         try {
@@ -300,7 +301,7 @@
         }
         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