Selaa lähdekoodia

修改回调日志信息

syh 5 vuotta sitten
vanhempi
commit
7a06d52f70

+ 16 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/dto/FileDTO.java

@@ -49,5 +49,21 @@ public class FileDTO {
     private UserAclBO user_acl;
     private WatermarkBO watermark;
 
+    @Override
+    public String toString() {
+        return "FileDTO{" +
+                "id='" + id + '\'' +
+                ", name='" + name + '\'' +
+                ", version=" + version +
+                ", size=" + size +
+                ", creator='" + creator + '\'' +
+                ", modifier='" + modifier + '\'' +
+                ", create_time=" + create_time +
+                ", modify_time=" + modify_time +
+                ", download_url='" + download_url + '\'' +
+                ", user_acl=" + user_acl +
+                ", watermark=" + watermark +
+                '}';
+    }
 }
 

+ 14 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/dto/UserDTO.java

@@ -7,10 +7,10 @@ import lombok.Data;
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class UserDTO {
 
-    private String id = "-1";
-    private String name = " ";
-    private String permission = "read";
-    private String avatar_url = "";
+    private String id;
+    private String name;
+    private String permission;
+    private String avatar_url;
 
     public UserDTO(){super();}
 
@@ -20,4 +20,14 @@ public class UserDTO {
         this.permission = permission;
         this.avatar_url = avatar_url;
     }
+
+    @Override
+    public String toString() {
+        return "UserDTO{" +
+                "id='" + id + '\'' +
+                ", name='" + name + '\'' +
+                ", permission='" + permission + '\'' +
+                ", avatar_url='" + avatar_url + '\'' +
+                '}';
+    }
 }

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

@@ -133,6 +133,7 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
     }
 
     private Map<String,Object> getDbFileInfo(String userId,String fileId){
+        log.info("获取dbfileInfo");
         Map<String,Object>result = new HashMap<>();
         WpsFile fileEntity = this.getById(fileId);
         // 初始化文件读写权限为read
@@ -145,7 +146,7 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
             BeanUtils.copyProperties(userAclEntity,userAcl);
             permission = userAclEntity.getPermission();
         }
-
+        log.info("permission:{}",permission);
         // 增加水印
         WpsFileWatermark watermarkEntity = wpsFileWatermarkService.findFirstByFileId(fileId);
         WatermarkBO watermark = new WatermarkBO();
@@ -168,7 +169,8 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
         file.setWatermark(watermark);
         result.put("file",file);
         result.put("user",user);
-        System.out.println(result.toString());
+        log.info("file:{}",file.toString());
+        log.info("user:{}",user.toString());
         return result;
     }