From 092388508feed9e82ded672e4a0d94e8844b495c Mon Sep 17 00:00:00 2001
From: "udf_admin@163.com" <udf_admin@163.com>
Date: Sun, 17 Dec 2017 20:55:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6=E5=BC=82?=
 =?UTF-8?q?=E6=AD=A5=E4=B8=8B=E8=BD=BD=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aliyun/oss/api/download/DownLoadParam.java |  5 +++++
 .../api/download/DownLoadProcessAspect.java    | 18 ++++++++++++++++--
 .../oss/api/download/IDownLoadProcess.java     |  6 ++++--
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/udf-starter-file-aliyun-oss-api/src/main/java/org/itkk/udf/file/aliyun/oss/api/download/DownLoadParam.java b/udf-starter-file-aliyun-oss-api/src/main/java/org/itkk/udf/file/aliyun/oss/api/download/DownLoadParam.java
index 4e1b0d6..5678cb1 100644
--- a/udf-starter-file-aliyun-oss-api/src/main/java/org/itkk/udf/file/aliyun/oss/api/download/DownLoadParam.java
+++ b/udf-starter-file-aliyun-oss-api/src/main/java/org/itkk/udf/file/aliyun/oss/api/download/DownLoadParam.java
@@ -30,6 +30,11 @@ public class DownLoadParam<T> implements Serializable {
      */
     private String id;
 
+    /**
+     * ossCode
+     */
+    private String ossCode;
+
     /**
      * 描述 : 消息体
      */
diff --git a/udf-starter-file-aliyun-oss-api/src/main/java/org/itkk/udf/file/aliyun/oss/api/download/DownLoadProcessAspect.java b/udf-starter-file-aliyun-oss-api/src/main/java/org/itkk/udf/file/aliyun/oss/api/download/DownLoadProcessAspect.java
index 1920f8c..66816d4 100644
--- a/udf-starter-file-aliyun-oss-api/src/main/java/org/itkk/udf/file/aliyun/oss/api/download/DownLoadProcessAspect.java
+++ b/udf-starter-file-aliyun-oss-api/src/main/java/org/itkk/udf/file/aliyun/oss/api/download/DownLoadProcessAspect.java
@@ -12,11 +12,13 @@ import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.itkk.udf.cache.redis.CacheRedisProperties;
 import org.itkk.udf.core.exception.SystemRuntimeException;
+import org.itkk.udf.file.aliyun.oss.api.OssWarpper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
+import java.io.File;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -52,13 +54,19 @@ public class DownLoadProcessAspect {
     @Autowired
     private CacheRedisProperties cacheRedisProperties;
 
+    /**
+     * ossWarpper
+     */
+    @Autowired
+    private OssWarpper ossWarpper;
+
     /**
      * around
      *
      * @param proceedingJoinPoint proceedingJoinPoint
      * @return Object
      */
-    @Around("this(org.itkk.udf.file.aliyun.oss.api.download.IDownLoadProcess)")
+    @Around("this(org.itkk.udf.file.aliyun.oss.api.download.IDownLoadProcess) && args(org.itkk.udf.file.aliyun.oss.api.download.DownLoadParam)")
     public Object around(ProceedingJoinPoint proceedingJoinPoint) {
         //定义返回值
         Object result = null;
@@ -77,9 +85,15 @@ public class DownLoadProcessAspect {
                 redisTemplate.opsForValue().set(key, info, DOWNLOAD_CACHE_EXPIRATION, TimeUnit.MINUTES);
                 //执行
                 result = proceedingJoinPoint.proceed();
+                //获得本地文件
+                File file = (File) result;
+                //上传文件到阿里云OSS
+                String objectKey = ossWarpper.uploadFile(param.getOssCode(), file);
+                //删除本地文件
+                file.delete();
                 //更新缓存
                 info.setStatus(DownConstant.DOWNLOAD_PROCESS_STATUS.STATUS_2.value());
-                info.setObjectKey(result.toString());
+                info.setObjectKey(objectKey);
                 redisTemplate.opsForValue().set(key, info, DOWNLOAD_CACHE_EXPIRATION, TimeUnit.MINUTES);
             } catch (Throwable e) {
                 //更新缓存
diff --git a/udf-starter-file-aliyun-oss-api/src/main/java/org/itkk/udf/file/aliyun/oss/api/download/IDownLoadProcess.java b/udf-starter-file-aliyun-oss-api/src/main/java/org/itkk/udf/file/aliyun/oss/api/download/IDownLoadProcess.java
index a6f0451..f93f1b7 100644
--- a/udf-starter-file-aliyun-oss-api/src/main/java/org/itkk/udf/file/aliyun/oss/api/download/IDownLoadProcess.java
+++ b/udf-starter-file-aliyun-oss-api/src/main/java/org/itkk/udf/file/aliyun/oss/api/download/IDownLoadProcess.java
@@ -6,6 +6,8 @@
  */
 package org.itkk.udf.file.aliyun.oss.api.download;
 
+import java.io.File;
+
 /**
  * 描述 : IDownLoadProcess
  *
@@ -17,8 +19,8 @@ public interface IDownLoadProcess<T> {
      * process
      *
      * @param param param
-     * @return String
+     * @return File
      */
-    String process(DownLoadParam<T> param);
+    File process(DownLoadParam<T> param);
 
 }