add jp

src/main/java/com/fdkankan/site/service/impl/SceneServiceImpl.java

@@ -46,8 +46,12 @@ public class SceneServiceImpl implements ISceneService {
         param.setType(1);
         JSONArray list1 = fdkkList(param);
         list.addAll(list1);
+        param.setType(2);
+        JSONArray list2 = fdkkList(param);
+        list.addAll(list2);
+        JSONArray list3 = fdkkList(param);
+        list.addAll(list3);
         List<SceneVo> sceneVos = overSceneVo(list, 0);
-        JSONArray list2 = laserList(param);
         sceneVos.addAll(overSceneVo(list2,2));
         return sceneVos;
     }
@@ -76,12 +80,12 @@ public class SceneServiceImpl implements ISceneService {
                 case 2 :    //深时
                     param.setType(2);
                     param.setSceneSource(4);
-                    sceneVos.addAll(overSceneVo(laserList(param), type)) ;
+                    sceneVos.addAll(overSceneVo(fdkkList(param), type)) ;
                     break;
                 case 3 :    //深光
-                    param.setType(3);
+                    param.setType(5);
                     param.setSceneSource(5);
-                    sceneVos.addAll(overSceneVo(laserList(param), type)) ;
+                    sceneVos.addAll(overSceneVo(fdkkList(param), type)) ;
                     break;
             }
         }
@@ -136,60 +140,62 @@ public class SceneServiceImpl implements ISceneService {
         }
         List<SceneVo> sceneVoList = new ArrayList<>();
         long total = 0;
