Browse Source

计算失败场景跳过校验文件

lyhzzz 1 year ago
parent
commit
912e73068f

+ 2 - 3
src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -277,8 +277,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
 
         Long sceneCameraId = scenePro == null ? scenePlus.getCameraId() : scenePro.getCameraId();
-        Long space = null;
-        space = scenePro == null ? 0 :scenePro.getSpace();
+        Long space = scenePro == null ? 0 :scenePro.getSpace();
         String dataSource = scenePro == null ? null :scenePro.getDataSource();
         if(scenePlus !=null){
             ScenePlusExt scenePlusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
@@ -317,7 +316,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 //            throw new BusinessException(ResultCode.MOVE_ERROR_COPY);
 //        }
 
-        if(cameraDetail.getType() == 10 || cameraDetail.getType() == 11) {       //深时场景
+        if((cameraDetail.getType() == 10 || cameraDetail.getType() == 11) && status ==-2) {       //深时场景
             //迁移深时 dataSource
             File file = new File(dataSource + "_laserData");
             if (!file.exists()) {

+ 0 - 6
src/main/java/com/fdkankan/manage/test/TestController.java

@@ -211,18 +211,12 @@ public class TestController {
         List<ScenePro> sceneProList = sceneProService.getListByCameraId(camera.getId());
         List<ScenePlus> plusList = scenePlusService.getListByCameraId(camera.getId());
         for (ScenePro scenePro : sceneProList) {
-            if(scenePro.getStatus() != -2){
-                continue;
-            }
             SceneParam param = new SceneParam();
             param.setNum(scenePro.getNum());
             param.setSnCode(toSnCode);
             sceneProService.move(param);
         }
         for (ScenePlus scenePro : plusList) {
-            if(scenePro.getSceneStatus() != -2){
-                continue;
-            }
             SceneParam param = new SceneParam();
             param.setNum(scenePro.getNum());
             param.setSnCode(toSnCode);