添加了 update 4dage

src/main/java/com/fd/constant/ErrorCode.java

@@ -3,7 +3,9 @@ package com.fd.constant;
 /**
  * Created by Owen on 2019/10/25 0025 15:10
  */
-public class ErrorCode {
+public class MsgCode {
+
+    public static final String SUCCESS = "success";
 
     public static final String E50001 = "文件为空";
 

src/main/java/com/fd/controller/VtsModelController.java

@@ -3,7 +3,7 @@ package com.fd.controller;
 import com.fd.Dto.FdageDto;
 import com.fd.Dto.PageDto;
 import com.fd.constant.CommandMsg;
-import com.fd.constant.ErrorCode;
+import com.fd.constant.MsgCode;
 import com.fd.constant.TypeCode;
 import com.fd.entity.FileEntity;
 import com.fd.entity.GenerateFileEntity;
@@ -106,7 +106,7 @@ public class VtsModelController {
 
         Optional<FileEntity> entity = fileRepository.findById(fileId);
         if (!entity.isPresent()) {
-            return new ResponseResult(50002, ErrorCode.E50002);
+            return new ResponseResult(50002, MsgCode.E50002);
         }
 
         FileEntity fileEntity = entity.get();
@@ -143,7 +143,7 @@ public class VtsModelController {
             log.info("run CmdSlpk2vtsThread");
             Integer s = cmdServer.exeCmdSlpk2vts(cmd, fileId);
             if (s == 1) {
-                log.info("cmd  run: {}", ErrorCode.E50005);
+                log.info("cmd  run: {}", MsgCode.E50005);
             }
             log.info("cmd  run : success");
             fileEntity.setStatus(1); // 1：表示文件执行完成
@@ -181,7 +181,7 @@ public class VtsModelController {
 
         Optional<FileEntity> entity = fileRepository.findById(fileId);
         if (!entity.isPresent()) {
-            return new ResponseResult(50002, ErrorCode.E50002);
+            return new ResponseResult(50002, MsgCode.E50002);
         }
 
         FileEntity fileEntity = entity.get();
@@ -219,7 +219,7 @@ public class VtsModelController {
             log.info("run CmdVtsThread");
             Integer s = cmdServer.exeCmdVts(cmd, fileId);
             if (s == 1) {
-                log.info("cmd  run: {}", ErrorCode.E50005);
+                log.info("cmd  run: {}", MsgCode.E50005);
             }
             log.info("cmd  run : success");
             fileEntity.setStatus(2); // 2：表示VTS命令执行完成
@@ -237,7 +237,7 @@ public class VtsModelController {
         log.info("run commandVtsRemove");
         GenerateFileEntity entity = generateFileRepository.findByFileId(fileId);
         if (entity == null) {
-            return new ResponseResult(50002, ErrorCode.E50002);
+            return new ResponseResult(50002, MsgCode.E50002);
         }
 
         String fileName = entity.getFileName();
@@ -246,8 +246,8 @@ public class VtsModelController {
 
         Integer s = cmdServer.exeCmd(cmd);
         if (s ==1) {
-            log.info("cmd  run: {}", ErrorCode.E50005);
-            return new ResponseResult(50005, ErrorCode.E50005);
+            log.info("cmd  run: {}", MsgCode.E50005);
+            return new ResponseResult(50005, MsgCode.E50005);
         }
         log.info("cmd  run : success");
 
@@ -262,8 +262,8 @@ public class VtsModelController {
 
         Integer s = cmdServer.exeCmd(CommandMsg.MODEL_USER_VTS);
         if (s ==1) {
-            log.info("cmd  run: {}", ErrorCode.E50005);
-            return new ResponseResult(50005, ErrorCode.E50005);
+            log.info("cmd  run: {}", MsgCode.E50005);
+            return new ResponseResult(50005, MsgCode.E50005);
         }
         log.info("cmd  run : success");
 
@@ -280,13 +280,13 @@ public class VtsModelController {
     }
 
 
-    @GetMapping("test")
-    private ResponseResult test() {
-        log.info("run test: {}");
-
-
-        return new ResponseResult(200, "123");
-    }
+//    @GetMapping("test")
+//    private ResponseResult test() {
+//        log.info("run test: {}");
+//
+//
+//        return new ResponseResult(200, "123");
+//    }
 
 
     /**

src/main/java/com/fd/controller/VtsVectorController.java

@@ -1,10 +1,9 @@
 package com.fd.controller;
 
-import com.fd.Dto.FdageDto;
 import com.fd.Dto.PageDto;
 import com.fd.Dto.VectorResourcesJsonDto;
 import com.fd.constant.CommandMsg;
-import com.fd.constant.ErrorCode;
+import com.fd.constant.MsgCode;
 import com.fd.constant.TypeCode;
 import com.fd.entity.FileEntity;
 import com.fd.repository.FileRepository;
@@ -92,7 +91,7 @@ public class VtsVectorController {
 
         Optional<FileEntity> entity = fileRepository.findById(fileId);
         if (!entity.isPresent()) {
-            return new ResponseResult(50002, ErrorCode.E50002);
+            return new ResponseResult(50002, MsgCode.E50002);
         }
 
         FileEntity fileEntity = entity.get();
@@ -105,8 +104,8 @@ public class VtsVectorController {
 
         Integer s = cmdServer.exeCmd(cmd, fileId);
         if (s == 1) {
-            log.info("cmd  run: {}", ErrorCode.E50005);
-            return new ResponseResult(50005, ErrorCode.E50005);
+            log.info("cmd  run: {}", MsgCode.E50005);
+            return new ResponseResult(50005, MsgCode.E50005);
         }
         log.info("cmd  run : success");
 
@@ -132,7 +131,7 @@ public class VtsVectorController {
 
         Optional<FileEntity> entity = fileRepository.findById(fileId);
         if (!entity.isPresent()) {
-            return new ResponseResult(50002, ErrorCode.E50002);
+            return new ResponseResult(50002, MsgCode.E50002);
         }
 
         FileEntity fileEntity = entity.get();
@@ -145,8 +144,8 @@ public class VtsVectorController {
         log.info("cmd: {}", cmd);
         Integer s = cmdServer.exeCmd(cmd, fileId);
         if (s ==1) {
-            log.info("cmd  run: {}", ErrorCode.E50005);
-            return new ResponseResult(50005, ErrorCode.E50005);
+            log.info("cmd  run: {}", MsgCode.E50005);
+            return new ResponseResult(50005, MsgCode.E50005);
         }
         log.info("cmd  run : success");
 
@@ -163,11 +162,23 @@ public class VtsVectorController {
     }
 
 
+//    @ApiOperation("update 4dage")
+//    @GetMapping("update/fdage/{param}/")
+//    private ResponseResult updateFdage(@PathVariable("param") String param){
+//        log.info("run updateFdage");
+//        jsonServer.updateVectroFdage(param);
+//        return new ResponseResult(200,"success");
+//    }
+
+
+    /**
+     * restful 风格会，参数多，会传不进来
+     */
     @ApiOperation("update 4dage")
-    @PostMapping("update/fdage")
-    private ResponseResult updateFdage(@RequestBody FdageDto param){
+    @GetMapping("update/fdage")
+    private ResponseResult updateFdage(String param){
         log.info("run updateFdage");
-        jsonServer.updateFdage(param);
+        jsonServer.updateVectroFdage(param);
         return new ResponseResult(200,"success");
     }
 

src/main/java/com/fd/server/JsonServer.java

@@ -3,6 +3,7 @@ package com.fd.server;
 import com.fd.Dto.FdageDto;
 import com.fd.Dto.ResourcesJsonDto;
 import com.fd.Dto.VectorResourcesJsonDto;
+import com.fd.util.ResponseResult;
 
 /**
  * Created by Owen on 2019/10/30 0030 17:16
@@ -15,4 +16,6 @@ public interface JsonServer {
     void updateResourcesJson(ResourcesJsonDto param);
 
     void updateFdage(FdageDto param);
+
+    ResponseResult updateVectroFdage(String param);
 }

src/main/java/com/fd/server/impl/FileServerImpl.java

@@ -1,6 +1,6 @@
 package com.fd.server.impl;
 
-import com.fd.constant.ErrorCode;
+import com.fd.constant.MsgCode;
 import com.fd.constant.TypeCode;
 import com.fd.entity.FileEntity;
 import com.fd.repository.FileRepository;
@@ -32,7 +32,7 @@ public class FileServerImpl implements FileServer {
     public ResponseResult uploadBigFile(MultipartFile file, String savePath) {
         if (file.isEmpty() || file.getSize() <= 0) {
             log.info("文件为空");
-            return new ResponseResult (50001, ErrorCode.E50001);
+            return new ResponseResult (50001, MsgCode.E50001);
         }
 
         // 文件名全名
@@ -75,7 +75,7 @@ public class FileServerImpl implements FileServer {
     public ResponseResult upload2(MultipartFile file, String savePath) {
         if (file.isEmpty() || file.getSize() <= 0) {
             log.info("文件为空");
-            return new ResponseResult (50001, ErrorCode.E50001);
+            return new ResponseResult (50001, MsgCode.E50001);
         }
 
         // 文件名全名
@@ -121,7 +121,7 @@ public class FileServerImpl implements FileServer {
         // 删除服务器文件
         Optional<FileEntity> e = fileRepository.findById(id);
         if (!e.isPresent()) {
-            return new ResponseResult(50002, ErrorCode.E50002);
+            return new ResponseResult(50002, MsgCode.E50002);
         }
         FileEntity fileEntity = e.get();
         String fileName = fileEntity.getFileName();