1

src/main/java/com/fdkankan/ucenter/controller/SceneController.java

@@ -169,8 +169,9 @@ public class SceneController extends BaseController {
      * num      场景码
      */
     @GetMapping("/checkDownLoadE57")
-    public Result checkDownLoadE57(@RequestParam(required = false) String num) {
-        return Result.success(downService.checkDownLoadE57(num, getUserName()));
+    public Result checkDownLoadE57(@RequestParam(required = false) String num,
+                                   @RequestParam(required = false) String splitType) {
+        return Result.success(downService.checkDownLoadE57(num,splitType, getUserName()));
     }
 
     /**
@@ -178,8 +179,9 @@ public class SceneController extends BaseController {
      * num      场景码
      */
     @GetMapping("/downSceneE57")
-    public Result downSceneE57(@RequestParam(required = false) String num) {
-        return Result.success(downService.downE57(num, getUserName()));
+    public Result downSceneE57(@RequestParam(required = false) String num,
+                               @RequestParam(required = false) String splitType) {
+        return Result.success(downService.downE57(num,splitType, getUserName()));
     }
 
     /**
@@ -187,8 +189,9 @@ public class SceneController extends BaseController {
      * num      场景码
      */
     @GetMapping("/downloadProcessE57")
-    public Result downloadProcessE57(@RequestParam(required = false) String num) {
-        return Result.success(downService.downloadProcessE57(num, getUserName()));
+    public Result downloadProcessE57(@RequestParam(required = false) String num,
+                                     @RequestParam(required = false) String splitType) {
+        return Result.success(downService.downloadProcessE57(num, splitType,getUserName()));
     }
 
 

src/main/java/com/fdkankan/ucenter/httpClient/param/SSDownSceneParam.java

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

src/main/java/com/fdkankan/ucenter/httpClient/service/LaserService.java

@@ -353,7 +353,7 @@ public class LaserService {
     }
 
 
-    public SSDownSceneVo downE57Status(String num) {
+    public SSDownSceneVo downE57Status(String num,String splitType) {
         try {
             SSDownSceneVo vo ;
             SSDownSceneParam param = new SSDownSceneParam();
@@ -377,7 +377,7 @@ public class LaserService {
         return null ;
     }
 
-    public SSDownSceneVo downE57(String num) {
+    public SSDownSceneVo downE57(String num,String splitType) {
         try {
             SSDownSceneVo vo ;
             SSDownSceneParam param = new SSDownSceneParam();

src/main/java/com/fdkankan/ucenter/service/IDownService.java

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

src/main/java/com/fdkankan/ucenter/service/impl/DownService.java

@@ -340,11 +340,11 @@ public class DownService implements IDownService {
     ISceneColdStorageService sceneColdStorageService;
 
     @Override
-    public DownVo checkDownLoadE57(String num,String userName) {
+    public DownVo checkDownLoadE57(String num,String splitType,String userName) {
         checkPerm(num,userName);
 
         DownVo downVo = new DownVo();
-        SSDownSceneVo vo = laserService.downE57Status(num);
+        SSDownSceneVo vo = laserService.downE57Status(num,splitType);
         if(vo == null){
             throw new BusinessException(ResultCodeMsg.FAILURE_CODE_400003, ResultCodeMsg.FAILURE_MSG_400003);
         }
@@ -411,7 +411,7 @@ public class DownService implements IDownService {
     }
 
     @Override
-    public synchronized DownVo downE57(String num,String userName) {
+    public synchronized DownVo downE57(String num,String splitType,String userName) {
         DownVo downVo = new DownVo();
         downVo.setDownloadStatus(1);
         if(redisUtil.hasKey(String.format(RedisKeyUtil.downE57Key,num))){
@@ -419,7 +419,7 @@ public class DownService implements IDownService {
         }
         checkPerm(num,userName);
         //status ：0:正在生成 1，初次生成  2，已经生成直接下载 3，重新生成
-        SSDownSceneVo vo = laserService.downE57(num);
+        SSDownSceneVo vo = laserService.downE57(num,splitType);
         if(vo == null){
             throw new BusinessException(ResultCodeMsg.FAILURE_CODE_400003, ResultCodeMsg.FAILURE_MSG_400003);
         }
@@ -431,10 +431,10 @@ public class DownService implements IDownService {
 
 
     @Override
-    public DownloadProcessVo downloadProcessE57(String num,String userName) {
+    public DownloadProcessVo downloadProcessE57(String num,String splitType,String userName) {
         //checkPerm(num,userName);
         DownloadProcessVo downVo = new DownloadProcessVo();
-        SSDownSceneVo vo = laserService.downE57Status(num);
+        SSDownSceneVo vo = laserService.downE57Status(num,splitType);
         if(vo == null){
             throw new BusinessException(ResultCodeMsg.FAILURE_CODE_400003, ResultCodeMsg.FAILURE_MSG_400003);
         }
@@ -461,21 +461,4 @@ public class DownService implements IDownService {
         return downVo;
     }
 
-    public static void main(String[] args) {
-        /**
-         4dkankan@3dsixty.ch                          c1QRwa..11
-         4dkankan@widdim.com                          NbXL5dxQ@j~T
-         frederic.alcaraz@af3d.fr                     673KKrZN2uGWu
-         julien.cousin@nextiim.com                    a23B45C67
-         mzdjaffardjee@hotmail.fr                     Moufadal2004@
-
-         */
-        System.out.println(SecurityUtil.MD5("\u0017E%&\u0003\u0015ZZEE"));
-        System.out.println(SecurityUtil.MD5(":\u0016,8A\u0010\f%4\u001E\n" +
-                " "));
-        System.out.println(SecurityUtil.MD5("BCG??\u0006.:F\u00013#\u0001"));
-        System.out.println(SecurityUtil.MD5("\u0015FG6@A7BC"));
-        System.out.println(SecurityUtil.MD5("9\u001B\u0001\u0012\u0015\u0010\u0015\u0018FDD@4"));
-        System.out.println(SecurityUtil.MD5("@0?\u0015\u001A?\u0015\u001AEFG"));
-    }
 }