Revert "新增带有houseType的场景列表接口"

This reverts commit 71c7135e

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

@@ -50,6 +50,8 @@ public class SceneController extends BaseController {
     ISceneCooperationService sceneCooperationService;
     @Autowired
     ISceneService sceneService;
+    @Autowired
+    IScenePlusService scenePlusService;
 
     @PostMapping("/findSceneNumber")
     public Result findSceneNumber(){
@@ -76,8 +78,8 @@ public class SceneController extends BaseController {
     }
 
     @PostMapping("/getOnlySceneList")
-    public Result getOnlySceneList(@RequestBody SceneParam param){
-        String username = JwtUtil.getUsername(getToken());
+    public Result getOnlySceneList(@RequestBody SceneParam param,@RequestHeader String token){
+        String username = JwtUtil.getUsername(token);
         param.setHasFolder(0);
         JSONObject jsonObject = sceneProService.newList(param, username);
         JSONObject pageInfo = jsonObject.getJSONObject("pageInfo");
@@ -163,6 +165,15 @@ public class SceneController extends BaseController {
         return sceneUpgradeToV4Service.getUpgradeToV4Progress(num);
     }
 
+    /**
+     *
+     * 分页查询存在houseType文件的场景
+     */
+    @GetMapping("/pageSceneWithHouseType")
+    public Result pageSceneWithHouseType(RequestScene param){
+        return scenePlusService.pageSceneWithHouseType(param);
+    }
+
 
 
 }