1

src/main/java/com/fdkankan/tk/response/SceneVo.java

@@ -13,6 +13,7 @@ public class SceneVo  {
     private String sceneName;
     private String snCode;
     private Integer status;
+    private Integer sceneStatus;
     private String thumb;
     private String title;
     private Integer viewCount;

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

@@ -57,41 +57,11 @@ public class SceneServiceImpl implements ISceneService {
         param.setUserName(userName);
         Page<SceneVo> voPage = scenePlusService.pageList(param);
         for (SceneVo vo : voPage.getRecords()) {
-            vo.setStatus( setLaserStatus(vo.getStatus(), vo.getPayStatus()));
+            vo.setStatus( setLaserStatus(vo.getSceneStatus(), vo.getPayStatus()));
         }
         return PageInfo.PageInfo(voPage);
     }
 
-    /**
-     * 四维看看返回数据格式转换
-     */
-    private List<SceneVo> overSceneVo(JSONArray list) {
-        List<SceneVo> sceneVoList = new ArrayList<>();
-        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.setType(fdkkScenePlusVo.getSceneType());
-            if (fdkkScenePlusVo.getUserId() == null) {
-                sceneVo.setBind(false);
-            }
-            sceneVoList.add(sceneVo);
-        }
-        return sceneVoList;
-    }
 
     private Integer setLaserStatus(Integer status,Integer payStatus){
         //深时状态,-1:场景被删 0:计算中 1计算失败 2计算成功 3封存 4生成OBJ中