Ver código fonte

add file version

zero 7 meses atrás
pai
commit
9694ba2afa

+ 1 - 0
src/main/java/com/example/fms/common/core/Constants.java

@@ -44,6 +44,7 @@ public class Constants {
     public static final String PROJECT_FIELD_PATENT_LINK_FILE_NAME = "project-field-patent-link.json";
 
     public static final String API_XiaoSHI = "/api/xiaoshi";
+    public static final String API_FMS = "/api/fms";
 
     public static final Integer PATENT_CLASS_NUMBER_IPC = 1;
     public static final Integer PATENT_CLASS_NUMBER_CPC = 2;

+ 4 - 4
src/main/java/com/example/fms/common/core/base/WebSocketConfig.java

@@ -6,8 +6,8 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 @Configuration
 public class WebSocketConfig {
-//    @Bean
-//    public ServerEndpointExporter serverEndpointExporter() {
-//        return new ServerEndpointExporter();
-//    }
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+        return new ServerEndpointExporter();
+    }
 }

+ 3 - 6
src/main/java/com/example/fms/service/FileVersionService.java

@@ -11,7 +11,6 @@ import com.example.fms.common.model.vo.ForceSaveVO;
 import com.example.fms.common.model.vo.QueryFileVersionHistoryVO;
 import com.example.fms.common.model.vo.WebSocketMessageVO;
 import com.example.fms.common.utils.FileUtils;
-import com.example.fms.common.utils.JWTUtils;
 import com.example.fms.common.utils.RandomUtil;
 import com.example.fms.domain.FileOperateRecord;
 import com.example.fms.domain.FileVersion;
@@ -22,12 +21,10 @@ import com.example.fms.service.permissions.MessageService;
 import com.example.fms.service.permissions.PermissionService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.compress.utils.IOUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
@@ -89,9 +86,9 @@ public class FileVersionService {
                     flag = false;
                 }
                 WebSocketMessageVO messageVO = new WebSocketMessageVO();
-                messageVO.setMessage("版本文件已保存");
+                messageVO.setMessage("源文件已更新");
                 messageVO.setCode(702);
-                messageService.sendMessage(messageVO);
+                messageService.sendSavaMessage(messageVO);
             }
             if (status == 2) {
                 if (StringUtils.isNotEmpty(url)) {
@@ -242,7 +239,7 @@ public class FileVersionService {
         WebSocketMessageVO messageVO = new WebSocketMessageVO();
         messageVO.setMessage("版本文件已恢复");
         messageVO.setCode(703);
-        messageService.sendMessage(messageVO);
+        messageService.sendRecoverMessage(messageVO);
     }
 
     /**

+ 6 - 1
src/main/java/com/example/fms/service/permissions/MessageService.java

@@ -14,10 +14,15 @@ import org.springframework.stereotype.Service;
 @Service
 public class MessageService {
 
-    public void sendMessage(WebSocketMessageVO webSocketMessageVO) {
+    public void sendSavaMessage(WebSocketMessageVO webSocketMessageVO) {
         //通过WebSocket 在每一次循环结束后 向前端发送完成进度
         //当任务状态为完成时,flag为true
         WebSocketServer.sendInfo(Response.websocket(webSocketMessageVO, ResponseEnum.WEB_SOCKET_SUCCESS), null);
     }
 
+    public void sendRecoverMessage(WebSocketMessageVO webSocketMessageVO) {
+        //通过WebSocket 在每一次循环结束后 向前端发送完成进度
+        //当任务状态为完成时,flag为true
+        WebSocketServer.sendInfo(Response.websocket(webSocketMessageVO, ResponseEnum.WEB_SOCKET_RECOVER_SUCCESS), null);
+    }
 }

+ 1 - 1
src/main/java/com/example/fms/service/permissions/WebSocketServer.java

@@ -13,7 +13,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
 
 @Slf4j
 @Component
-@ServerEndpoint(Constants.API_XiaoSHI + "/ws/{sid}")
+@ServerEndpoint(Constants.API_FMS + "/ws/{sid}")
 public class WebSocketServer {
 
     //静态变量,用来记录当前在线连接数。应该把它设计成线程安全的。