Browse Source

修改回调日志信息

syh 5 years ago
parent
commit
b06b6a5ccf

+ 3 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/FileCallBackController.java

@@ -60,9 +60,10 @@ public class FileCallBackController{
      * 上传文件新版本
      */
     @PostMapping("save")
-    public ResponseEntity<Object> fileSave(@RequestBody MultipartFile file, String _w_userid){
+    public ResponseEntity<Object> fileSave(@RequestBody MultipartFile file, String _w_userid,HttpServletRequest request){
         log.info("上传文件新版本");
-        Map<String,Object> map = wpsFileService.fileSave(file,_w_userid);
+        String fileId = request.getHeader("x-weboffice-file-id");
+        Map<String,Object> map = wpsFileService.fileSave(file,_w_userid,fileId);
         return Response.success(map);
     }
 

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/service/IWpsFileService.java

@@ -20,7 +20,7 @@ public interface IWpsFileService extends IService<WpsFile> {
 
     Map<String, Object> getFileInfo(String userId, String filePath, String fileType,String fileId);
 
-    Map<String, Object> fileSave(MultipartFile file, String userId);
+    Map<String, Object> fileSave(MultipartFile file, String userId,String fileId);
 
     Map<String, Object> fileVersion(Integer version);
 

+ 1 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/service/impl/WpsFileServiceImpl.java

@@ -263,13 +263,11 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
     }
 
     @Override
-    public Map<String,Object> fileSave(MultipartFile mFile,String userId){
+    public Map<String,Object> fileSave(MultipartFile mFile,String userId,String fileId){
         Date date = new Date();
         // 上传
         ResFileDTO resFileDTO = WpsOSSUtil.uploadMultipartFile(mFile);
         int size = (int) resFileDTO.getFileSize();
-
-        String fileId = Context.getFileId();
         WpsFile file = this.getById(fileId);
         FileDTO fileInfo = new FileDTO();