-        if (param.getType() == 0 || param.getType() == 1) {      //看看，看见
-            //获取四维(看看，看见)场景数据
-            FdkkResponse fdkkResponse = null;
-            if (param.getNumList() == null || param.getNumList().size() <= 0) {
-                fdkkResponse = fdKKClient.sceneList(param, token);
-            } else {
-                fdkkResponse = fdKKClient.sceneList(param);
-            }
-            if (fdkkResponse.getCode() != 0) {
-                throw new BusinessException(fdkkResponse.getCode(), fdkkResponse.getMsg());
-            }
-            PageInfo pageInfo = JSONObject.parseObject(JSONObject.toJSONString(fdkkResponse.getData()), PageInfo.class);
-            total = pageInfo.getTotal();
-            JSONArray list = JSONArray.parseArray(JSONObject.toJSONString(pageInfo.getList()));
-            sceneVoList = overSceneVo(list,0);
+        //日本特殊处理
+        if (param.getType() == 3) {
+            param.setType(5);
         }
-        if(param.getType() == 2|| param.getType() == 3) {       //深时  深光
-            //获取激光(深时)场景数据
-            LaserSceneParam laserSceneParam = new LaserSceneParam();
-            laserSceneParam.setPageNum(param.getPageNum());
-            laserSceneParam.setPageSize(param.getPageSize());
-            laserSceneParam.setStatus(param.getStatus());
-            if (StringUtils.isNotBlank(param.getSceneName())) {
-                laserSceneParam.setTitle(param.getSceneName());
-            }
-            if(param.getType()==2){
-                laserSceneParam.setSceneSource(4);    //4深时
-            }else {
-                laserSceneParam.setSceneSource(5);    //5深光
-            }
-
-            if (param.getNumList() != null && param.getNumList().size() > 0) {
-                laserSceneParam.setSceneCodes(param.getNumList());
-            }
-            FdkkResponse fdkkResponse = null;
-            if (param.getNumList() == null || param.getNumList().size() <= 0) {
-                fdkkResponse = laserClient.sceneList(laserSceneParam, token);
-            } else {
-                fdkkResponse = laserClient.sceneList(laserSceneParam);
-            }
-            if (fdkkResponse.getCode() != 200) {
-                throw new BusinessException(fdkkResponse.getCode(), fdkkResponse.getMsg());
-            }
-            JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(fdkkResponse.getData()));
-            JSONArray list = null;
-            if (param.getNumList() == null || param.getNumList().size() <= 0) {
-                list = jsonObject.getJSONObject("pageInfo").getJSONArray("list");
-                total = jsonObject.getJSONObject("pageInfo").getLong("total");
-            } else {
-                list = jsonObject.getJSONArray("list");
-                total = jsonObject.getLong("total");
-            }
-            sceneVoList =overSceneVo(list, param.getType() );
+        //获取四维(看看，看见)场景数据
+        FdkkResponse fdkkResponse = null;
+        if (param.getNumList() == null || param.getNumList().size() <= 0) {
+            fdkkResponse = fdKKClient.sceneList(param, token);
+        } else {
+            fdkkResponse = fdKKClient.sceneList(param);
+        }
+        if (fdkkResponse.getCode() != 0) {
+            throw new BusinessException(fdkkResponse.getCode(), fdkkResponse.getMsg());
         }
+        PageInfo pageInfo = JSONObject.parseObject(JSONObject.toJSONString(fdkkResponse.getData()), PageInfo.class);
+        total = pageInfo.getTotal();
+        JSONArray list = JSONArray.parseArray(JSONObject.toJSONString(pageInfo.getList()));
+        sceneVoList = overSceneVo(list,0);
+//        if(param.getType() == 2|| param.getType() == 3) {       //深时  深光
+//            //获取激光(深时)场景数据
+//            LaserSceneParam laserSceneParam = new LaserSceneParam();
+//            laserSceneParam.setPageNum(param.getPageNum());
+//            laserSceneParam.setPageSize(param.getPageSize());
+//            laserSceneParam.setStatus(param.getStatus());
+//            if (StringUtils.isNotBlank(param.getSceneName())) {
+//                laserSceneParam.setTitle(param.getSceneName());
+//            }
+//            if(param.getType()==2){
+//                laserSceneParam.setSceneSource(4);    //4深时
+//            }else {
+//                laserSceneParam.setSceneSource(5);    //5深光
+//            }
+//
+//            if (param.getNumList() != null && param.getNumList().size() > 0) {
+//                laserSceneParam.setSceneCodes(param.getNumList());
+//            }
+//            FdkkResponse fdkkResponse = null;
+//            if (param.getNumList() == null || param.getNumList().size() <= 0) {
+//                fdkkResponse = laserClient.sceneList(laserSceneParam, token);
+//            } else {
+//                fdkkResponse = laserClient.sceneList(laserSceneParam);
+//            }
+//            if (fdkkResponse.getCode() != 200) {
+//                throw new BusinessException(fdkkResponse.getCode(), fdkkResponse.getMsg());
+//            }
+//            JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(fdkkResponse.getData()));
+//            JSONArray list = null;
+//            if (param.getNumList() == null || param.getNumList().size() <= 0) {
+//                list = jsonObject.getJSONObject("pageInfo").getJSONArray("list");
+//                total = jsonObject.getJSONObject("pageInfo").getLong("total");
+//            } else {
+//                list = jsonObject.getJSONArray("list");
+//                total = jsonObject.getLong("total");
+//            }
+//            sceneVoList =overSceneVo(list, param.getType() );
+//        }
         //一个场景对应一个项目 已绑定项目的设置为不可绑定
         Set<String> numList = projectNumService.getNumList();
         for (SceneVo sceneVo : sceneVoList) {
@@ -208,45 +214,77 @@ public class SceneServiceImpl implements ISceneService {
      */
     private List<SceneVo> overSceneVo(JSONArray list,Integer type) {
         List<SceneVo> sceneVoList = new ArrayList<>();
-        if(type == 2||type == 3){  //深时 深光
-            for (Object o : list) {
-                String res = JSONObject.toJSONString(o);
-                SceneVo vo = JSONObject.parseObject(res,SceneVo.class);
-                if(vo.getStatus() == 4){    //4生成OBJ中 设置为计算中
-                    vo.setStatus(0);
-                }
-//                if (StringUtils.isBlank(vo.getPhone())) {
-//                    vo.setBind(false);
+//        if(type == 2||type == 3){  //深时 深光
+//            for (Object o : list) {
+//                String res = JSONObject.toJSONString(o);
+//                SceneVo vo = JSONObject.parseObject(res,SceneVo.class);
+//                if(vo.getStatus() == 4){    //4生成OBJ中 设置为计算中
+//                    vo.setStatus(0);
 //                }
-                vo.setType(type);
-                sceneVoList.add(vo);
-            }
-        }else {
-            for (Object obj : list) {
-                String res = JSONObject.toJSONString(obj);
-                SceneProEntityVo fdkkScenePlusVo = JSONObject.parseObject(res, SceneProEntityVo.class);
-                SceneVo sceneVo = new SceneVo();
-                sceneVo.setId(fdkkScenePlusVo.getId());
-                sceneVo.setBuildObjStatus(0);
-                sceneVo.setCreateTime(fdkkScenePlusVo.getCreateTime());
-                sceneVo.setName(fdkkScenePlusVo.getSceneName());
-                sceneVo.setNum(fdkkScenePlusVo.getNum());
-                sceneVo.setPayStatus(1);
-                sceneVo.setSceneName(fdkkScenePlusVo.getSceneName());
-                sceneVo.setSnCode(fdkkScenePlusVo.getSnCode());
-                sceneVo.setStatus(setLaserStatus(fdkkScenePlusVo.getStatus(), fdkkScenePlusVo.getPayStatus()));
-                sceneVo.setThumb(fdkkScenePlusVo.getThumb());
-                sceneVo.setTitle(fdkkScenePlusVo.getSceneName());
-                sceneVo.setViewCount(fdkkScenePlusVo.getViewCount());
-                sceneVo.setIsLaser(false);
-                sceneVo.setPhone(fdkkScenePlusVo.getPhone());
+////                if (StringUtils.isBlank(vo.getPhone())) {
+////                    vo.setBind(false);
+////                }
+//                vo.setType(type);
+//                sceneVoList.add(vo);
+//            }
+//        }else {
+//            for (Object obj : list) {
+//                String res = JSONObject.toJSONString(obj);
+//                SceneProEntityVo fdkkScenePlusVo = JSONObject.parseObject(res, SceneProEntityVo.class);
+//                SceneVo sceneVo = new SceneVo();
+//                sceneVo.setId(fdkkScenePlusVo.getId());
+//                sceneVo.setBuildObjStatus(0);
+//                sceneVo.setCreateTime(fdkkScenePlusVo.getCreateTime());
+//                sceneVo.setName(fdkkScenePlusVo.getSceneName());
+//                sceneVo.setNum(fdkkScenePlusVo.getNum());
+//                sceneVo.setPayStatus(1);
+//                sceneVo.setSceneName(fdkkScenePlusVo.getSceneName());
+//                sceneVo.setSnCode(fdkkScenePlusVo.getSnCode());
+//                sceneVo.setStatus(setLaserStatus(fdkkScenePlusVo.getStatus(), fdkkScenePlusVo.getPayStatus()));
+//                sceneVo.setThumb(fdkkScenePlusVo.getThumb());
+//                sceneVo.setTitle(fdkkScenePlusVo.getSceneName());
+//                sceneVo.setViewCount(fdkkScenePlusVo.getViewCount());
+//                sceneVo.setIsLaser(false);
+//                sceneVo.setPhone(fdkkScenePlusVo.getPhone());
+//                sceneVo.setType(fdkkScenePlusVo.getSceneType());
+//                sceneVo.setShootCount(fdkkScenePlusVo.getShootCount());
+////                if (fdkkScenePlusVo.getUserId() == null) {
+////                    sceneVo.setBind(false);
+////                }
+//                sceneVoList.add(sceneVo);
+//            }
+//        }
+
+
+        for (Object obj : list) {
+            String res = JSONObject.toJSONString(obj);
+            SceneProEntityVo fdkkScenePlusVo = JSONObject.parseObject(res, SceneProEntityVo.class);
+            SceneVo sceneVo = new SceneVo();
+            sceneVo.setId(fdkkScenePlusVo.getId());
+            sceneVo.setBuildObjStatus(0);
+            sceneVo.setCreateTime(fdkkScenePlusVo.getCreateTime());
+            sceneVo.setName(fdkkScenePlusVo.getSceneName());
+            sceneVo.setNum(fdkkScenePlusVo.getNum());
+            sceneVo.setPayStatus(1);
+            sceneVo.setSceneName(fdkkScenePlusVo.getSceneName());
+            sceneVo.setSnCode(fdkkScenePlusVo.getSnCode());
+            sceneVo.setStatus(setLaserStatus(fdkkScenePlusVo.getStatus(), fdkkScenePlusVo.getPayStatus()));
+            sceneVo.setThumb(fdkkScenePlusVo.getThumb());
+            sceneVo.setTitle(fdkkScenePlusVo.getSceneName());
+            sceneVo.setViewCount(fdkkScenePlusVo.getViewCount());
+            sceneVo.setIsLaser(false);
+            sceneVo.setPhone(fdkkScenePlusVo.getPhone());
+//                sceneVo.setType(fdkkScenePlusVo.getSceneType());
+            if (fdkkScenePlusVo.getSceneType()==5){
+                sceneVo.setType(3);
+            }else {
                 sceneVo.setType(fdkkScenePlusVo.getSceneType());
-                sceneVo.setShootCount(fdkkScenePlusVo.getShootCount());
+            }
+            sceneVo.setShootCount(fdkkScenePlusVo.getShootCount());
 //                if (fdkkScenePlusVo.getUserId() == null) {
 //                    sceneVo.setBind(false);
 //                }
-                sceneVoList.add(sceneVo);
-            }
+            sceneVoList.add(sceneVo);
         }
         return sceneVoList;
     }