2

src/main/java/com/fdkankan/ucenter/controller/SceneController.java

@@ -61,6 +61,13 @@ public class SceneController extends BaseController {
         param.setUserId(user.getId());
         return Result.success(sceneService.pageList(param));
     }
+    @PostMapping(value = "/list")
+    public Result getScenes(@RequestBody SceneParam param,@RequestHeader String token) throws Exception {
+        String username = JwtUtil.getUsername(token);
+        return Result.success(sceneProService.getScenes(username, param));
+
+    }
+
     @PostMapping("/newList")
     public Result newList(@RequestBody SceneParam param,@RequestHeader String token){
         String username = JwtUtil.getUsername(token);

src/main/java/com/fdkankan/ucenter/service/ISceneProService.java

@@ -85,4 +85,6 @@ public interface ISceneProService extends IService<ScenePro> {
     ResponseScene getSceneDetail(String sceneNum);
 
     Page<SceneVo> pageListAndFolder(Page<Object> page, SceneParam param);
+
+    Object getScenes(String username, SceneParam param);
 }

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

@@ -402,6 +402,12 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     }
 
     @Override
+    public Object getScenes(String username, SceneParam param) {
+        param.setHasFolder(0);
+        return this.newList(param,username);
+    }
+
+    @Override
     public JSONObject newList(SceneParam param, String username) {
         User user = userService.getByUserName(username);
         param.setSourceList(getSceneSource(param.getSceneSource()));

src/main/java/com/fdkankan/ucenter/vo/ResponseScene.java

@@ -25,13 +25,13 @@ public class ResponseScene implements Serializable {
     private String sceneDec;
 
     /**"0表示其他，1表示文博，2表示地产，3表示电商，4表示餐饮，5表示家居", name = "sceneType*/
-    private int sceneType;
+    private Integer sceneType;
 
     /**"场景封面图是否默认", name = "thumbImg*/
-    private int thumbImg;
+    private Integer thumbImg;
 
     /**"版本", name = "version*/
-    private int version;
+    private Integer version;
 
     /**"0表示默认，user表示自己上传", name = "markerLogo*/
     private String markerLogo;
@@ -40,7 +40,7 @@ public class ResponseScene implements Serializable {
     private String floorLogo;
 
     /**"标记大小", name = "floorLogoSize*/
-    private int floorLogoSize;
+    private Integer floorLogoSize;
 
     /**"表示初始点信息", name = "entry*/
     private String entry;
@@ -49,22 +49,22 @@ public class ResponseScene implements Serializable {
     private String createTime;
 
     /**"拍摄数量", name = "shootCount*/
-    private int shootCount;
+    private Integer shootCount;
 
     /**"0表示未建好，1表示建好，-1表示出错，-2表示不要在官网上显示", name = "status*/
-    private int status;
+    private Integer status;
 
     /**"模型贴图的风格", name = "sceneIndex*/
-    private int sceneIndex;
+    private Integer sceneIndex;
 
     /**"背景音乐名称", name = "hasBGM*/
     private String hasBGM;
 
     /**"方案：1是双目，2是转台，3是六目", name = "cameraType*/
-    private int cameraType;
+    private Integer cameraType;
 
     /**"是否公开，0公开，1加密", name = "isPublic*/
-    private int isPublic;
+    private Integer isPublic;
 
     /**"要gps定位", name = "gps*/
     private String gps;
@@ -79,7 +79,7 @@ public class ResponseScene implements Serializable {
     private String nickName;
 
     /**"浏览次数", name = "viewCount*/
-    private int viewCount;
+    private Integer viewCount;
 
     /**"场景的链接地址", name = "webSite*/
     private String webSite;
@@ -88,7 +88,7 @@ public class ResponseScene implements Serializable {
     private String dataSource;
 
     /**"0表示未付款，1表示付款了，-1表示欠费（八目场景指锁住），-2表示临时空间（八目场景）", name = "payStatus*/
-    private int payStatus;
+    private Integer payStatus;
 
     /**"手机id", name = "phoneId*/
     private String phoneId;
@@ -97,10 +97,10 @@ public class ResponseScene implements Serializable {
     private String num;
 
     /**"1表示推荐，0表示正常", name = "recommend*/
-    private int recommend;
+    private Integer recommend;
 
     /**"表示缩略图是否存在", name = "thumbStatus*/
-    private int thumbStatus;
+    private Integer thumbStatus;
 
     /**"要上传的热点的id集合，用逗号隔开", name = "hotsIds*/
     private String hotsIds;
@@ -109,10 +109,10 @@ public class ResponseScene implements Serializable {
     private String initialPointId;
 
     /**"风格", name = "style*/
-    private int style;
+    private Integer style;
 
     /**"方案：1是双目，2是转台，3是六目", name = "sceneScheme*/
-    private int sceneScheme;
+    private Integer sceneScheme;
 
     /**"背景音乐名称", name = "bgMusic*/
     private String bgMusic;
@@ -133,13 +133,13 @@ public class ResponseScene implements Serializable {
     private String shareLogo;
 
     /**"小地图浏览", name = "mapVisi*/
-    private int mapVisi;
+    private Integer mapVisi;
 
     /**"自动导览", name = "tourVisi*/
-    private int tourVisi;
+    private Integer tourVisi;
 
     /**"vr模式", name = "vrVisi*/
-    private int vrVisi;
+    private Integer vrVisi;
     
 
     /**
@@ -171,12 +171,12 @@ public class ResponseScene implements Serializable {
     /**
      * 重新建模的版本
      */
-    private int floorEditVer;
+    private Integer floorEditVer;
 
     /**
      * 正式发布重新建模的版本
      */
-    private int floorPublishVer;
+    private Integer floorPublishVer;
 
     /**
      * 录屏图片
@@ -201,15 +201,15 @@ public class ResponseScene implements Serializable {
     /**
      * 展示页面cad图在平面图是否显示
      */
-    private int cadImgVisi;
+    private Integer cadImgVisi;
 
-    private int panoVisi;
+    private Integer panoVisi;
 
-    private int m2dVisi;
+    private Integer m2dVisi;
 
-    private int m3dVisi;
+    private Integer m3dVisi;
 
-    private int measureVisi;
+    private Integer measureVisi;
 
     private String videos;
 
@@ -238,7 +238,7 @@ public class ResponseScene implements Serializable {
 
     private Integer sceneSource;
 
-    private boolean jumpScene;
+    private Boolean jumpScene;
 
     /**
      * 服务器的服务商