Kaynağa Gözat

修改回调日志信息

syh 5 yıl önce
ebeveyn
işleme
31fe410895

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

@@ -18,17 +18,17 @@ import java.util.Map;
  */
 public interface IWpsFileService extends IService<WpsFile> {
 
-    Map<String, Object> getFileInfo(String w_userid, String w_filepath, String w_filetype);
+    Map<String, Object> getFileInfo(String userId, String filePath, String fileType,String fileId);
 
-    Map<String, Object> fileSave(MultipartFile file, String w_userid);
+    Map<String, Object> fileSave(MultipartFile file, String userId);
 
     Map<String, Object> fileVersion(Integer version);
 
-    void fileRename(String name, String w_userid);
+    void fileRename(String name, String userId);
 
     Map<String, Object> fileHistory(FileReqDTO req);
 
-    Map<String, Object> fileNew(MultipartFile file, String w_userid);
+    Map<String, Object> fileNew(MultipartFile file, String userId);
 
     Token getViewUrl(String fileUrl, boolean b);
 

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

@@ -103,11 +103,11 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
     }
 
     @Override
-    public Map<String,Object> getFileInfo(String userId, String filePath,String _w_filetype){
-        if ("web".equalsIgnoreCase(_w_filetype)){
+    public Map<String,Object> getFileInfo(String userId, String filePath,String fileType,String fileId){
+        if ("web".equalsIgnoreCase(fileType)){
             return getWebFileInfo(filePath);
-        }else if ("db".equalsIgnoreCase(_w_filetype)){
-            return getDbFileInfo(userId);
+        }else if ("db".equalsIgnoreCase(fileType)){
+            return getDbFileInfo(userId,fileId);
         }
         return null;
     }
@@ -132,11 +132,9 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
         return result;
     }
 
-    private Map<String,Object> getDbFileInfo(String userId){
-        String fileId = Context.getFileId();
-        // 获取文件信息
+    private Map<String,Object> getDbFileInfo(String userId,String fileId){
+        Map<String,Object>result = new HashMap<>();
         WpsFile fileEntity = this.getById(fileId);
-
         // 初始化文件读写权限为read
         String permission = "read";
 
@@ -168,13 +166,10 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
         BeanUtils.copyProperties(fileEntity,file);
         file.setUser_acl(userAcl);
         file.setWatermark(watermark);
-
-        return new HashMap<String, Object>(){
-            {
-                put("file", file);
-                put("user", user);
-            }
-        };
+        result.put("file",file);
+        result.put("user",user);
+        System.out.println(result.toString());
+        return result;
     }
 
     @Override