小程序首页房间列表

src/main/java/com/fdkankan/tk/controller/WxApiController.java

@@ -1,6 +1,8 @@
 package com.fdkankan.tk.controller;
 
 import com.fdkankan.tk.common.ResultData;
+import com.fdkankan.tk.inner.request.InnerRoomParam;
+import com.fdkankan.tk.inner.service.InnerService;
 import com.fdkankan.tk.response.WxUserVo;
 import com.fdkankan.tk.service.IWxService;
 import com.fdkankan.tk.service.IWxUserService;
@@ -13,6 +15,8 @@ public class WxApiController extends BaseController{
 
     @Autowired
     IWxUserService wxUserService;
+    @Autowired
+    InnerService innerService;
 
     @GetMapping("/wxLogin")
     public ResultData wxLogin(@RequestParam(required = false) String code){
@@ -36,4 +40,13 @@ public class WxApiController extends BaseController{
         return ResultData.ok();
     }
 
+    /**
+     * 全部房间列表
+     */
+    @GetMapping("/roomList")
+    public ResultData list(@RequestBody InnerRoomParam param){
+        param.setIsShow(1);
+        return ResultData.ok(innerService.roomList(param));
+    }
+
 }

src/main/java/com/fdkankan/tk/inner/controller/InnerController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 管理后台使用接口
  */
 @RestController
-@RequestMapping("_inner")
+@RequestMapping("/_inner")
 public class InnerController {
 
     @Autowired

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

@@ -75,7 +75,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
             String userName = JwtUtil.getUserName(token);
             wrapper.eq(Room::getRoomUserName,userName);
         }
-        if(StringUtils.isNotBlank(wxToken)){
+        if(StringUtils.isNotBlank(wxToken)  ){
             String wxUserId = JwtUtil.getUserName(token);
             WxUser wxUser = wxUserService.getById(wxUserId);
             if(wxUser != null){
@@ -87,21 +87,9 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
         if (StringUtils.isNotBlank(param.getRoomTitle()) ) {
             wrapper.like(Room::getRoomTitle,param.getRoomTitle());
         }
-        //wrapper.orderByDesc(Room::getLastLookTime);
         wrapper.orderByDesc(Room::getCreateTime);
 
         Page<Room> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
-//        List<Room> closeRoomList = new ArrayList<>();
-//        List<Room> openRoomList = new ArrayList<>();
-//        for (Room record : page.getRecords()) {
-//            if(record.getRoomStatus() == 2){
-//                closeRoomList.add(record);
-//            }else {
-//                openRoomList.add(record);
-//            }
-//        }
-//        openRoomList.addAll(closeRoomList);
-//        page.setRecords(openRoomList);
         return PageInfo.PageInfo(page);
     }