Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

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

         ResponseBean responseBean = tpHotelServicel.getHotel(userElement);
         return responseBean;
     }
+
+    @ApiOperation(value = "当前小区酒店是否需要展示", notes = "当前小区酒店是否需要展示")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/CommunityHotel",method = RequestMethod.GET)
+    public Object getHotelCommunity(HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = tpHotelServicel.getHotelCommunity(userElement);
+        return responseBean;
+    }
+
+
 }

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

         return responseBean;
     }
 
+    @ApiOperation(value = "首页商铺信息", notes = "首页商铺信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+    })
+    @RequestMapping(value = "/getShopCommunity",method = RequestMethod.GET)
+    public Object getShopCommunity(HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = tpShopServicel.getShopCommunity(userElement);
+        return responseBean;
+    }
+
 
 
 }

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

     int updateByPrimaryKey(TpHotelImg record);
 
 
-    List<String> selectHotelImg(@Param("hotelId") Integer id, @Param("communityId") Integer communityId);
+    List<String> selectHotelImg(@Param("hotelId") Integer id, @Param("communityId") Integer communityId,@Param("type") Integer type);
 }

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

      * @return
      */
     TpHotel selectCommunityHotel(@Param("communityId") Integer CommunityId);
+
+    /**
+     * 酒店开关是否存在
+     * @param communityId
+     * @return
+     */
+    String hotelSetting(@Param("communityId") Integer communityId);
 }

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

      * @return
      */
     List<TpShop> selectcommunityIdShop(@Param("communityId") Integer communityId,@Param("houseName") String houseName,@Param("tpShopTypeId") Integer tpShopTypeId);
+
+    /**
+     * 查询当前小区商铺是否展示
+     * @param communityId
+     * @return
+     */
+    String shopSetting(@Param("communityId") Integer communityId);
+
+    /**
+     * 查询当前小区下的所有商铺
+     * @param communityId
+     * @return
+     */
+    List<TpShop> selectShopCommunity(@Param("communityId") Integer communityId);
 }

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

 
 public class TpHotel {
     private Integer id;
+
+    /**
+     * 酒店名称
+     */
+    private String hotelName;
+
     /**
      * 小区ID
      */
      */
     private List<TpHotelRoom> tpHotelRoomsList;
 
+    public String getHotelName() {
+        return hotelName;
+    }
+
+    public void setHotelName(String hotelName) {
+        this.hotelName = hotelName;
+    }
+
     public void setTpHotelRoomsList(List<TpHotelRoom> tpHotelRoomsList) {
         this.tpHotelRoomsList = tpHotelRoomsList;
     }

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

 package com.community.huiju.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class TpRentalHouse {
     /**
      */
     private String homeImg;
 
+    /**
+     * 标签数组
+     * @return
+     */
+    private List<String> houseLabelArr;;
+
+    public List<String> getHouseLabelArr() {
+        return houseLabelArr;
+    }
+
+    public void setHouseLabelArr(List<String> houseLabelArr) {
+        this.houseLabelArr = houseLabelArr;
+    }
+
     public String getHomeImg() {
         return homeImg;
     }

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

 package com.community.huiju.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class TpShop {
 
      */
     private String shopImg;
 
+    /**
+     * 商铺信息
+     * @return
+     */
+    private List<TpShopImg> tpShopImgList;
+
+    /**
+     * 商铺类型
+     * @return
+     */
+    private List<TpShopType> tpShopTypeList;
+
+    public List<TpShopType> getTpShopTypeList() {
+        return tpShopTypeList;
+    }
+
+    public void setTpShopTypeList(List<TpShopType> tpShopTypeList) {
+        this.tpShopTypeList = tpShopTypeList;
+    }
+
+    public List<TpShopImg> getTpShopImgList() {
+        return tpShopImgList;
+    }
+
+    public void setTpShopImgList(List<TpShopImg> tpShopImgList) {
+        this.tpShopImgList = tpShopImgList;
+    }
+
     public String getShopImg() {
         return shopImg;
     }

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

      * @return
      */
     ResponseBean getHotel(UserElement userElement);
+
+    /**
+     * 获取当前小区酒店信息
+     * @param userElement
+     * @return
+     */
+    ResponseBean getHotelCommunity(UserElement userElement);
 }

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

      * @return
      */
     ResponseBean getShopDetails(UserElement userElement, Integer id);
+
+    /**
+     * 获取当前小区下的所有商铺
+     * @param userElement
+     * @return
+     */
+    ResponseBean getShopCommunity(UserElement userElement);
 }

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

             List<TpHotelRoom> tpHotelRoom = tpHotelRoomMapper.selectHotelRoomList(userElement.getCommunityId(),tpHotel.getId());
             tpHotel.setTpHotelRoomsList(tpHotelRoom);
             // 查询当前酒店所有的banner图
-            List<String> img = tpHotelImgMapper.selectHotelImg(tpHotel.getId(), userElement.getCommunityId());
+            List<String> img = tpHotelImgMapper.selectHotelImg(tpHotel.getId(), userElement.getCommunityId(),2);
             Map map = new HashMap<>();
             map.put("tpHotel", tpHotel);
             map.put("img", img);
         }
         return responseBean;
     }
