|
@@ -8,16 +8,25 @@ import com.fdkankan.tk.common.ResultCode;
|
|
|
import com.fdkankan.tk.entity.Room;
|
|
|
import com.fdkankan.tk.exception.BusinessException;
|
|
|
import com.fdkankan.tk.inner.request.InnerRoomParam;
|
|
|
+import com.fdkankan.tk.response.RoomInnerVo;
|
|
|
+import com.fdkankan.tk.response.RoomVo;
|
|
|
+import com.fdkankan.tk.service.IRoomNumService;
|
|
|
import com.fdkankan.tk.service.IRoomService;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.List;
|
|
|
+
|
|
|
@Service
|
|
|
public class InnerService {
|
|
|
|
|
|
@Autowired
|
|
|
IRoomService roomService;
|
|
|
+ @Autowired
|
|
|
+ IRoomNumService roomNumService;
|
|
|
|
|
|
|
|
|
public Object roomList(InnerRoomParam param) {
|
|
@@ -34,7 +43,18 @@ public class InnerService {
|
|
|
wrapper.orderByDesc(Room::getIsShow);
|
|
|
wrapper.orderByDesc(Room::getCreateTime);
|
|
|
Page<Room> page = roomService.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
|
|
|
- return PageInfo.PageInfo(page);
|
|
|
+ List<RoomInnerVo> list = new ArrayList<>();
|
|
|
+ for (Room record : page.getRecords()) {
|
|
|
+ List<String> numList = roomNumService.getListByRoomId(record.getRoomId());
|
|
|
+ RoomInnerVo roomVo = new RoomInnerVo();
|
|
|
+ BeanUtils.copyProperties(record,roomVo);
|
|
|
+ roomVo.setSceneNumList(numList);
|
|
|
+ list.add(roomVo);
|
|
|
+ }
|
|
|
+ Page<RoomInnerVo> pageVo = new Page<>(param.getPageNum(),param.getPageSize());
|
|
|
+ pageVo.setTotal(page.getTotal());
|
|
|
+ pageVo.setRecords(list);
|
|
|
+ return PageInfo.PageInfo(pageVo);
|
|
|
}
|
|
|
|
|
|
public void updateRoomShow(InnerRoomParam param) {
|