Merge branch 'release-swsx' into test

# Conflicts:
#	src/main/java/com/fdkankan/contro/mq/service/impl/BuildE57SceneServiceImpl.java

src/main/java/com/fdkankan/contro/mq/service/impl/BuildE57SceneServiceImpl.java

@@ -15,6 +15,7 @@ import com.fdkankan.fyun.config.FYunFileConfig;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.model.constants.UploadFilePath;
+import com.fdkankan.model.utils.CreateObjUtil;
 import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
 import com.fdkankan.rabbitmq.bean.BuildSceneResultMqMessage;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
@@ -172,10 +173,8 @@ public class BuildE57SceneServiceImpl implements IBuildSceneService {
             laserMqContent.put("status", CommonSuccessStatus.SUCCESS.code());
             mqProducer.sendByWorkQueue(queueE57ModelingDone, laserMqContent);
 
-            try {
-//                FileUtil.del(path);
-            }catch (Exception e){
-                log.error("删除计算目录失败,path:{}", path);
+            if(CollUtil.isEmpty(notDeleteNasNumList) || !notDeleteNasNumList.contains(num)){
+                CreateObjUtil.deleteFile(path.replace(ConstantFilePath.BUILD_MODEL_PATH, "/"));
             }
 
             log.info("e57场景计算结果处理结束，场景码：{}", num);

src/main/java/com/fdkankan/contro/mq/service/impl/BuildReverseE57SceneServiceImpl.java

@@ -322,11 +322,10 @@ public class BuildReverseE57SceneServiceImpl implements IBuildSceneService {
             scenePlusService.updateById(scenePlus);
             scenePlusExtService.updateById(scenePlusExt);
 
-            try {
-                FileUtil.del(path);
-            }catch (Exception e){
-                log.error("删除计算目录失败,path:{}", path, e);
+            if(CollUtil.isEmpty(notDeleteNasNumList) || !notDeleteNasNumList.contains(sceneCode)){
+                CreateObjUtil.deleteFile(path.replace(ConstantFilePath.BUILD_MODEL_PATH, "/"));
             }
+
             log.info("场景计算结果处理结束，场景码：{}", sceneCode);
 
         }catch (Exception e){