+
+    @Override
+    public ResponseBean getHotelCommunity(UserElement userElement) {
+        ResponseBean response= new ResponseBean<>();
+        // 查询当前的酒店是否展示
+        TpHotel tpHotel = null;
+        List<String> img = null;
+        String  hotelSetting= tpHotelMapper.hotelSetting(userElement.getCommunityId());
+        if (null != hotelSetting){
+             tpHotel= tpHotelMapper.selectCommunityHotel(userElement.getCommunityId());
+            List<TpHotelRoom> tpHotelRoom = tpHotelRoomMapper.selectHotelRoomList(userElement.getCommunityId(),tpHotel.getId());
+            tpHotel.setTpHotelRoomsList(tpHotelRoom);
+            img = tpHotelImgMapper.selectHotelImg(tpHotel.getId(), userElement.getCommunityId(),2);
+        }
+        Map map = new HashMap<>();
+        map.put("tpHotel", tpHotel);
+        map.put("img", img);
+        response.addSuccess(map);
+        return response;
+    }
 }

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

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * version V1.0
         //使用分页插件
         Page<TpRentalHouse> pageTpRentalHouseList = PageHelper.startPage(pageNum, pageSize);
         List<TpRentalHouse> tpRentalHouseList= tpRentalHouseMapper.getRentalHouse(houseName,rentalType,houseType,rentalPrice,priceFluctuate);
+            // 把字符串转数组
         for (TpRentalHouse tpRentalHouse:tpRentalHouseList){
+            String [] result = tpRentalHouse.getHouseLabel().split(",");
+            tpRentalHouse.setHouseLabelArr(Arrays.asList(result));
             // 根据 tpRentalHouse.getId()和img_type为2查询列表图
             List<TpRentalHouseImg> tpRentalHouseImgList= tpRentalHouseImgMapper.selectRentalHouseImg(tpRentalHouse.getId(),1);
              if (null != tpRentalHouseImgList){

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

         response.addSuccess(hashMap);
         return response;
     }
+
+    @Override
+    public ResponseBean getShopCommunity(UserElement userElement) {
+        ResponseBean response = new ResponseBean<>();
+        // 当前线下商铺是否展示
+        String shopSetting= tpShopMapper.shopSetting(userElement.getCommunityId());
+        List<TpShop> tpShopList = null;
+        List<TpShopType> tpShopType =null;
+        if (null != shopSetting){
+            tpShopList= tpShopMapper.selectShopCommunity(userElement.getCommunityId());
+            for (TpShop tpShop:tpShopList){
+                // 1 表示查询当前首页图片
+                List<TpShopImg> tpShopImgList= tpShopImgMapper.selectShopIdCommunity(userElement.getCommunityId(),tpShop.getId(),1);
+                tpShop.setTpShopImgList(tpShopImgList);
+            }
+            // 查询当前商铺类型
+             tpShopType= tpShopTypeMapper.selectCommunityIdShop(userElement.getCommunityId());
+        }
+        //购物
+        List<String> tpShopTypeImgShop= new ArrayList<>();
+        //购物车3x
+        tpShopTypeImgShop.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557816503894.png?Expires=1559643891&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+        //购物车2x
+        tpShopTypeImgShop.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557816639291.png?Expires=1559644026&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+
+        //美食图片
+        List<String> tpShopTypeImgCate= new ArrayList<>();
+        // 美食图片3x
+        tpShopTypeImgCate.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557816913843.png?Expires=1559644301&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+       // 美食图片2x
+        tpShopTypeImgCate.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557816963921.png?Expires=1559644351&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+
+        //休闲
+        List<String> tpShopTypeImgRecreation= new ArrayList<>();
+        // 休闲3x
+        tpShopTypeImgRecreation.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557817084664.png?Expires=1559644472&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+       // 休闲2x
+        tpShopTypeImgRecreation.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557817102003.png?Expires=1559644489&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+
+        // 运动图片
+        List<String> tpShopTypeImgExercise= new ArrayList<>();
+        // 运动图片3x
+        tpShopTypeImgExercise.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557817239384.png?Expires=1559644626&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+        // 运动图片2x
+        tpShopTypeImgExercise.add("http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1557817273156.png?Expires=1559644660&OSSAccessKeyId=LTAIkc75dpkJw8Lb");
+        Map<String,Object> hashMap= new HashMap<>();
+        hashMap.put("tpShopType",tpShopType);
+        hashMap.put("tpShopList",tpShopList);
+        hashMap.put("tpShopTypeImgShop",tpShopTypeImgShop);
+        hashMap.put("tpShopTypeImgCate",tpShopTypeImgCate);
+        hashMap.put("tpShopTypeImgRecreation",tpShopTypeImgRecreation);
+        hashMap.put("tpShopTypeImgExercise",tpShopTypeImgExercise);
+        response.addSuccess(hashMap);
+        return response;
+
+    }
 }

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

     from tp_hotel_img
     where community_id = #{communityId,jdbcType=INTEGER}
       and hotel_id = #{hotelId,jdbcType=INTEGER}
