wps修改数据类型long-->int

tall/src/main/java/com/ccsens/tall/bean/vo/WpsVo.java

@@ -41,12 +41,12 @@ public class WpsVo {
         @ApiModelProperty("当前版本号，位数小于11")
         private Integer version;
         @ApiModelProperty("文件大小，单位为B")
-        private Long size;
+        private int size;
         @ApiModelProperty("文档下载地址")
         @JsonProperty("download_url")
         private String downloadUrl;
-        private Long create_time;
-        private Long modify_time;
+        private int create_time;
+        private int modify_time;
         private UserBase creator;
         private UserBase modifier;
         @JsonIgnore
@@ -120,14 +120,15 @@ public class WpsVo {
         @JsonProperty("version")
         private Integer currentVersion;
         @ApiModelProperty("文件大小，单位为B")
-        private Long size;
+        private int size;
         @ApiModelProperty("文档下载地址")
         @JsonProperty("download_url")
         private String downloadUrl;
         private String creator;
         private String modifier;
-        private Long create_time;
-        private Long modify_time;
+
+        private int create_time;
+        private int modify_time;
         @JsonIgnore
         private Long fileVersionId;
         public FileBase(){}
@@ -135,12 +136,12 @@ public class WpsVo {
             this.id = String.valueOf(wpsFile.getId());
             this.name = wpsFile.getName();
             this.currentVersion = wpsFile.getCurrentVersion();
-            this.size = wpsFile.getSize();
+            this.size = (int)(long)wpsFile.getSize();
             this.downloadUrl = wpsFile.getDownloadUrl();
             this.creator = String.valueOf(wpsFile.getCreator());
             this.modifier = String.valueOf(wpsFile.getModifier());
-            this.create_time = wpsFile.getCreatedAt().getTime()/1000;
-            this.modify_time = wpsFile.getUpdatedAt().getTime()/1000;
+            this.create_time = (int) (wpsFile.getCreatedAt().getTime()/1000);
+            this.modify_time = (int) (wpsFile.getUpdatedAt().getTime()/1000);
         }
     }
 
@@ -163,32 +164,33 @@ public class WpsVo {
         @ApiModelProperty("当前版本号，位数小于11")
         private Integer version;
         @ApiModelProperty("文件大小，单位为B")
-        private Long size;
+
+        private Integer size;
         @ApiModelProperty("文档下载地址")
         private String download_url;
         @ApiModelProperty("创建者id，字符串长度小于40")
         private String creator;
         @ApiModelProperty("创建时间，时间戳，单位为秒")
-        private Long create_time;
+        private Integer create_time;
         @ApiModelProperty("修改者id，字符串长度小于40")
         private String modifier;
         @ApiModelProperty("修改时间，时间戳，单位为秒")
-        private Long modify_time;
+        private Integer modify_time;
         @ApiModelProperty("用户权限")
         private UserAcl user_acl = new UserAcl();
         @ApiModelProperty("水印")
         private Watermark watermark;
 
-        public File(String id, String name, Integer version, Long size, String download_url, String creator, Long create_time, String modifier, Long modify_time) {
+        public File(String id, String name, Integer version, long size, String download_url, String creator, long create_time, String modifier, long modify_time) {
             this.id = id;
             this.name = name;
             this.version = version;
-            this.size = size;
+            this.size = (int)size;
             this.download_url = download_url;
             this.creator = creator;
-            this.create_time = create_time;
+            this.create_time = (int)create_time;
             this.modifier = modifier;
-            this.modify_time = modify_time;
+            this.modify_time = (int)modify_time;
         }
 
         public static File beanToVo(WpsFile wpsFile, String name) {

tall/src/main/java/com/ccsens/tall/service/WpsService.java

@@ -116,6 +116,9 @@ public class WpsService implements IWpsService {
         Long userId = getUserId(token);
         // 查找指定版本version
         Map<String, Object> map = wpsFileDao.getVersion(fileId, version);
+        if (map == null || map.isEmpty()) {
+            throw new BaseException(CodeEnum.FILE_NOT_FOUND);
+        }
         WpsVo.FileBase base = JSONObject.parseObject(JSONObject.toJSONString(map), WpsVo.FileBase.class);
         // 保存用户打开文件旧版本记录
         WpsFileUser wpsFileUser = initFileUser(userId, base.getFileVersionId());

tall/src/main/java/com/ccsens/tall/web/WpsController.java

@@ -72,7 +72,7 @@ public class WpsController {
     @ApiImplicitParams({
     })
     @PostMapping(value = "user/info", produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<WpsVo.UserInfo> userInfo(HttpServletRequest request, WpsDto.UserInfo userInfo,
+    public WpsVo.UserInfo userInfo(HttpServletRequest request, WpsDto.UserInfo userInfo,
                                    @RequestBody WpsDto.UserInfoBody body) throws Exception {
         log.info("获取用户信息请求参数：{}, ids:{}", userInfo, body);
         if (body.getIds() == null || body.getIds().length <= 0) {
@@ -82,7 +82,7 @@ public class WpsController {
         WpsHeader header = checkSignature(request, userInfo.get_w_signature());
         List<UserVo.UserInfo> infos = userService.queryUserInfos(body.getIds());
         log.info("获取用户信息：{}", infos);
-        return JsonResponse.newInstance().ok(WpsVo.UserInfo.getInstance(infos));
+        return WpsVo.UserInfo.getInstance(infos);
     }
 
     @ApiOperation(value = "上传文件新版本", notes = "编辑完保存回对应云盘")
@@ -192,6 +192,7 @@ public class WpsController {
             WpsHeader header = new WpsHeader();
             header.setUserAgent(request.getHeader("User-Agent"));
             header.setToken(request.getHeader("x-wps-weboffice-token"));
+//            header.setToken("eyJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1OTM0MTI5ODEsInN1YiI6IjEyMTgwMjUyNDk0OTMzNTY1NDQiLCJhdXRoSWQiOiIxMTgzNjM2MjkxNjQ5MTQ2ODgwIiwiZXhwIjoxNTkzNDk5MzgxfQ.c1kAovpN7tq6O4rykIoSF-VPgmYBAM2ZNeqH_jsipI4");
             header.setFileId(request.getHeader("x-weboffice-file-id"));
             return header;
         }

util/src/main/java/com/ccsens/util/JsonResponse.java

@@ -46,6 +46,7 @@ public class JsonResponse<T> {
     private String msg;
     @ApiModelProperty(value="成功与否")
     private boolean success;
+    private String status = "success";
 
     private JsonResponse() {
     }