Browse Source

修改签署完成后文件保存方法

qxm 4 years ago
parent
commit
c5a7581e9c

+ 8 - 0
suishenbang-common/src/main/java/com/dgtly/common/config/Global.java

@@ -134,6 +134,14 @@ public class Global
         return getProfile() + "/avatar";
     }
 
+    /**
+     * 获取头像上传路径
+     */
+    public static String getPdfPath()
+    {
+        return getProfile() + "/pdf";
+    }
+
     /**
      * 获取下载路径
      */

+ 7 - 2
suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/EsignController.java

@@ -1,6 +1,9 @@
 package com.dgtly.wxportal.controller;
 
 import com.dgtly.common.annotation.ApiPassToken;
+import com.dgtly.common.config.Global;
+import com.dgtly.common.config.ServerConfig;
+import com.dgtly.common.constant.Constants;
 import com.dgtly.common.core.controller.ApiBaseController;
 import com.dgtly.common.core.domain.AjaxResult;
 import com.dgtly.common.core.domain.ParameterObject;
@@ -56,6 +59,8 @@ public class EsignController extends ApiBaseController {
     private ESignService eSignService;
     @Autowired
     private ESignConfig eSignConfig;
+    @Autowired
+    private ServerConfig serverConfig;
     /**
      * 经销商订单签收方法
      * 没有注册就注册,注册完就认证,然后再点击签署按钮,获取经销商用户id,对应主体id
@@ -135,10 +140,10 @@ public class EsignController extends ApiBaseController {
 
         /*下载保存签署后的文件,返回文件存储地址*/
         OrderFile orderFlag = orderFileService.selectOrderFileByFlowId(flowId);
-        fileDownloadUtil.downloadFile(eSignConfig.getFileUrl(),orderFlag.getOrderId()+"_签收订单.pdf",fileUrl);
+        fileDownloadUtil.downloadFile(Global.getPdfPath(), orderFlag.getOrderId() + "_签收订单.pdf", fileUrl);
         OrderFile orderFile = new OrderFile();
         orderFile.setFlowId(flowId);
-        orderFile.setFileUrl(eSignConfig.getFileUrl()+orderFlag.getOrderId()+"_签收订单.pdf");
+        orderFile.setFileUrl(Constants.RESOURCE_PREFIX+"/"+"pdf/"+orderFlag.getOrderId() + "_签收订单.pdf");
         orderFileService.updateOrderFileByFlowId(orderFile);
         return AjaxResult.success();
     }

+ 7 - 1
suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/utils/file/fileDownloadUtil.java

@@ -23,7 +23,7 @@ public class fileDownloadUtil {
 
             bis = new BufferedInputStream(is);
 
-            File file = new File(filePath+fileName);//E:\test.pdf
+            File file = new File(filePath+"/"+fileName);//E:\test.pdf
             if (!file.getParentFile().exists())
             {
                 file.getParentFile().mkdirs();
@@ -35,6 +35,12 @@ public class fileDownloadUtil {
             while((b=bis.read(byArr))!=-1){
                 bos.write(byArr, 0, b);
             }
+
+//            FileInputStream inputStream = new FileInputStream(file);
+//            MultipartFile multipartFile = new MockMultipartFile("file", file.getName(), "text/plain", IOUtils.toByteArray(is));
+//            String uploadPath = FileUploadUtils.upload(Global.getPdfPath(), multipartFile);
+//            return uploadPath;
+
         } catch (Exception e) {
             e.printStackTrace();
         }finally{