1

src/main/java/com/fdkankan/manage/common/ResultCode.java

@@ -85,9 +85,7 @@ public enum ResultCode  {
     TEMPLATE_EMPTY(60016, "模板数据为空"),
 
     ID_CARD_EXIT(60017, "身份证号码已存在"),
-
-
-    LASER_VIEW_ERROR(60018,"激光系统出错" );
+    ;
 
     private Integer code;
     private String message;

src/main/java/com/fdkankan/manage/httpClient/service/LaserService.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.common.CacheUtil;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.Result;
-import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.Camera;
 import com.fdkankan.manage.entity.CameraDetail;
 import com.fdkankan.manage.entity.User;
@@ -282,44 +281,4 @@ public class LaserService {
         }
         return null ;
     }
-
-    public HashMap<String, JSONObject> list(List<String> sceneNumList,Integer sceneSource) {
-        LaserSceneParam newParam = new LaserSceneParam();
-        newParam.setPageNum(1);
-        newParam.setPageSize(sceneNumList.size());
-        newParam.setSceneCodes(sceneNumList);
-        newParam.setSceneSource(sceneSource);
-        return this.list(newParam);
-    }
-
-    public HashMap<String, JSONObject> list(String sceneName,Integer sceneSource) {
-        LaserSceneParam newParam = new LaserSceneParam();
-        newParam.setPageNum(1);
-        newParam.setPageSize(9999);
-        newParam.setTitle(sceneName);
-        newParam.setSceneSource(sceneSource);
-        return this.list(newParam);
-    }
-
-    public HashMap<String, JSONObject> list(LaserSceneParam newParam) {
-        HashMap<String, JSONObject> map = new HashMap<>();
-        try {
-            FdkkResponse fdkkResponse = laserClient.sceneList(newParam);
-            JSONObject jsonObject = fdkkResponse.getData();
-            if(jsonObject == null){
-                return map;
-            }
-            JSONArray list = jsonObject.getJSONArray("list");
-
-            for (Object o : list) {
-                JSONObject obj = (JSONObject) o;
-                map.put(obj.getString("num"),obj);
-            }
-        }catch (Exception e){
-            log.info("激光系统访问失败：{}",e);
-            throw new BusinessException(ResultCode.LASER_VIEW_ERROR);
-        }
-
-        return map;
-    }
 }

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

@@ -340,9 +340,14 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             param.setUserIds(userIds);
 
         }
+        Page<SceneVo> page = null;
         Set<Long> userIds = null;
         HashMap<Long,JyUser> userMap = new HashMap<>();
-        Page<SceneVo>   page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
+        if(param.getType() == 2 || param.getType() == 6) { //深时点云，深光点云
+            page = laserService.pageList(param);
+        }else {
+            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);
 
@@ -350,33 +355,8 @@ 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<>();
-
-        List<String> sceneNumList = page.getRecords().stream().map(SceneVo::getNum).collect(Collectors.toList());
-
-        if(param.getType() == 2 && laserMap.isEmpty()){
-            laserMap = laserService.list(sceneNumList,4);
-        }
-        if(param.getType() == 6 && laserMap.isEmpty()){
-            laserMap = laserService.list(sceneNumList,5);
-        }
 
         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){
@@ -411,20 +391,7 @@ 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() {