深光

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

@@ -57,52 +57,57 @@ public class LaserService {
 
 
     public PageInfo pageList(SceneParam param) {
-        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 {
+        try {
+            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<>();
+            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(obj.getString("thumb"));
+                vo.setWebSite(obj.getString("webSite"));
+                vo.setChildName(obj.getString("snCode"));
                 vo.setPayStatus(1);
+                vo.setIsObj(obj.getInteger("buildObjStatus"));
+                sceneVoList.add(vo);
             }
-            vo.setSceneName(obj.getString("title"));
-            vo.setUserName(obj.getString("phone"));
-            vo.setWebSite(newBasePath +"/index.html?m="+vo.getNum() );
-            vo.setChildName(obj.getString("snCode"));
-            vo.setPayStatus(1);
-            sceneVoList.add(vo);
-        }
-        for (SceneVo sceneVo : sceneVoList) {
-            Company company = companyService.getByChildName(sceneVo.getChildName());
-            if(company != null){
-                sceneVo.setCompanyName(company.getCompanyName());
+
+            for (SceneVo sceneVo : sceneVoList) {
+                Company company = companyService.getByChildName(sceneVo.getChildName());
+                if(company != null){
+                    sceneVo.setCompanyName(company.getCompanyName());
+                }
             }
+            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);
+            //throw new BusinessException(ResultCode.SS_GET_ERROR);
         }
-
         Page<SceneVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
-        voPage.setRecords(sceneVoList);
-        voPage.setTotal(total);
         return PageInfo.PageInfo(voPage);
     }
 

src/main/java/com/fdkankan/manage_jp/service/impl/CompanyServiceImpl.java

@@ -145,7 +145,7 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
     @Override
     public void checkDevice(String childName) {
         Camera instance = cameraService.findByChildName(childName);
-        if(ObjectUtils.isEmpty(instance) || !ObjectUtils.isEmpty(instance.getActivatedTime())){
+        if(ObjectUtils.isEmpty(instance)){
             throw new BusinessException(ResultCode.CAMERA_NOT_EXIST);
         }
     }

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

@@ -104,7 +104,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     @Override
     public Object pageList(SceneParam param) {
-        if(param.getType() == 2){  //深时
+        if(param.getType() == 2 || param.getType() == 6){  //深时
             return laserService.pageList(param);
         }
         Page<SceneVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);

src/main/java/com/fdkankan/manage_jp/vo/response/SceneVo.java

@@ -23,6 +23,8 @@ public class SceneVo {
 
     private String algorithmTime;  //v4场景计算完成时间
 
+    private Integer isObj =1 ;
+
     private String companyName;     //企业名称
 
     private String webSite;