瀏覽代碼

add file version

zero 7 月之前
父節點
當前提交
45c3b33ac6

+ 0 - 11
src/main/java/com/example/fms/common/model/vo/FileVersionCallbackVO.java

@@ -1,11 +0,0 @@
-package com.example.fms.common.model.vo;
-
-import lombok.Data;
-
-@Data
-public class FileVersionCallbackVO {
-
-    private String data;
-
-    private Integer code;
-}

+ 1 - 1
src/main/java/com/example/fms/common/model/vo/FileVersionInfoVO.java

@@ -11,7 +11,7 @@ public class FileVersionInfoVO {
     private Integer fileVersionId;
     private String fileName;
     private String fileType;
-    private String fileKey;
+    private String key;
     private String url;
     private String changesUrl;
     private Integer version;

+ 7 - 8
src/main/java/com/example/fms/controller/FileVersionController.java

@@ -3,7 +3,6 @@ package com.example.fms.controller;
 import com.example.fms.common.model.dto.ForceSaveDTO;
 import com.example.fms.common.model.dto.QueryFileVersionDTO;
 import com.example.fms.common.model.dto.RestoreFileVersionDTO;
-import com.example.fms.common.model.vo.FileVersionCallbackVO;
 import com.example.fms.common.model.vo.FileVersionInfoVO;
 import com.example.fms.common.model.vo.ForceSaveVO;
 import com.example.fms.common.model.vo.QueryFileVersionHistoryVO;
@@ -17,13 +16,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 
 @Tag(name = "文件版本模块")
 @Slf4j
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/fileVersion")
+@RequestMapping("/onlyOffice")
 public class FileVersionController {
 
     @Autowired
@@ -31,17 +31,16 @@ public class FileVersionController {
 
     @PostMapping("/callback")
     @Operation(summary = "onlyoffice回调函数(文件保存)")
-    public FileVersionCallbackVO callback(@RequestBody Map<String, Object> params, @RequestParam String guid,
+    public Map<String,Integer> callback(@RequestBody Map<String, Object> params, @RequestParam String guid,
                                           @RequestParam String fileName, @RequestParam String user,
                                           @RequestParam Integer previousVersion) throws IOException {
         Integer code = fileVersionService.callback(params, guid, fileName, user, previousVersion);
-        FileVersionCallbackVO callbackVO = new FileVersionCallbackVO();
-        callbackVO.setData("error");
-        callbackVO.setCode(code);
-        return callbackVO;
+        Map<String, Integer> map = new HashMap<>();
+        map.put("error", code);
+        return map;
     }
 
-    @PostMapping("/restoreFileVersion")
+    @PostMapping("/restoreVersion")
     @Operation(summary = "onlyoffice版本恢复")
     public String restoreFileVersion(@RequestBody RestoreFileVersionDTO vo) {
         fileVersionService.restoreFileVersion(vo);

+ 32 - 0
src/main/java/com/example/fms/controller/JwtController.java

@@ -0,0 +1,32 @@
+package com.example.fms.controller;
+
+import com.example.fms.common.model.dto.ForceSaveDTO;
+import com.example.fms.common.utils.JWTUtils;
+import com.example.fms.common.utils.Response;
+import com.google.gson.Gson;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@Tag(name = "jwt模块")
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/jwt/Common")
+public class JwtController {
+
+    @PostMapping("/GetJWT")
+    @Operation(summary = "获取jwt加密后的token")
+    public String queryFileVersionHistory(@RequestBody Map<String,String> map) {
+        String jsons = map.get("jsons");
+        String jwt = JWTUtils.createJWT2(jsons);
+        return Response.success(jwt);
+    }
+}

+ 2 - 0
src/main/java/com/example/fms/service/FileVersionService.java

@@ -267,6 +267,7 @@ public class FileVersionService {
         if (ObjectUtils.isNotEmpty(fileVersion)) {
             BeanUtils.copyProperties(fileVersion, infoVO);
             infoVO.setFileVersionId(fileVersion.getId());
+            infoVO.setKey(fileVersion.getFileKey());
         }
         return infoVO;
     }
@@ -287,6 +288,7 @@ public class FileVersionService {
                 FileVersionInfoVO infoVO = new FileVersionInfoVO();
                 BeanUtils.copyProperties(i, infoVO);
                 infoVO.setFileVersionId(i.getId());
+                infoVO.setKey(i.getFileKey());
                 fileVersionInfoVOS.add(infoVO);
             });
             historyVO.setFileVersionInfoVOS(fileVersionInfoVOS);

+ 2 - 3
src/main/resources/mapper/FileVersionMapper.xml

@@ -3,13 +3,12 @@
 
 <mapper namespace="com.example.fms.mapper.FileVersionMapper">
     <sql id="Base_Column_File_Version">
-        id,file_name,file_type,file_key,url,changes_url,version,
+        ID,file_name,file_type,file_key,url,changes_url,version,
         original_file,changes,server_version,previous_version,user,created
     </sql>
 
     <sql id="Base_Column_File_Operate_Record">
-        id,file_name,file_type,file_key,url,changes_url,version,
-        original_file,changes,server_version,previous_version,user,created
+        ID,current_version,previous_version,original_file,operate,user_id,user_name,create_time
     </sql>
 
     <select id="queryFileVersionByGuid" resultType="com.example.fms.domain.FileVersion">