名宿商家端房态管理接口改为分页查询

mhotel/src/com/happy/action/HouseNumberStatusAction.java

@@ -90,7 +90,7 @@ public class HouseNumberStatusAction extends BaseController implements ModelDriv
      * 表格数据 房态管理-房态管理
      */
     public void queryData() {
-        JSONObject objects = houseNumberStatusService.queryData(houseNumberStatusDto);
+        JSONObject objects = houseNumberStatusService.queryData(houseNumberStatusDto,page,rows);
         if (objects != null) {
             ResUtil.writeJson(ServletActionContext.getResponse(), new JSONObject() {{
                 put("message", "请求成功");

mhotel/src/com/happy/service/HouseNumberStatusService.java

@@ -22,7 +22,7 @@ public interface HouseNumberStatusService {
     /**
      * 表格数据 房态管理-房态管理
      */
-    JSONObject queryData(HouseNumberStatusDto houseNumberStatusDto);
+    JSONObject queryData(HouseNumberStatusDto houseNumberStatusDto,Integer pageNumber, Integer pageSize);
 
     /**
      * 查询可置脏/净、可开/关的房型及房间号 房态管理-房态管理

mhotel/src/com/happy/service/HousePriceService.java

@@ -49,6 +49,13 @@ public interface HousePriceService {
     List<House> queryHouseListByManagerId(String managerId);
 
     /**
+     * 查询指定商家的所有status为1的房型
+     *
+     * @param managerId 商家id
+     */
+    JSONObject queryPageHouseListByManagerId(String managerId,Integer pageNumber, Integer pageSize);
+
+    /**
      * 导出表格数据 房态管理-房价管理-改价记录
      */
     void exportHistory(HousePriceDto housePriceDto);

mhotel/src/com/happy/service/impl/HouseNumberStatusImplService.java

@@ -1,5 +1,6 @@
 package com.happy.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.happy.Model.Holiday;
 import com.happy.Model.House;
@@ -78,11 +79,12 @@ public class HouseNumberStatusImplService implements HouseNumberStatusService {
     }
 
     @Override
-    public JSONObject queryData(HouseNumberStatusDto houseNumberStatusDto) {
+    public JSONObject queryData(HouseNumberStatusDto houseNumberStatusDto,Integer pageNumber, Integer pageSize) {
         String managerId = houseNumberStatusDto.getManagerId();
         Integer showType = houseNumberStatusDto.getShowType();
         if (StringUtils.isBlank(managerId) || showType == null) return null;
-        List<House> houseList = housePriceService.queryHouseListByManagerId(houseNumberStatusDto.getManagerId());
+        JSONObject housePage = housePriceService.queryPageHouseListByManagerId(houseNumberStatusDto.getManagerId(),pageNumber,pageSize);
+        List<House> houseList = JSON.parseArray(housePage.getJSONArray("pageList").toJSONString(), House.class);
         if (houseList == null || houseList.isEmpty()) return null;
         HouseNumberDto houseNumberDto = new HouseNumberDto();
         houseNumberDto.setHouseIdList(houseList.stream().map(House::getId).collect(Collectors.toList()));
@@ -141,7 +143,6 @@ public class HouseNumberStatusImplService implements HouseNumberStatusService {
                 }
             });
         }
-        JSONObject result = new JSONObject();
         if (houseNumberStatusDto.getShowType() == 1) {
             List<String> dateListBetween = DateUtil.getDateStrListBetween(startDate, endDate);
 
@@ -227,13 +228,13 @@ public class HouseNumberStatusImplService implements HouseNumberStatusService {
                 System.out.println("错误信息："+e.getMessage());
             }
 
-            result.put("dateTimes", dataTimes);
-            result.put("datas", datas);
-            return result;
+            housePage.put("dateTimes", dataTimes);
+            housePage.put("pageList", datas);
+            return housePage;
         }
         if (houseNumberStatusDto.getShowType() == 2) {
-            result.put("data", buildResultOne(houseList, houseNumberList));
-            return result;
+            housePage.put("pageList", buildResultOne(houseList, houseNumberList));
+            return housePage;
         }
         return null;
     }

mhotel/src/com/happy/service/impl/HousePriceServiceImpl.java

@@ -20,6 +20,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.struts2.ServletActionContext;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -159,6 +160,27 @@ public class HousePriceServiceImpl implements HousePriceService {
     }
 
     @Override
+    public JSONObject queryPageHouseListByManagerId(String managerId, Integer pageNumber, Integer pageSize) {
+        Assert.hasLength(managerId,"商家id不能为空！");
+        Assert.notNull(pageNumber,"页码不能为空！");
+        Assert.notNull(pageSize,"每页数量不能为空！");
+        String sqlx = String.format(" and manager_id = %s", managerId);
+        int total = houseDao.queryTotal(sqlx);
+        String sql = String.format(" and manager_id = %s order by id desc limit %s, %s", managerId, (pageNumber - 1) * pageSize, pageSize);
+        List<House> houseList =  Collections.emptyList();
+        if (total != 0) {
+            houseList = houseDao.queryList(sql);
+        }
+        JSONObject result = new JSONObject();
+        result.put("pageList",houseList);
+        result.put("page",pageNumber);
+        result.put("rows",pageSize);
+        result.put("total",total);
+        result.put("totalPage",(int) Math.ceil((double) total / pageSize));
+        return result;
+    }
+
+    @Override
     public void exportHistory(HousePriceDto housePriceDto) {
         if (StringUtils.isBlank(housePriceDto.getManagerId())) return;
         List<HousePriceDto> list = housePriceDao.queryListThree(housePriceDto, null, null);