1

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -340,14 +340,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             param.setUserIds(userIds);
 
         }
-        Page<SceneVo> page = null;
         Set<Long> userIds = null;
         HashMap<Long,JyUser> userMap = new HashMap<>();
-        if(param.getType() == 2 || param.getType() == 6) { //深时点云，深光点云
-            page = laserService.pageList(param);
-        }else {
-            page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
-        }
+        Page<SceneVo>   page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         userIds = page.getRecords().stream().map(SceneVo::getUserId).collect(Collectors.toSet());
         userMap = jyUserService.getMapByUserIds(userIds);
 
@@ -355,8 +350,25 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         List<String> numList = records.parallelStream().map(SceneVo::getNum).collect(Collectors.toList());
         HashMap<String,SceneCopyLog> map =  copyLogService.getByNewNumList(numList);
+        HashMap<String, JSONObject> laserMap = new HashMap<>();
 
         for (SceneVo record : page.getRecords()) {
+            if(param.getType() == 2 || param.getType() == 6){
+                JSONObject ssObj = laserMap.get(record.getNum());
+                if(ssObj!=null){
+                    record.setSceneName(ssObj.getString("title"));
+                    record.setThumb(ssObj.getString("thumb"));
+                    record.setWebSite(ssObj.getString("webSite"));
+                    record.setViewCount(ssObj.getInteger("viewCount"));
+                    record.setStatus(toFdStatus(ssObj.getInteger("status")));
+                    record.setAlgorithmTime(ssObj.getString("algorithmTime"));
+                }else if(record.getStatus() != 0){
+                    record.setStatus(-1);
+                    record.setWebSite(null);
+                }
+            }
+
+
             record.setStatusString(SceneStatusUtil.getStatusString(record));
             if(userMap.get(record.getUserId()) != null){
                 record.setUserName(userMap.get(record.getUserId()).getRyNo());
@@ -390,7 +402,20 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         return PageInfo.PageInfo(page);
     }
-
+    private Integer toFdStatus(Integer status) {
+        //深时状态,-1:场景被删 0:计算中 1计算失败 2计算成功 3封存 4生成OBJ中
+        switch (status) {
+            case 0:
+            case 4:
+                return 0;
+            case 2:
+                return -2;
+            case 3:
+                return -3;
+            default:
+                return -1;
+        }
+    }
 
     @Override
     public Object sceneCount() {