lyhzzz 3 weeks ago
parent
commit
26856ba541

+ 9 - 6
src/main/java/com/fdkankan/manage_jp/controller/UserSceneController.java

@@ -79,8 +79,9 @@ public class UserSceneController extends BaseController{
      * num      场景码
      */
     @GetMapping("/checkDownLoadE57")
-    public Result checkDownLoadE57(@RequestParam(required = false) String num){
-        return Result.success(downService.checkDownLoadE57(num));
+    public Result checkDownLoadE57(@RequestParam(required = false) String num ,
+                                   @RequestParam(required = false) String splitType){
+        return Result.success(downService.checkDownLoadE57(num,splitType));
     }
 
     /**
@@ -88,8 +89,9 @@ public class UserSceneController extends BaseController{
      * num      场景码
      */
     @GetMapping("/downSceneE57")
-    public Result downSceneE57(@RequestParam(required = false) String num){
-        return Result.success(downService.downE57(num));
+    public Result downSceneE57(@RequestParam(required = false) String num ,
+                               @RequestParam(required = false) String splitType){
+        return Result.success(downService.downE57(num,splitType));
     }
 
     /**
@@ -97,8 +99,9 @@ public class UserSceneController extends BaseController{
      * num      场景码
      */
     @GetMapping("/downloadProcessE57")
-    public Result downloadProcessE57(@RequestParam(required = false) String num){
-        return Result.success(downService.downloadProcessE57(num));
+    public Result downloadProcessE57(@RequestParam(required = false) String num ,
+                                     @RequestParam(required = false) String splitType){
+        return Result.success(downService.downloadProcessE57(num,splitType));
     }
 
     @PostMapping("/delete")

+ 1 - 0
src/main/java/com/fdkankan/manage_jp/httpClient/param/SSDownSceneParam.java

@@ -6,4 +6,5 @@ import lombok.Data;
 public class SSDownSceneParam {
     private String sceneCode;
     private String lang;
+    private String splitType;
 }

+ 4 - 2
src/main/java/com/fdkankan/manage_jp/httpClient/service/LaserService.java

@@ -337,11 +337,12 @@ public class LaserService {
     }
 
 
-    public SSDownSceneVo downE57Status(String num) {
+    public SSDownSceneVo downE57Status(String num ,String splitType) {
         try {
             SSDownSceneVo vo ;
             SSDownSceneParam param = new SSDownSceneParam();
             param.setSceneCode(num);
+            param.setSplitType(splitType);
             Result responseEntity = laserClient.downE57Status(param);
             if( responseEntity.getCode() != HttpStatus.OK.value()){
                 log.error("downE57Status-根据场景码获取激光转台下载状态失败:{}",responseEntity);
@@ -361,11 +362,12 @@ public class LaserService {
         return null ;
     }
 
-    public SSDownSceneVo downE57(String num) {
+    public SSDownSceneVo downE57(String num ,String splitType) {
         try {
             SSDownSceneVo vo ;
             SSDownSceneParam param = new SSDownSceneParam();
             param.setSceneCode(num);
+            param.setSplitType(splitType);
             Result responseEntity = laserClient.downE57(param);
             if( responseEntity.getCode() != HttpStatus.OK.value()){
                 log.error("downE57-根据场景码获取激光转台下载失败:{}",responseEntity);

+ 3 - 3
src/main/java/com/fdkankan/manage_jp/service/IDownService.java

@@ -12,9 +12,9 @@ public interface IDownService {
     DownloadProcessVo downloadProcess(String num, Integer isObj,String lang);
 
 
-    DownVo checkDownLoadE57(String num);
+    DownVo checkDownLoadE57(String num ,String splitType);
 
-    DownVo downE57(String num);
+    DownVo downE57(String num ,String splitType);
 
-    DownloadProcessVo downloadProcessE57(String num);
+    DownloadProcessVo downloadProcessE57(String num,String splitType) ;
 }

+ 6 - 6
src/main/java/com/fdkankan/manage_jp/service/impl/DownService.java

@@ -301,9 +301,9 @@ public class DownService implements IDownService {
 
 
     @Override
-    public DownVo checkDownLoadE57(String num) {
+    public DownVo checkDownLoadE57(String num ,String splitType) {
         DownVo downVo = new DownVo();
-        SSDownSceneVo vo = laserService.downE57Status(num);
+        SSDownSceneVo vo = laserService.downE57Status(num,splitType);
         if(vo == null){
             throw new BusinessException(ResultCode.SS_SCENE_DOWN_ERROR);
         }
@@ -322,11 +322,11 @@ public class DownService implements IDownService {
     }
 
     @Override
-    public DownVo downE57(String num) {
+    public DownVo downE57(String num ,String splitType) {
         DownVo downVo = new DownVo();
 
         //status :0:正在生成 1,初次生成  2,已经生成直接下载 3,重新生成
-        SSDownSceneVo vo = laserService.downE57(num);
+        SSDownSceneVo vo = laserService.downE57(num,splitType);
         if(vo == null){
             throw new BusinessException(ResultCode.SS_SCENE_DOWN_ERROR);
         }
@@ -338,9 +338,9 @@ public class DownService implements IDownService {
 
 
     @Override
-    public DownloadProcessVo downloadProcessE57(String num) {
+    public DownloadProcessVo downloadProcessE57(String num ,String splitType) {
         DownloadProcessVo downVo = new DownloadProcessVo();
-        SSDownSceneVo vo = laserService.downE57Status(num);
+        SSDownSceneVo vo = laserService.downE57Status(num ,splitType);
         if(vo == null){
             throw new BusinessException(ResultCode.SS_SCENE_DOWN_ERROR);
         }