离线包状态

src/main/java/com/fdkankan/fusion/service/impl/SceneCommonService.java

@@ -103,6 +103,7 @@ public class SceneCommonService implements ISceneCommonService {
         if(param.getStatus() != null){
             wrapper.eq(Scene::getStatus,param.getStatus());
         }
+        wrapper.orderByDesc(Scene::getCreateTime);
         Page<Scene> page = sceneService.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         List<String> numList = page.getRecords().parallelStream().map(Scene::getSceneCode).collect(Collectors.toList());
 
@@ -121,7 +122,6 @@ public class SceneCommonService implements ISceneCommonService {
             vo.setPayStatus(1);
             vo.setSceneName(scene.getTitle());
             vo.setSnCode(scene.getSnCode());
-            vo.setStatus(scene.getStatus());
             vo.setThumb(scene.getInitPic());
             vo.setTitle(scene.getTitle());
             vo.setViewCount(scene.getViewCount());
@@ -143,6 +143,26 @@ public class SceneCommonService implements ISceneCommonService {
             if(sceneFileBuild!= null && sceneFileBuild.getEndBuildTime()!=null){
                 vo.setAlgorithmTime(sceneFileBuild.getEndBuildTime());
             }
+            //状态,-1:场景被删 0:计算中 1计算失败 2计算成功 3待计算 4生成OBJ中 5 暂停 6排队中 7,复制中
+            if(vo.getIsLaser() && param.getIsObj() != null && param.getIsObj() == 0){
+                vo.setStatus(scene.getStatus() );
+            }else {
+                //生成OBJ状态,-1失败 0，未生成 1完成，2计算中 3,排队中 4,暂停
+                if(scene.getBuildObjStatus() != null){
+                    switch (scene.getBuildObjStatus()){
+                        case -1: vo.setStatus(1); break;
+                        case 0: vo.setStatus(0); break;
+                        case 1: vo.setStatus(2); break;
+                        case 2: vo.setStatus(0); break;
+                        case 3: vo.setStatus(6); break;
+                        case 4: vo.setStatus(5); break;
+                        default: vo.setStatus(scene.getStatus() );
+                    }
+                }else {
+                    vo.setStatus(scene.getStatus() );
+                }
+            }
+
 
             sceneVoList.add(vo);
         }