-      and img_type = 2
+      and img_type = #{type}
   </select>
 
 

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

     <result column="create_user" property="createUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+    <result column="hotel_name" property="hotelName" jdbcType="VARCHAR" />
   </resultMap>
   <resultMap id="ResultMapWithBLOBs" type="com.community.huiju.model.TpHotel" extends="BaseResultMap" >
     <result column="hotel_introduction" property="hotelIntroduction" jdbcType="LONGVARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, hotel_tel, hotel_address, hotel_longitude, hotel_latitude, create_date, 
+    id,hotel_name community_id, hotel_tel, hotel_address, hotel_longitude, hotel_latitude, create_date,
     create_user, update_date, update_user
   </sql>
   <sql id="Blob_Column_List" >
 
   <select id="selectCommunityHotel" parameterType="integer" resultMap="ResultMapWithBLOBs">
     select
-    id, community_id, hotel_tel, hotel_address, hotel_longitude, hotel_latitude, create_date,
+    id,hotel_name, community_id, hotel_tel, hotel_address, hotel_longitude, hotel_latitude, create_date,
     create_user, update_date, update_user,hotel_introduction
     from tp_hotel
     where community_id = #{communityId,jdbcType=INTEGER}
   </select>
+  
+  <select id="hotelSetting" resultType="integer">
+    select id from tp_hotel_setting where  community_id = #{communityId};
+  </select>
 
 </mapper>

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

     </where>
   </select>
 
+  <select id="shopSetting" resultType="string">
+    select id from tp_shop_setting where community_id = #{communityId}
+  </select>
+
+  <select id="selectShopCommunity" resultMap="ResultMapWithBLOBs">
+    select * from tp_shop WHERE community_id = #{communityId} order by sort desc LIMIT 4
+  </select>
 
 </mapper>

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/HotelController.java

         return responseBean;
     }
 
-    @ApiOperation(value = "工单列表", notes = "工单列表")
+    @ApiOperation(value = "添加房间", notes = "添加房间")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "roomNo:房间号" +
                     "roomName:房间名称" +

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/HotelServiceImpl.java

         Hotel hotel= tpHotelMapper.selectHotel(userElement.getCommunityId());
         hotelRoom.setCommunityId(userElement.getCommunityId())
                 .setHotelId(hotel.getId())
-                .setPrice(String.valueOf(Double.valueOf(hotelRoom.getPrice())))
+                .setPrice(String.valueOf(hotelRoom.getPrice()))
                 .setCreateDate(LocalDateTime.now())
                 .setCreateUser(userElement.getId());
         tpHotelRoomMapper.insert(hotelRoom);

CODE/smart-community/property-api/src/main/resources/mapper/HotelRoomMapper.xml

                 AND date_format(create_date, '%Y-%m-%d') <![CDATA[>= ]]> date_format(#{beginTime}, '%Y-%m-%d')
                 AND date_format(create_date, '%Y-%m-%d')<![CDATA[<= ]]> date_format(#{endTime}, '%Y-%m-%d')
             </if>
+            order by sort desc
         </where>
     </select>
 

VUECODE/smart-property-manage/src/views/grogshop/grogshopRoomAdd.vue

   },
   methods: {
     submitForm(){
+      if(this.ruleForm.roomNo =='null'){
+        this.$message.error('请输入房间号');
+      }
+      if(this.ruleForm.roomName =='null'){
+        this.$message.error('请输入房间名称');
+      }
+      if(this.ruleForm.roomNo =='null'){
+        this.$message.error('请输入房间号');
+      }
       this.$store.dispatch('HotelRoomAdd', this.ruleForm).then((res) => {
+        this.$router.push({ name: 'grogshop-grogshopRoom' })
+         this.$message({
+          message: '新增房间成功',
+          type: 'success'
+        });
       }).catch(() => {
         console.log('error HotelRoom')
       })