Просмотр исходного кода

访问深时失败,返回空集合

lyhzzz 2 лет назад
Родитель
Сommit
6002f41fd9
1 измененных файлов с 44 добавлено и 38 удалено
  1. 44 38
      src/main/java/com/fdkankan/manage/httpClient/service/LaserService.java

+ 44 - 38
src/main/java/com/fdkankan/manage/httpClient/service/LaserService.java

@@ -49,49 +49,55 @@ public class LaserService {
 
 
     public PageInfo pageList(SceneParam param) {
-        if( !CacheUtil.uploadType.equals("oss")){
-            return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
-        }
-        LaserSceneParam laserSceneParam = getLaserSceneParam(param);
-        if(laserSceneParam == null ){
-            return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
-        }
-        FdkkResponse response = laserClient.sceneList(laserSceneParam);
-        JSONObject jsonObject =response.getData();
-        if(jsonObject == null){
-            return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
-        }
-        JSONArray list = jsonObject.getJSONArray("list");
-        long total =jsonObject.getLong("total");
+        try {
+            if( !CacheUtil.uploadType.equals("oss")){
+                return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
+            }
+            LaserSceneParam laserSceneParam = getLaserSceneParam(param);
+            if(laserSceneParam == null ){
+                return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
+            }
+            FdkkResponse response = laserClient.sceneList(laserSceneParam);
+            JSONObject jsonObject =response.getData();
+            if(jsonObject == null){
+                return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
+            }
+            JSONArray list = jsonObject.getJSONArray("list");
+            long total =jsonObject.getLong("total");
 
-        List<SceneVo> sceneVoList = new ArrayList<>();
-        String newBasePath = basePath;
-        newBasePath = newBasePath.contains("dev")? newBasePath + "/dev" : newBasePath;
-        newBasePath = newBasePath.contains("uat")? newBasePath + "/uat" : newBasePath;
-        newBasePath =  newBasePath.replace("/backend","");
-        for (Object o : list) {
-            String res = JSONObject.toJSONString(o);
-            SceneVo vo = JSONObject.parseObject(res,SceneVo.class);
-            //深时状态,-1:场景被删 0:计算中 1计算失败 2计算成功 3封存 4生成OBJ中
-            JSONObject obj = (JSONObject) o;
-            vo.setStatusString(getLaserStatus(vo.getStatus()));
-            vo.setStatus(toFdStatus(vo.getStatus()));
-            if(vo.getStatus() == -3){
-                vo.setPayStatus(-1);
-            }else {
+            List<SceneVo> sceneVoList = new ArrayList<>();
+            String newBasePath = basePath;
+            newBasePath = newBasePath.contains("dev")? newBasePath + "/dev" : newBasePath;
+            newBasePath = newBasePath.contains("uat")? newBasePath + "/uat" : newBasePath;
+            newBasePath =  newBasePath.replace("/backend","");
+            for (Object o : list) {
+                String res = JSONObject.toJSONString(o);
+                SceneVo vo = JSONObject.parseObject(res,SceneVo.class);
+                //深时状态,-1:场景被删 0:计算中 1计算失败 2计算成功 3封存 4生成OBJ中
+                JSONObject obj = (JSONObject) o;
+                vo.setStatusString(getLaserStatus(vo.getStatus()));
+                vo.setStatus(toFdStatus(vo.getStatus()));
+                if(vo.getStatus() == -3){
+                    vo.setPayStatus(-1);
+                }else {
+                    vo.setPayStatus(1);
+                }
+                vo.setSceneName(obj.getString("title"));
+                vo.setUserName(obj.getString("phone"));
+                vo.setThumb(newBasePath +"/index.html?m="+vo.getNum() );
                 vo.setPayStatus(1);
+                vo.setIsObj(obj.getInteger("buildObjStatus"));
+                sceneVoList.add(vo);
             }
-            vo.setSceneName(obj.getString("title"));
-            vo.setUserName(obj.getString("phone"));
-            vo.setThumb(newBasePath +"/index.html?m="+vo.getNum() );
-            vo.setPayStatus(1);
-            vo.setIsObj(obj.getInteger("buildObjStatus"));
-            sceneVoList.add(vo);
-        }
 
+            Page<SceneVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
+            voPage.setRecords(sceneVoList);
+            voPage.setTotal(total);
+            return PageInfo.PageInfo(voPage);
+        }catch (Exception e){
+            log.error("访问深时失败:",e);
+        }
         Page<SceneVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
-        voPage.setRecords(sceneVoList);
-        voPage.setTotal(total);
         return PageInfo.PageInfo(voPage);
     }