syh 5 rokov pred
rodič
commit
fcad365aa0

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

@@ -81,9 +81,10 @@ public class FileCallBackController{
      * 文件重命名
      */
     @PutMapping("rename")
-    public ResponseEntity<Object> fileRename(@RequestBody FileReqDTO req, String _w_userid){
+    public ResponseEntity<Object> fileRename(@RequestBody FileReqDTO req, String _w_userid,HttpServletRequest request){
         log.info("文件重命名param:{},userId:{}", JSON.toJSON(req),_w_userid);
-        wpsFileService.fileRename(req.getName(),_w_userid);
+        String fileId = request.getHeader("x-weboffice-file-id");
+        wpsFileService.fileRename(req.getName(),_w_userid,fileId);
         return Response.success();
     }
 

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

@@ -24,7 +24,7 @@ public interface IWpsFileService extends IService<WpsFile> {
 
     Map<String, Object> fileVersion(Integer version);
 
-    void fileRename(String name, String userId);
+    void fileRename(String name, String userId,String fileId);
 
     Map<String, Object> fileHistory(FileReqDTO req);
 

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

@@ -147,7 +147,6 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
         log.info("获取dbfileInfo");
         Map<String,Object>result = new HashMap<>();
         WpsFile fileEntity = this.getById(fileId);
-        // 初始化文件读写权限为read
         String permission = "write";
 
         UserAclBO userAcl = new UserAclBO();
@@ -180,8 +179,7 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
     }
 
     @Override
-    public void fileRename(String fileName, String userId){
-        String fileId = Context.getFileId();
+    public void fileRename(String fileName, String userId,String fileId){
         WpsFile file = this.getById(fileId);
         if (file != null){
             file.setName(fileName);
@@ -204,13 +202,10 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
         // 保存文件
         WpsFile f = new WpsFile(fileName,1,fileSize,userId,userId,dataTime,dataTime,fileUrl);
         this.save(f);
-
         // 处理权限
         wpsUserAclService.saveUserFileAcl(userId,f.getId());
-
         // 处理水印
         wpsFileWatermarkService.saveWatermark(f.getId());
-
         // 处理返回
         Map<String,Object> map = new HashMap<>();
         map.put("redirect_url",this.getViewUrl(f.getId(),userId,false).getWpsUrl());