1

src/main/java/com/fdkankan/fusion/down/CaseDownService.java

@@ -9,6 +9,7 @@ import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.common.util.DateUtils;
 import com.fdkankan.fusion.common.util.MyFileUtil;
+import com.fdkankan.fusion.common.util.NumTypeUtils;
 import com.fdkankan.fusion.common.util.ShellUtil;
 import com.fdkankan.fusion.config.CacheUtil;
 import com.fdkankan.fusion.entity.*;
@@ -233,7 +234,7 @@ public class CaseDownService {
         for (FusionAndSceneVo fusionAndSceneVo : sceneList) {
             //下载场景
             downSwkk(casePath,fusionAndSceneVo.getNum(),fusionAndSceneVo.getSceneType());
-            if(fusionAndSceneVo.getSceneType() == 2 || fusionAndSceneVo.getSceneType() == 5){
+            if(NumTypeUtils.isLaser(fusionAndSceneVo.getSceneType())){
                 FdkkResponse sceneInfo = laserService.getSceneInfo(fusionAndSceneVo.getNum());
                 HashSet<String> dataSetIds = new HashSet<>();
                 if(sceneInfo != null){
@@ -334,9 +335,9 @@ public class CaseDownService {
        String swssPath = path + "/swss/"+num;
        String swssZipPath = swssPath +".zip";
 
-       Integer isObj = 0;
-       if(type == 4 || type == 6){
-           isObj =1;
+       Integer isObj = 1;
+       if(NumTypeUtils.isLaser(type)){
+           isObj =0;
        }
        try {