diff --git a/sgtjzhzxsp-business/src/main/java/com/bhne/service/ZhUploadSliceService.java b/sgtjzhzxsp-business/src/main/java/com/bhne/service/ZhUploadSliceService.java index bc00e6ea..156f310f 100644 --- a/sgtjzhzxsp-business/src/main/java/com/bhne/service/ZhUploadSliceService.java +++ b/sgtjzhzxsp-business/src/main/java/com/bhne/service/ZhUploadSliceService.java @@ -15,6 +15,7 @@ import java.io.FileNotFoundException; */ public interface ZhUploadSliceService extends IService { public AjaxResult uploadSlice (MultipartFile file, String hash, String filename, Integer seq, String type); + public AjaxResult checkMerge(String filename, String type, String hash,Integer sliceCount); public AjaxResult uploadMerge(String filename, String type, String hash); public AjaxResult downloadFile(String fileName); public AjaxResult getFileUrl(String fileName); diff --git a/sgtjzhzxsp-business/src/main/java/com/bhne/service/impl/ZhUploadSliceServiceImpl.java b/sgtjzhzxsp-business/src/main/java/com/bhne/service/impl/ZhUploadSliceServiceImpl.java index 1a5e4da1..2e253d7b 100644 --- a/sgtjzhzxsp-business/src/main/java/com/bhne/service/impl/ZhUploadSliceServiceImpl.java +++ b/sgtjzhzxsp-business/src/main/java/com/bhne/service/impl/ZhUploadSliceServiceImpl.java @@ -63,6 +63,23 @@ public class ZhUploadSliceServiceImpl extends ServiceImpl0 ? false : true); + resp.put("deSlice",deSlice); + return resp; + } /** * 合并文件 * @@ -77,6 +109,7 @@ public class UploadSliceUtil { resp.put("success",false); resp.put("msg","上传失败"); log.error(hash+"文件合并失败,分片目录不存在。"); + return resp; } // 这里通过FileChannel来实现信息流复制 FileChannel out = null;