合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TpHotelController.java

@@ -35,9 +35,9 @@ public class TpHotelController extends BaseController {
     private TpHotelServicel tpHotelServicel;
 
 
-    @ApiOperation(value = "获取所有酒店", notes = "获取所有酒店")
+    @ApiOperation(value = "获取本小区酒店", notes = "获取本小区酒店")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/hotel",method = RequestMethod.GET)
     public Object getHotel(HttpSession session){

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TpRentalHouseController.java

@@ -50,7 +50,7 @@ public class TpRentalHouseController extends BaseController{
                                     @RequestParam(value = "rentalPriceValue",required = false) Integer rentalPriceValue,
                                     @RequestParam(value = "priceFluctuateValue",required = false) Integer priceFluctuateValue,
                                  @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                 @RequestParam(value = "pageSize", defaultValue = "3") Integer pageSize){
+                                 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize){
         UserElement userElement = getUserElement(session);
         ResponseBean responseBean = tpRentalHouseServicel.getRentalHouse(userElement,houseName,rentalTypeValue,houseTypeValue,rentalPriceValue,priceFluctuateValue,pageNum,pageSize);
         return responseBean;

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TpShopController.java

@@ -35,13 +35,17 @@ public class TpShopController extends BaseController{
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "shopName",value = "搜所名称"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "tpShopTypeId",value = "商铺类型"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
     })
     @RequestMapping(value = "/shop",method = RequestMethod.GET)
     public Object getShop(HttpSession session,
                           @RequestParam(value = "shopName",required = false ) String houseName,
-                          @RequestParam(value = "tpShopTypeId",required = false ) Integer tpShopTypeId){
+                          @RequestParam(value = "tpShopTypeId",required = false ) Integer tpShopTypeId,
+                          @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize){
         UserElement userElement = getUserElement(session);
-        ResponseBean responseBean = tpShopServicel.getShop(userElement,houseName,tpShopTypeId);
+        ResponseBean responseBean = tpShopServicel.getShop(userElement,houseName,tpShopTypeId,pageNum,pageSize);
         return responseBean;
     }
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpHotelRoomMapper.java

@@ -0,0 +1,28 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpHotelRoom;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TpHotelRoomMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpHotelRoom record);
+
+    int insertSelective(TpHotelRoom record);
+
+    TpHotelRoom selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpHotelRoom record);
+
+    int updateByPrimaryKey(TpHotelRoom record);
+
+    /**
+     * 获取当前所有房间
+     * @return
+     */
+    List<TpHotelRoom> selectHotelRoomList(@Param("communityId") Integer communityId,@Param("hotelId") Integer hotelId);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpHotel.java

@@ -1,6 +1,7 @@
 package com.community.huiju.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class TpHotel {
     private Integer id;
@@ -53,6 +54,20 @@ public class TpHotel {
      */
     private String hotelIntroduction;
 
+    /**
+     * 房间
+     * @return
+     */
+    private List<TpHotelRoom> tpHotelRoomsList;
+
+    public void setTpHotelRoomsList(List<TpHotelRoom> tpHotelRoomsList) {
+        this.tpHotelRoomsList = tpHotelRoomsList;
+    }
+
+    public List<TpHotelRoom> getTpHotelRoomsList() {
+        return tpHotelRoomsList;
+    }
+
     public Integer getId() {
         return id;
     }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpHotelRoom.java

@@ -0,0 +1,172 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpHotelRoom {
+
+    private Integer id;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 酒店ID
+      */
+    private Integer hotelId;
+
+    /**
+     * 房间编号
+     */
+    private String roomNo;
+
+    /**
+     * 房间名称
+     */
+    private String roomName;
+
+    /**
+     * 排序（权重）
+     */
+    private Integer sort;
+
+    /**
+     * 房间价格
+     */
+    private String price;
+
+    /**
+     * 上架状态 1 是已上架 2是已下架
+     */
+    private String roomStatus;
+
+    /**
+     * 房间备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createDate;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getHotelId() {
+        return hotelId;
+    }
+
+    public void setHotelId(Integer hotelId) {
+        this.hotelId = hotelId;
+    }
+
+    public String getRoomNo() {
+        return roomNo;
+    }
+
+    public void setRoomNo(String roomNo) {
+        this.roomNo = roomNo == null ? null : roomNo.trim();
+    }
+
+    public String getRoomName() {
+        return roomName;
+    }
+
+    public void setRoomName(String roomName) {
+        this.roomName = roomName == null ? null : roomName.trim();
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price == null ? null : price.trim();
+    }
+
+    public String getRoomStatus() {
+        return roomStatus;
+    }
+
+    public void setRoomStatus(String roomStatus) {
+        this.roomStatus = roomStatus == null ? null : roomStatus.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/TpShopServicel.java

@@ -17,7 +17,7 @@ public interface TpShopServicel {
      * @param userElement
      * @return
      */
-    ResponseBean getShop(UserElement userElement,String houseName,Integer tpShopTypeId);
+    ResponseBean getShop(UserElement userElement,String houseName,Integer tpShopTypeId,Integer pageNum,Integer pageSize);
 
     /**
      * 获取线下商铺详情

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TpHotelServiceimpl.java

@@ -4,8 +4,10 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.dao.TpHotelImgMapper;
 import com.community.huiju.dao.TpHotelMapper;
+import com.community.huiju.dao.TpHotelRoomMapper;
 import com.community.huiju.model.TpHotel;
 import com.community.huiju.model.TpHotelImg;
+import com.community.huiju.model.TpHotelRoom;
 import com.community.huiju.service.TpHotelServicel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,12 +34,18 @@ public class TpHotelServiceimpl implements TpHotelServicel {
     @Autowired
     private TpHotelImgMapper tpHotelImgMapper;
 
+    @Autowired
+    private TpHotelRoomMapper tpHotelRoomMapper;
+
     @Override
     public ResponseBean getHotel(UserElement userElement) {
        ResponseBean responseBean= new ResponseBean<>();
         // 每个小区只有一个酒店
         TpHotel tpHotel= tpHotelMapper.selectCommunityHotel(userElement.getCommunityId());
         if (null != tpHotel) {
+            // 获取当前酒店所有房间
+            List<TpHotelRoom> tpHotelRoom = tpHotelRoomMapper.selectHotelRoomList(userElement.getCommunityId(),tpHotel.getId());
+            tpHotel.setTpHotelRoomsList(tpHotelRoom);
             // 查询当前酒店所有的banner图
             List<String> img = tpHotelImgMapper.selectHotelImg(tpHotel.getId(), userElement.getCommunityId());
             Map map = new HashMap<>();

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TpRentalHouseServicelImpl.java

@@ -5,9 +5,13 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.dao.TpRentalHouseImgMapper;
 import com.community.huiju.dao.TpRentalHouseMapper;
+import com.community.huiju.model.TpAnnouncement;
 import com.community.huiju.model.TpRentalHouse;
 import com.community.huiju.model.TpRentalHouseImg;
 import com.community.huiju.service.TpRentalHouseServicel;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.google.common.collect.Maps;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,7 +38,9 @@ public class TpRentalHouseServicelImpl implements TpRentalHouseServicel {
     @Override
     public ResponseBean getRentalHouse(UserElement userElement, String houseName, Integer rentalType, Integer houseType, Integer rentalPrice, Integer priceFluctuate,Integer pageNum,Integer pageSize) {
         ResponseBean response= new ResponseBean<>();
-
+        Map<String, Object> parameter = Maps.newHashMap();
+        //使用分页插件
+        Page<TpRentalHouse> pageTpRentalHouseList = PageHelper.startPage(pageNum, pageSize);
         List<TpRentalHouse> tpRentalHouseList= tpRentalHouseMapper.getRentalHouse(houseName,rentalType,houseType,rentalPrice,priceFluctuate);
         for (TpRentalHouse tpRentalHouse:tpRentalHouseList){
             // 根据 tpRentalHouse.getId()和img_type为2查询列表图
@@ -45,7 +51,9 @@ public class TpRentalHouseServicelImpl implements TpRentalHouseServicel {
                  }
              }
         }
-        response.addSuccess(tpRentalHouseList);
+        parameter.put("total", pageTpRentalHouseList.getTotal());
+        parameter.put("list", tpRentalHouseList);
+        response.addSuccess(parameter);
         return response;
     }
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TpShopServicelmpl.java

@@ -5,10 +5,14 @@ import com.community.commom.session.UserElement;
 import com.community.huiju.dao.TpShopImgMapper;
 import com.community.huiju.dao.TpShopMapper;
 import com.community.huiju.dao.TpShopTypeMapper;
+import com.community.huiju.model.TpAnnouncement;
 import com.community.huiju.model.TpShop;
 import com.community.huiju.model.TpShopImg;
 import com.community.huiju.model.TpShopType;
 import com.community.huiju.service.TpShopServicel;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.google.common.collect.Maps;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -36,8 +40,11 @@ public class TpShopServicelmpl implements TpShopServicel {
     @Autowired
     private TpShopImgMapper tpShopImgMapper;
     @Override
-    public ResponseBean getShop(UserElement userElement,String houseName,Integer tpShopTypeId) {
+    public ResponseBean getShop(UserElement userElement,String houseName,Integer tpShopTypeId,Integer pageNum,Integer pageSize) {
         ResponseBean responseBean= new ResponseBean<>();
+        Map<String, Object> parameter = Maps.newHashMap();
+        //使用分页插件
+        Page<TpShop> pageShopList = PageHelper.startPage(pageNum, pageSize);
         List<TpShop> tpShopList= tpShopMapper.selectcommunityIdShop(userElement.getCommunityId(),houseName,tpShopTypeId);
         if (null != tpShopList) {
             for (TpShop tpShop : tpShopList) {
@@ -49,10 +56,10 @@ public class TpShopServicelmpl implements TpShopServicel {
             }
         }
         List<TpShopType> tpShopTypeList = tpShopTypeMapper.selectCommunityIdShop(userElement.getCommunityId());
-        Map map= new HashMap<>();
-        map.put("tpShopTypeList",tpShopTypeList);
-        map.put("tpShopList",tpShopList);
-        responseBean.addSuccess(map);
+        parameter.put("total", pageShopList.getTotal());
+        parameter.put("list", tpShopList);
+        parameter.put("tpShopTypeList",tpShopTypeList);
+        responseBean.addSuccess(parameter);
         return responseBean;
     }
 

CODE/smart-community/app-api/src/main/resources/mapper/TpHotelRoomMapper.xml

@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TpHotelRoomMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpHotelRoom" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="hotel_id" property="hotelId" jdbcType="INTEGER" />
+    <result column="room_no" property="roomNo" jdbcType="VARCHAR" />
+    <result column="room_name" property="roomName" jdbcType="VARCHAR" />
+    <result column="sort" property="sort" jdbcType="INTEGER" />
+    <result column="price" property="price" jdbcType="VARCHAR" />
+    <result column="room_status" property="roomStatus" jdbcType="VARCHAR" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, hotel_id, room_no, room_name, sort, price, room_status, remark, 
+    create_date, create_user, update_date, update_user
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_hotel_room
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_hotel_room
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpHotelRoom" >
+    insert into tp_hotel_room (id, community_id, hotel_id, 
+      room_no, room_name, sort, 
+      price, room_status, remark, 
+      create_date, create_user, update_date, 
+      update_user)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{hotelId,jdbcType=INTEGER}, 
+      #{roomNo,jdbcType=VARCHAR}, #{roomName,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, 
+      #{price,jdbcType=VARCHAR}, #{roomStatus,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
+      #{createDate,jdbcType=TIMESTAMP}, #{createUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}, 
+      #{updateUser,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpHotelRoom" >
+    insert into tp_hotel_room
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="hotelId != null" >
+        hotel_id,
+      </if>
+      <if test="roomNo != null" >
+        room_no,
+      </if>
+      <if test="roomName != null" >
+        room_name,
+      </if>
+      <if test="sort != null" >
+        sort,
+      </if>
+      <if test="price != null" >
+        price,
+      </if>
+      <if test="roomStatus != null" >
+        room_status,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="updateDate != null" >
+        update_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="hotelId != null" >
+        #{hotelId,jdbcType=INTEGER},
+      </if>
+      <if test="roomNo != null" >
+        #{roomNo,jdbcType=VARCHAR},
+      </if>
+      <if test="roomName != null" >
+        #{roomName,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null" >
+        #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="price != null" >
+        #{price,jdbcType=VARCHAR},
+      </if>
+      <if test="roomStatus != null" >
+        #{roomStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpHotelRoom" >
+    update tp_hotel_room
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="hotelId != null" >
+        hotel_id = #{hotelId,jdbcType=INTEGER},
+      </if>
+      <if test="roomNo != null" >
+        room_no = #{roomNo,jdbcType=VARCHAR},
+      </if>
+      <if test="roomName != null" >
+        room_name = #{roomName,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null" >
+        sort = #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="price != null" >
+        price = #{price,jdbcType=VARCHAR},
+      </if>
+      <if test="roomStatus != null" >
+        room_status = #{roomStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        update_date = #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpHotelRoom" >
+    update tp_hotel_room
+    set community_id = #{communityId,jdbcType=INTEGER},
+      hotel_id = #{hotelId,jdbcType=INTEGER},
+      room_no = #{roomNo,jdbcType=VARCHAR},
+      room_name = #{roomName,jdbcType=VARCHAR},
+      sort = #{sort,jdbcType=INTEGER},
+      price = #{price,jdbcType=VARCHAR},
+      room_status = #{roomStatus,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      create_user = #{createUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="selectHotelRoomList" resultType="com.community.huiju.model.TpHotelRoom">
+    select
+    <include refid="Base_Column_List" />
+    from tp_hotel_room
+    where  community_id = #{communityId,jdbcType=INTEGER}
+    and hotel_id = #{hotelId,jdbcType=INTEGER}
+    and room_status = 1
+  </select>
+</mapper>