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

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

@@ -0,0 +1,70 @@
+package com.community.huiju.controller;
+
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.IHotelService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import com.community.huiju.common.base.BaseController;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * <p>
+ * 酒店 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "", description = "酒店管理API")
+public class HotelController extends BaseController {
+    @Autowired
+    private IHotelService iHotelService;
+
+    @ApiOperation(value = "房屋列表", notes = "房屋列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "roomNo:房间号" +
+                    "roomName:房间名称" +
+                    "price:价格" +
+                    "roomStatus:(1:是已上架 2:是已下架)" +
+                    "beginTime:开始时间"+
+                    "endTime:结束时间"+
+                    "sort:权重")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/hotelRoomList", method = RequestMethod.POST)
+    public ResponseBean hotelRoom(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = iHotelService.hotelRoomLiset(parameter,userElement.getCommunityId());
+        return responseBean;
+    }
+
+    @ApiOperation(value = "工单列表", notes = "工单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "roomNo:房间号" +
+                    "roomName:房间名称" +
+                    "price:价格" +
+                    "roomStatus:(1:是已上架 2:是已下架)" +
+                    "remark:(描述)"+
+                    "sort:权重")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/hotelRoomAdd", method = RequestMethod.POST)
+    public ResponseBean hotelRoomAdd(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = iHotelService.hotelRoomAdd(parameter,userElement);
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.community.huiju.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import com.community.huiju.common.base.BaseController;
+
+/**
+ * <p>
+ * 酒店房间表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@RestController
+@RequestMapping("/")
+public class HotelRoomController extends BaseController {
+
+}

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

@@ -0,0 +1,20 @@
+package com.community.huiju.controller;
+
+
+import com.community.huiju.common.base.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 出租公寓表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@RestController
+@RequestMapping("/")
+public class TpRentalHouseController extends BaseController {
+
+}

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

@@ -0,0 +1,20 @@
+package com.community.huiju.controller;
+
+
+import com.community.huiju.common.base.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 出租房间图片 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@RestController
+@RequestMapping("/")
+public class TpRentalHouseImgController extends BaseController {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/HotelMapper.java

@@ -0,0 +1,24 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.Hotel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 酒店 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Mapper
+public interface HotelMapper extends BaseMapper<Hotel> {
+
+    /**
+     * 查询酒店，当前小区酒店只有一个
+     * @return
+     */
+    Hotel selectHotel(@Param("communityId") Integer communityId);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/HotelRoomMapper.java

@@ -0,0 +1,32 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.community.huiju.model.HotelRoom;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 酒店房间表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Mapper
+public interface HotelRoomMapper extends BaseMapper<HotelRoom> {
+
+    /**
+     * 查询房间列表
+     * @param hotelRoom
+     * @param beginTime
+     * @param endTime
+     * @param communityId
+     * @return
+     */
+    IPage<HotelRoom> hotelRoomLiset(Page HotelRoom , @Param("hotelRoom") HotelRoom hotelRoom, @Param("beginTime") Date beginTime, @Param("endTime") Date endTime, @Param("communityId") Integer communityId);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/HotelSettingMapper.java

@@ -0,0 +1,18 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.HotelSetting;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 酒店开关设置 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Mapper
+public interface HotelSettingMapper extends BaseMapper<HotelSetting> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpRentalHouseImgMapper.java

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TpRentalHouseImg;
+
+/**
+ * <p>
+ * 出租房间图片 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+public interface TpRentalHouseImgMapper extends BaseMapper<TpRentalHouseImg> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpRentalHouseMapper.java

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TpRentalHouse;
+
+/**
+ * <p>
+ * 出租公寓表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+public interface TpRentalHouseMapper extends BaseMapper<TpRentalHouse> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/Hotel.java

@@ -0,0 +1,79 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 酒店
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_hotel")
+public class Hotel implements Serializable {
+
+    private  Integer id;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 酒店电话
+     */
+    private String hotelTel;
+
+    /**
+     * 酒店地址
+     */
+    private String hotelAddress;
+
+    /**
+     * 酒店经度
+     */
+    private String hotelLongitude;
+
+    /**
+     * 酒店纬度
+     */
+    private String hotelLatitude;
+
+    /**
+     * 酒店介绍
+     */
+    private String hotelIntroduction;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/HotelRoom.java

@@ -0,0 +1,94 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 酒店房间表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_hotel_room")
+public class HotelRoom implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区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 LocalDateTime createDate;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 编辑人
+     */
+    @TableField(exist = false)
+    private String editUser;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/HotelSetting.java

@@ -0,0 +1,47 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 酒店开关设置
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_hotel_setting")
+public class HotelSetting implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 酒店ID
+     */
+    private Integer hotelId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+
+}

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

@@ -0,0 +1,178 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 出租公寓表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TpRentalHouse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 房间名称
+     */
+    private String houseName;
+
+    /**
+     * 房屋租金
+     */
+    private String rentalPrice;
+
+    /**
+     * 面积
+     */
+    private String area;
+
+    /**
+     * 出租方式 1 是整租 2是合租
+     */
+    private String rentalType;
+
+    /**
+     * 户型 1 是一室居 2是二室居 3 是三室局 4 是四室居及以上
+     */
+    private String houseType;
+
+    /**
+     * 上架状态 1 是已上架 2是已下架
+     */
+    private String houseStatus;
+
+    /**
+     * 楼层
+     */
+    private String houseLevel;
+
+    /**
+     * 标签
+     */
+    private String houseLabel;
+
+    /**
+     * 权重
+     */
+    private Integer sort;
+
+    /**
+     * 联系电话
+     */
+    private String houseTel;
+
+    /**
+     * 小区地址
+     */
+    private String communityAddress;
+
+    /**
+     * 小区经度
+     */
+    private String communityLongitude;
+
+    /**
+     * 小区纬度
+     */
+    private String communityLatitude;
+
+    /**
+     * 房屋介绍
+     */
+    private String houseIntroduction;
+
+    /**
+     * 床   1 有
+     */
+    private String bed;
+
+    /**
+     * 衣柜 1 有
+     */
+    private String wardrobe;
+
+    /**
+     * 餐桌 1 有
+     */
+    private String diningTable;
+
+    /**
+     * 电脑桌 1 有
+     */
+    private String computerDesk;
+
+    /**
+     * 热水器 1 有
+     */
+    private String waterHeater;
+
+    /**
+     * 椅子 1 有
+     */
+    private String chair;
+
+    /**
+     *  洗衣机 1 有
+     */
+    private String washingMachine;
+
+    /**
+     * 空调 1 有
+     */
+    private String airConditioning;
+
+    /**
+     * 台灯 1 有
+     */
+    private String tableLamp;
+
+    /**
+     * WiFi 1 有
+     */
+    @TableField("WiFi")
+    private String WiFi;
+
+    /**
+     * 微波炉 1 有
+     */
+    private String microwaveOven;
+
+    /**
+     * 天然气 1 有
+     */
+    private String naturalGas;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpRentalHouseImg.java

@@ -0,0 +1,51 @@
+package com.community.huiju.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 出租房间图片
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TpRentalHouseImg implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 出租房间ID
+     */
+    private Integer rentalHouseId;
+
+    /**
+     * 出租房间图片地址
+     */
+    private String imgUrl;
+
+    /**
+     * 出租房间图片类型 1是app列表图，2是轮播图
+     */
+    private String imgType;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.community.huiju.model.HotelRoom;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 酒店房间表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+public interface IHotelRoomService extends IService<HotelRoom> {
+
+}

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

@@ -0,0 +1,32 @@
+package com.community.huiju.service;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.Hotel;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 酒店 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+public interface IHotelService extends IService<Hotel> {
+
+    /**
+     * 房间列表
+     * @param parameter
+     * @param communityId
+     * @return
+     */
+    ResponseBean hotelRoomLiset(String parameter, Integer communityId);
+
+    /**
+     * 添加房间
+     * @param parameter
+     * @return
+     */
+    ResponseBean hotelRoomAdd(String parameter , UserElement userElement);
+}

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

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TpRentalHouseImg;
+
+/**
+ * <p>
+ * 出租房间图片 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+public interface ITpRentalHouseImgService extends IService<TpRentalHouseImg> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TpRentalHouse;
+
+/**
+ * <p>
+ * 出租公寓表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+public interface ITpRentalHouseService extends IService<TpRentalHouse> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.community.huiju.dao.HotelRoomMapper;
+import com.community.huiju.model.HotelRoom;
+import com.community.huiju.service.IHotelRoomService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 酒店房间表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Service
+public class HotelRoomServiceImpl extends ServiceImpl<HotelRoomMapper, HotelRoom> implements IHotelRoomService {
+
+}

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

@@ -0,0 +1,91 @@
+package com.community.huiju.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.dao.HotelMapper;
+import com.community.huiju.dao.HotelRoomMapper;
+import com.community.huiju.dao.UserMapper;
+import com.community.huiju.model.Hotel;
+import com.community.huiju.model.HotelRoom;
+import com.community.huiju.model.TpTicket;
+import com.community.huiju.model.User;
+import com.community.huiju.service.IHotelService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ * 酒店 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Service
+public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements IHotelService {
+
+    @Autowired
+    private HotelRoomMapper tpHotelRoomMapper;
+
+    @Autowired
+    private  HotelMapper tpHotelMapper;
+
+    @Autowired
+    private UserMapper tpUserMapper;
+    @Override
+    public ResponseBean hotelRoomLiset(String parameter, Integer communityId) {
+        ResponseBean response= new ResponseBean<>();
+        HotelRoom hotelRoom= JSONObject.parseObject(parameter, HotelRoom.class);
+
+        JSONObject object= JSONObject.parseObject(parameter);
+        Integer pageNum = object.getInteger("pageNum");
+        Integer pageSize = object.getInteger("pageSize");
+
+        Date beginTime = object.getDate("beginTime");
+        Date endTime = object.getDate("endTime");
+
+        Page<HotelRoom> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+
+        IPage<HotelRoom> pageInfo = tpHotelRoomMapper.hotelRoomLiset(page,hotelRoom,beginTime,endTime,communityId);
+        List<HotelRoom> hotelRoomList = pageInfo.getRecords();
+        for (HotelRoom hotelRoomS:hotelRoomList){
+            User user= tpUserMapper.selectById(hotelRoomS.getUpdateUser());
+            if (null != user){
+                hotelRoomS.setEditUser(user.getUserName());
+            }
+        }
+        HashMap map=new HashMap<>();
+        map.put("list",hotelRoomList);
+        map.put("total", pageInfo.getTotal());
+        map.put("pageNum", pageInfo.getCurrent());
+        map.put("pageSize", pageInfo.getSize());
+        response.addSuccess(map);
+        return response;
+    }
+
+    @Override
+    public ResponseBean hotelRoomAdd(String parameter, UserElement userElement) {
+        ResponseBean response= new ResponseBean<>();
+        HotelRoom hotelRoom= JSONObject.parseObject(parameter, HotelRoom.class);
+        Hotel hotel= tpHotelMapper.selectHotel(userElement.getCommunityId());
+        hotelRoom.setCommunityId(userElement.getCommunityId())
+                .setHotelId(hotel.getId())
+                .setPrice(String.valueOf(Double.valueOf(hotelRoom.getPrice())))
+                .setCreateDate(LocalDateTime.now())
+                .setCreateUser(userElement.getId());
+        tpHotelRoomMapper.insert(hotelRoom);
+        response.addSuccess("成功");
+        return response;
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TpRentalHouseImgMapper;
+import com.community.huiju.model.TpRentalHouseImg;
+import com.community.huiju.service.ITpRentalHouseImgService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 出租房间图片 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Service
+public class TpRentalHouseImgServiceImpl extends ServiceImpl<TpRentalHouseImgMapper, TpRentalHouseImg> implements ITpRentalHouseImgService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TpRentalHouseMapper;
+import com.community.huiju.model.TpRentalHouse;
+import com.community.huiju.service.ITpRentalHouseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 出租公寓表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Service
+public class TpRentalHouseServiceImpl extends ServiceImpl<TpRentalHouseMapper, TpRentalHouse> implements ITpRentalHouseService {
+
+}

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

@@ -0,0 +1,7 @@
+<?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.HotelMapper">
+ <select id="selectHotel" resultType="com.community.huiju.model.Hotel">
+  select * from tp_hotel where community_id = #{communityId};
+ </select>
+</mapper>

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

@@ -0,0 +1,28 @@
+<?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.HotelRoomMapper">
+    <select id="hotelRoomLiset" resultType="com.community.huiju.model.HotelRoom">
+        select
+        *
+        from tp_hotel_room
+        <where>
+            <if test="hotelRoom.roomNo !=null and hotelRoom.roomNo !=''">
+                AND  room_no like concat('%',#{hotelRoom.roomNo},'%')
+            </if>
+            <if test="hotelRoom.roomName !=null and hotelRoom.roomName !=''">
+                AND room_name = #{hotelRoom.roomName}
+            </if>
+            <if test="hotelRoom.price !=null and hotelRoom.price !=''">
+                AND price = #{hotelRoom.price}
+            </if>
+            <if test="hotelRoom.roomStatus !=null and hotelRoom.roomStatus !=''">
+                AND room_no = #{hotelRoom.roomStatus}
+            </if>
+            <if test="beginTime !=null and beginTime !='' and endTime !=null and endTime !=''">
+                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>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,5 @@
+<?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.HotelSettingMapper">
+
+</mapper>

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

@@ -0,0 +1,5 @@
+<?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.TpRentalHouseImgMapper">
+
+</mapper>

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

@@ -0,0 +1,5 @@
+<?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.TpRentalHouseMapper">
+
+</mapper>

VUECODE/smart-property-manage/src/api/grogshop.js

@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+export function hotelRoom(data) {
+  return request({
+    url: '/hotelRoomList',
+    method: 'post',
+    data: {
+      roomNo: data.roomNo,
+      roomName: data.roomName,
+      price: data.price,
+      roomStatus: data.roomStatus,
+      beginTime: data.beginTime,
+      endTime: data.endTime,
+      sort: data.sort
+    }
+  })
+}
+export function hotelRoomAdd(data) {
+  return request({
+    url: '/hotelRoomAdd',
+    method: 'post',
+    data: {
+      roomNo: data.roomNo,
+      roomName: data.roomName,
+      price: data.price,
+      roomStatus: data.roomStatus,
+      sort: data.sort,
+      remark: data.remark
+    }
+  })
+}
+

VUECODE/smart-property-manage/src/router/index.js

@@ -417,6 +417,36 @@ export const constantRouterMap = [
       }
     ]
   },
+  {
+    path: '/rental',
+    component: Layout,
+    redirect: '/rental/index',
+    name: 'rental',
+    alwaysShow: true,
+    meta: { title: '长租公寓', icon: 'zip' },
+    children: [
+      {
+        path: '/rental/index',
+        component: () => import('@/views/rental/rentalIndex'),
+        name: 'rental-index',
+        meta: { title: '房间列表', icon: 'table' }
+      },
+      {
+        path: '/rental/add',
+        component: () => import('@/views/rental/rentalAdd'),
+        name: 'shop-add',
+        hidden: true,
+        meta: { title: '添加房间信息', icon: 'table' }
+      },
+      {
+        path: '/rental/edit',
+        component: () => import('@/views/rental/rentalEdit'),
+        name: 'rental-edit',
+        hidden: true,
+        meta: { title: '修改房间信息', icon: 'table' }
+      }
+    ]
+  },
   {
     path: '/message',
     component: Layout,
@@ -439,6 +469,35 @@ export const constantRouterMap = [
       }
     ]
   },
+  {
+    path: '/grogshop',
+    component: Layout,
+    redirect: '/grogshop/configindex',
+    name: 'grogshop',
+    alwaysShow: true,
+    meta: { title: '酒店管理', icon: 'zip' },
+    children: [
+      {
+        path: '/grogshop/configindex',
+        component: () => import('@/views/grogshop/configindex'),
+        name: 'grogshop-configindex',
+        meta: { title: '酒店配置', icon: 'table' }
+      },
+      {
+        path: '/grogshop/grogshopRoom',
+        component: () => import('@/views/grogshop/grogshopRoom'),
+        name: 'grogshop-grogshopRoom',
+        meta: { title: '房间列表', icon: 'table' }
+      },
+      {
+        path: '/grogshop/grogshopRoomAdd',
+        component: () => import('@/views/grogshop/grogshopRoomAdd'),
+        name: 'grogshop-grogshopRoomAdd',
+        hidden: true,
+        meta: { title: '新增房间', icon: 'table' }
+      }
+    ]
+  },
   {
     path: '/systemResources',
     component: Layout,

VUECODE/smart-property-manage/src/store/index.js

@@ -22,8 +22,8 @@ import message from './modules/message'
 import buildingTree from './modules/buildingTree'
 import equipment from './modules/equipment'
 import shopType from './modules/shopType'
+import grogshop from './modules/grogshop'
 import license from './modules/license'
-
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
@@ -49,6 +49,7 @@ const store = new Vuex.Store({
     buildingTree,
     equipment,
     shopType,
+    grogshop,
     license
   },
   getters

VUECODE/smart-property-manage/src/store/modules/grogshop.js

@@ -0,0 +1,25 @@
+import { hotelRoom, hotelRoomAdd } from '@/api/grogshop'
+
+const grogshop = {
+  actions: {
+    HotelRoom({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        hotelRoom(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    HotelRoomAdd({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        hotelRoomAdd(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    }
+  }
+}
+export default grogshop

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

@@ -0,0 +1,145 @@
+<template>
+  <div class="root">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="add-ruleForm">
+      <el-form-item label="角色名称" prop="roleName">
+        <el-input :disabled="true" v-model="ruleForm.roleName"/>
+      </el-form-item>
+      <el-form-item label="角色描述" prop="description">
+        <el-input :disabled="true" v-model="ruleForm.description"/>
+      </el-form-item>
+      <el-form-item label="资源权限" prop="menuArray">
+        <el-tree
+          ref="tree"
+          :data="menuList"
+          show-checkbox
+          node-key="id"
+          :default-expanded-keys="ruleForm.menuArray"
+          :default-checked-keys="ruleForm.menuArray"
+          :props="defaultProps">
+        </el-tree>
+      </el-form-item> 
+      <el-form-item>
+        <el-button type="primary" @click="goEditRole">去修改</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { mapState, mapActions, mapMutations } from 'vuex'
+import waves from '@/directive/waves' // Waves directive
+import { parseTime } from '@/utils'
+
+export default {
+  computed: {
+    ...mapState('role', {
+      menuList: s => s.menuList
+    })
+  },
+  data() {
+    return {
+      ruleForm: {
+        id: '',
+        roleName: '',
+        description: '',
+        menuArray: []
+      },
+      rules: {
+        roleName: [
+          { required: true, message: '请输入角色名称', trigger: 'blur' }
+        ],
+        menuArray: [
+          { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
+        ]
+      },
+      defaultProps: {
+        children: 'children',
+        label: 'menuName',
+        disabled: () => true
+      }
+    }
+  },
+  created(){
+    this.ruleForm.id = this.$route.params.id
+    this.getDataById()
+    this.getMenuList()
+  },
+  methods: {
+    ...mapMutations('role', {
+    }),
+    ...mapActions('role', [
+      'FetchMenuList',
+      'UpdateRoleInfo',
+      'GetRoleInfo'
+    ]),
+    submitForm(formName) { // 提交
+      // 获取选中的树形节点 key
+      this.ruleForm.menuArray = this.$refs.tree.getCheckedKeys()
+      console.log(this.ruleForm.menuArray)
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.updateRole()
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    getMenuList() {
+      this.FetchMenuList().then(() => {
+      }).catch(() => {
+        console.log('get list error')
+      })
+    },
+    resetForm(formName) { // 重置
+      this.$refs[formName].resetFields()
+    },
+    updateRole() {
+      // 加载框
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.UpdateRoleInfo(this.ruleForm).then((res) => {
+        if (res.code === '0') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+          this.$router.push({ name: 'role-index' })
+          loading.close()
+          return
+        }
+        this.$message.error(res.message)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+        console.log('error updateRole')
+      })
+    },
+    goEditRole(){
+      this.$router.push({ name: 'role-edit', params: { id: this.ruleForm.id }})
+    },
+    getDataById() {
+      this.GetRoleInfo(this.ruleForm.id).then((res) => {
+        this.ruleForm.roleName = res.data.roleName
+        this.ruleForm.description = res.data.description
+        this.ruleForm.menuArray = res.data.menuArray
+      }).catch(() => {
+        console.log('error init role')
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.add-ruleForm{
+  width: 800px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
+</style>

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

@@ -0,0 +1,198 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="listQuery" class="form-listQuery">
+      <el-form-item class="filter-item"  label="房间编号">
+        <el-input v-model="listQuery.roomNo"  placeholder="房间编号"/>
+      </el-form-item>
+      <el-form-item class="filter-item"  label="房间名称">
+        <el-input v-model="listQuery.roomName" placeholder="房间名称"/>
+      </el-form-item>
+      <el-form-item class="filter-item"  label="房间价格">
+        <el-input  v-model="listQuery.price" placeholder="房间价格"/>
+      </el-form-item>
+      <el-form-item class="filter-item"  label="上架状态">
+        <el-select v-model="listQuery.roomStatus" placeholder="待办类型">
+         <el-option label="已上架" value="1"/>
+         <el-option label="已下架" value="2"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item class="filter-item"  label="预订日期从">
+            <el-date-picker
+              v-model="listQuery.beginTime"
+              type="date"
+              placeholder="年-月-日">
+              </el-date-picker>
+              <span>-</span>
+              <el-date-picker
+              v-model="listQuery.endTime"
+              type="date"
+              placeholder="年-月-日">
+              </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" class="filter-item" @click="handleFilter">清空</el-button>
+        <el-button type="primary" @click="search">查询</el-button>
+      </el-form-item>
+
+      <el-row>
+      <el-button type="success" @click="addHotelRoom()">新增</el-button>
+      <el-button type="info">编辑</el-button>
+       <el-button type="primary">上架状态</el-button>
+      <el-button type="danger">下架房间</el-button>
+      </el-row>
+
+    </el-form>
+      <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="listData"
+      border
+      tooltip-effect="dark"
+      style="width: 100%; margin-top: 20px;"
+      @selection-change="handleSelectionChange">
+      <el-table-column
+        type="selection"
+        width="55"/>
+      <el-table-column prop="roomNo" label="编号" align="center"/>
+      <el-table-column prop="roomName" label="房间名称" align="center"/>
+      <el-table-column prop="sort" label="权重" align="center"/>
+      <el-table-column prop="price" label="房间价格" align="center"/>
+      <el-table-column prop="roomStatus" label="上架状态" align="center"/>
+      <el-table-column prop="editUser" label="编辑人" align="center"/>
+      <el-table-column prop="createDate" label="时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template></el-table-column>
+
+    </el-table>
+        <div class="block">
+      <el-pagination
+        :current-page.sync="listQuery.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size.sync="listQuery.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+  </div>
+
+</div>
+
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+          listQuery: {
+            id: '',
+            messageContent: '',
+            status: '',
+            //待办类型
+            messageType:'',
+            pageNum: 1,
+            pageSize: 10,
+            dataValue: '',
+            roomNo: '',
+            roomName: '',
+            price: '',
+            beginTime: '',
+            endTime: '',
+            roomStatus: '',
+            editUser: ''      
+          },
+           deleteIds: [], // 选择的id集合
+           total: 0,
+           listLoading: true, // 加载圈
+           listData: [],
+        }
+    },
+    mounted(){
+        //  this.listLoading = false
+    this.dataQuery()
+    },
+    methods:{
+    dataQuery() { // 查询数据
+      this.listLoading = true
+      this.$store.dispatch('HotelRoom', this.listQuery).then((res) => {
+        const resData = res.data
+        this.listData = resData.list
+        this.listQuery.pageNum = resData.pageNum
+        this.listQuery.pageSize = resData.pageSize
+        this.total = resData.total
+        this.listLoading = false
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error HotelRoom')
+      })
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.listQuery.pageSize = val
+      this.dataQuery()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.listQuery.pageNum = val
+      this.dataQuery()
+    },
+    handleFilter() {
+      this.listQuery.messageContent = ''
+      this.listQuery.status = ''
+      this.listQuery.messageType = ''
+      this.listQuery.dataValue = ''
+      this.listQuery.pageNum = 1
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 10
+      this.dataQuery()
+    },
+    search() {
+      this.dataQuery()
+    },
+    handleSelectionChange(data) {
+      this.deleteIds = [] // 设置为 空
+      for (let i = 0; i < data.length; i++) {
+      this.deleteIds.push(data[i].id)
+    }
+    },
+     formatDate(val) {
+      if (val === null) {
+        return ''
+      }
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = this.padDate(value.getMonth() + 1)
+      var day = this.padDate(value.getDate())
+      var hour = this.padDate(value.getHours())
+      var minutes = this.padDate(value.getMinutes())
+      var seconds = this.padDate(value.getSeconds())
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+    },
+      padDate(value) {
+      value = value < 10 ? '0' + value : value
+      return value
+    },
+    addHotelRoom(){
+      this.$router.push({ name: 'grogshop-grogshopRoomAdd' })
+    },
+  }
+
+
+}
+</script>
+
+<style>
+.form-listQuery{
+  margin-top: 20px;
+  margin-left: 30px;
+}
+.root{
+  display: flex;
+  flex-flow: column;
+}
+.block{
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
+}
+.spanSize{
+    color:aqua
+}
+</style>

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

@@ -0,0 +1,77 @@
+<template>
+  <div id="root">
+    <el-form ref="ruleForm" :model="ruleForm"  label-width="100px" class="demo-ruleForm">
+      <el-form-item label="房间名称" >
+        <el-input v-model="ruleForm.roomName" placeholder="房间名称"/>
+      </el-form-item>
+       <el-form-item label="房间号" >
+        <el-input v-model="ruleForm.roomNo" placeholder="房间号"/>
+      </el-form-item>
+     <el-form-item class="filter-item" label="房间描述" prop="remark" >
+        <el-input v-model.trim="ruleForm.remark" placeholder="房间描述"/>
+      </el-form-item>
+      <el-form-item label="房间价格">
+        <el-input v-model="ruleForm.price" placeholder="房间价格"/>
+      </el-form-item>
+      <el-form-item class="filter-item"  label="上架状态">
+        <el-select v-model="ruleForm.roomStatus" placeholder="上架">
+         <el-option label="上架" value="1"/>
+         <el-option label="下架" value="2"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="权重" prop="sort">
+        <el-input v-model="ruleForm.sort" placeholder="权重"/>
+      </el-form-item>  
+      <el-form-item>
+        <el-button type="primary" @click="submitForm()">立即创建</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      ruleForm: {
+            price: '',
+           remark: '',
+         roomName: '',
+       roomStatus: '',
+             sort: '',
+           roomNo: ''
+      }
+      // rules: {
+      //   userName: [
+      //     { required: true, message: '请输入姓名', trigger: 'blur' }
+      //   ],
+      //   price: [
+      //     { required: true, message: '请输入价格', trigger: 'blur' }
+      //   ],
+      //   menuArray: [
+      //     { required: true, message: '请选择角色', trigger: 'blur' }
+      //   ],       
+      // }
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    submitForm(){
+      this.$store.dispatch('HotelRoomAdd', this.ruleForm).then((res) => {
+      }).catch(() => {
+        console.log('error HotelRoom')
+      })
+    }
+   }
+  }
+</script>
+
+<style scoped>
+.demo-ruleForm {
+  width: 500px;
+  margin-top: 20px;
+  margin-left: auto;
+  margin-right: auto;
+}
+</style>

VUECODE/smart-property-manage/src/views/rental/rentalAdd.vue

@@ -0,0 +1,315 @@
+<template>
+  <div class="root">
+    <el-form ref="ruleForm" :model="listData" :rules="rules" label-width="150px" class="add-ruleForm">
+      <el-form-item label="商铺名称" prop="shopName">
+        <el-input v-model="listData.shopName"/>
+      </el-form-item>
+      <el-form-item label="商铺说明" prop="remark">
+        <el-input v-model="listData.remark"/>
+      </el-form-item>
+      <el-form-item label="app首页展示图" prop="appIndexImg">
+        <el-upload
+          class="avatar-uploader"
+          name="uploadFiles"
+          :action="uploadImgUrl"
+          :show-file-list="false"
+          :on-success="handleAppIndexSuccess"
+          :before-upload="beforeAvatarUpload">
+          <img v-if="listData.appIndexImg" :src="listData.appIndexImg" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="app列表展示图" prop="appListImg">
+        <el-upload
+          class="avatar-uploader"
+          name="uploadFiles"
+          :action="uploadImgUrl"
+          :show-file-list="false"
+          :on-success="handleAppListSuccess"
+          :before-upload="beforeAvatarUpload">
+          <img v-if="listData.appListImg" :src="listData.appListImg" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="app商铺轮播图" prop="appCarouselImg">
+        <el-upload
+          name="uploadFiles"
+          :limit="6"
+          :action="uploadImgUrl"
+          list-type="picture-card"
+          :on-preview="handlePictureCardPreview"
+          :on-remove="handleRemove"
+          :on-success="handleSuccessCarouselImg">
+          <i class="el-icon-plus"></i>
+        </el-upload>
+        <el-dialog :visible.sync="dialogVisible">
+          <img width="100%" :src="dialogImageUrl" alt="">
+        </el-dialog>
+      </el-form-item>
+      <el-form-item label="权重" prop="sort">
+        <el-input v-model="listData.sort"/>
+      </el-form-item>
+      <el-form-item label="商铺类型" prop="shopTypeId">
+        <el-select v-model="listData.shopTypeId" placeholder="商铺类型" clearable class="filter-item">
+          <el-option v-for="item in shopTypeList" :key="item.id" :value="item.id" :label="item.typeName"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="上架状态" prop="shopStatus">
+        <el-select v-model="listData.shopStatus" placeholder="请选择">
+          <el-option label="已上架" value="1"/>
+          <el-option label="已下架" value="2"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="shopTel">
+        <el-input v-model="listData.shopTel"/>
+      </el-form-item>
+      <el-form-item label="商铺地址" prop="shopAddress">
+        <el-input v-model="listData.shopAddress"/>
+      </el-form-item>
+      <el-form-item label="人均消费" prop="averagePrice">
+        <el-input v-model="listData.averagePrice"/>
+      </el-form-item>
+      <el-form-item label="高德坐标">
+        <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 150px;" />
+        <el-input placeholder="纬度" v-model="listData.shopLatitude" style="width: 150px;" />
+      </el-form-item>
+      <el-form-item label="">
+         <!-- 地图 -->
+        <div style="width:100%;height:300px;" class="amap-page-container">
+          <el-amap-search-box :search-option="searchOption" :on-search-result="onSearchResult" class="search-box"/>
+          <el-amap ref="map" :events="events" :center="mapCenter" :zoom="12" class="amap-demo" vid="amapDemo">
+            <el-amap-marker v-for="(item,index) in markers" :key="index" :position="item" />
+          </el-amap>
+        </div>
+      </el-form-item>
+      <el-form-item label="商铺介绍">
+          <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
+          <div id="father">
+            <wangeditor @wangeditorEvent="wangeditorValue"/>
+          </div>
+        </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
+        <el-button @click="resetForm('ruleForm')">重置</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+import Wangeditor from '@/components/Wangeditor'
+
+export default {
+  components: { Pagination, Wangeditor },
+  data() {
+    return {
+      events: {
+        click: e => {
+          // _self.postData.Coordinate = e.lnglat.lat + ',' + e.lnglat.lng
+          this.listData.shopLongitude = e.lnglat.lng
+          this.listData.shopLatitude = e.lnglat.lat
+        }
+      },
+      listData: {
+        shopName: '',
+        remark: '',
+        appIndexImg: '',
+        appListImg: '',
+        appCarouselImg: [],
+        sort: '',
+        shopTypeId: '',
+        shopStatus: '',
+        shopTel: '',
+        shopAddress: '',
+        averagePrice: '',
+        shopLongitude: '',
+        shopLatitude: '',
+        shopIntroduction: ''
+      },
+      dialogImageUrl: '',
+      dialogVisible: false,
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
+      markers: [],
+      shopTypeList: [],
+      searchOption: {
+        city: '南京',
+        citylimit: false
+      },
+      mapCenter: [118.789509, 32.019989],
+      tableKey: 0,
+      rules: {
+        typeName: [
+          { required: true, message: '请输入商铺名称', trigger: 'blur' }
+        ],
+        remark: [
+          { required: true, message: '请输入商铺说明', trigger: 'blur' }
+        ],
+        shopTel: [
+          { required: true, message: '请输入联系电话', trigger: 'blur' }
+        ],
+        shopAddress: [
+          { required: true, message: '请输入商铺地址', trigger: 'blur' }
+        ],
+        appIndexImg: [
+          { required: true, message: 'app首页展示图', trigger: 'blur' }
+        ],
+        appListImg: [
+          { required: true, message: 'app列表展示图', trigger: 'blur' }
+        ],
+        appCarouselImg: [
+          { required: true, message: 'app商铺轮播图', trigger: 'blur' }
+        ],
+      }
+    }
+  },
+  mounted() {
+    this.getShopTypeList()
+  },
+  methods: {
+     addMarker() {
+      const lng = 121.5 + Math.round(Math.random() * 1000) / 10000
+      const lat = 31.197646 + Math.round(Math.random() * 500) / 10000
+      this.markers.push([lng, lat])
+    },
+    beforeAvatarUpload(file) {
+    },
+    handleAppIndexSuccess(res, file) {
+      this.listData.appIndexImg = res.data[0]
+    },
+    handleAppListSuccess(res, file) {
+      this.listData.appListImg = res.data[0]
+    },
+    handleRemove(file, fileList) {
+      this.listData.appCarouselImg = []
+      for (let i = 0; i < fileList.length; i++) {
+        this.listData.appCarouselImg.push(fileList[i].response.data[0])
+      }
+    },
+    handleSuccessCarouselImg(response, file, fileList) { // 活动配图上传成功时回调
+      const resImg = response.data[0]
+      this.listData.appCarouselImg.push(resImg)
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    getShopTypeList() {
+      this.$store.dispatch('shopType/FetchShopTypeSelect', this.listData).then((res) => {
+        this.shopTypeList = res.data
+      }).catch(() => {
+        console.log('error ListAnnouncement')
+      })
+    },
+    onSearchResult(pois) {
+      // 搜索地图
+      let latSum = 0
+      let lngSum = 0
+      if (pois.length > 0) {
+        pois.forEach(poi => {
+          const { lng, lat } = poi
+          lngSum += lng
+          latSum += lat
+          this.markers.push([poi.lng, poi.lat])
+        })
+        const center = {
+          lng: lngSum / pois.length,
+          lat: latSum / pois.length
+        }
+        this.mapCenter = [center.lng, center.lat]
+      }
+    },
+    wangeditorValue(value) {
+      this.listData.shopIntroduction = value // 在这里接受子组件传过来的参数，赋值给data里的参数
+    },
+    submitForm(formName) { // 提交
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.addShop()
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    resetForm(formName) { // 重置
+      // 重置为未注册
+      this.isRegistered = true
+      // 重置为非户主
+      this.roleDisabled = false
+
+      console.log(this.isRegistered)
+      this.$refs[formName].resetFields()
+    },
+    addShop() {
+      // 加载框
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.$store.dispatch('shopType/AddShop', this.listData).then((res) => {
+        if (res.code === '0') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+          this.$router.push({ name: 'shop-index' })
+          loading.close()
+          return
+        }
+        this.$message.error(res.message)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+        console.log('error AddBuilding')
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+  
+.add-ruleForm{
+  width: 800px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
+</style>
+<style scoped>
+.search-box {
+  position: absolute;
+  top: 25px;
+  left: 20px;
+}
+
+.amap-page-container {
+  position: relative;
+}
+</style>

VUECODE/smart-property-manage/src/views/rental/rentalEdit.vue

@@ -0,0 +1,330 @@
+<template>
+  <div class="root">
+    <el-form ref="ruleForm" :model="listData" :rules="rules" label-width="150px" class="add-ruleForm">
+      <el-form-item label="商铺名称" prop="shopName">
+        <el-input v-model="listData.shopName"/>
+      </el-form-item>
+      <el-form-item label="商铺说明" prop="remark">
+        <el-input v-model="listData.remark"/>
+      </el-form-item>
+      <el-form-item label="app首页展示图" prop="appIndexImg">
+        <el-upload
+          class="avatar-uploader"
+          name="uploadFiles"
+          :action="uploadImgUrl"
+          :show-file-list="false"
+          :on-success="handleAppIndexSuccess"
+          :before-upload="beforeAvatarUpload">
+          <img v-if="listData.appIndexImg" :src="listData.appIndexImg" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="app列表展示图" prop="appListImg">
+        <el-upload
+          class="avatar-uploader"
+          name="uploadFiles"
+          :action="uploadImgUrl"
+          :show-file-list="false"
+          :on-success="handleAppListSuccess"
+          :before-upload="beforeAvatarUpload">
+          <img v-if="listData.appListImg" :src="listData.appListImg" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="app商铺轮播图" prop="appCarouselImg">
+        <el-upload
+          name="uploadFiles"
+          :limit="6"
+          :action="uploadImgUrl"
+          list-type="picture-card"
+          :file-list="displayAppCarouselImg"
+          :on-preview="handlePictureCardPreview"
+          :on-remove="handleRemove"
+          :on-success="handleSuccessCarouselImg">
+          <i class="el-icon-plus"></i>
+        </el-upload>
+        <el-dialog :visible.sync="dialogVisible">
+          <img width="100%" :src="dialogImageUrl" alt="">
+        </el-dialog>
+      </el-form-item>
+      <el-form-item label="权重" prop="sort">
+        <el-input v-model="listData.sort"/>
+      </el-form-item>
+      <el-form-item label="商铺类型" prop="shopTypeId">
+        <el-select v-model="listData.shopTypeId" placeholder="商铺类型" clearable class="filter-item">
+          <el-option v-for="item in shopTypeList" :key="item.id" :value="item.id" :label="item.typeName"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="上架状态" prop="shopStatus">
+        <el-select v-model="listData.shopStatus" placeholder="请选择">
+          <el-option label="已上架" value="1"/>
+          <el-option label="已下架" value="2"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="shopTel">
+        <el-input v-model="listData.shopTel"/>
+      </el-form-item>
+      <el-form-item label="商铺地址" prop="shopAddress">
+        <el-input v-model="listData.shopAddress"/>
+      </el-form-item>
+      <el-form-item label="人均消费" prop="averagePrice">
+        <el-input v-model="listData.averagePrice"/>
+      </el-form-item>
+      <el-form-item label="高德坐标">
+        <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 150px;" />
+        <el-input placeholder="纬度" v-model="listData.shopLatitude" style="width: 150px;" />
+      </el-form-item>
+      <el-form-item label="">
+         <!-- 地图 -->
+        <div style="width:100%;height:300px;" class="amap-page-container">
+          <el-amap-search-box :search-option="searchOption" :on-search-result="onSearchResult" class="search-box"/>
+          <el-amap ref="map" :events="events" :center="mapCenter" :zoom="12" class="amap-demo" vid="amapDemo">
+            <el-amap-marker v-for="(item,index) in markers" :key="index" :position="item" />
+          </el-amap>
+        </div>
+      </el-form-item>
+      <el-form-item label="商铺介绍">
+          <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
+          <div id="father">
+            <wangeditor :content="listData.shopIntroduction" @wangeditorEvent="wangeditorValue"/>
+          </div>
+        </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('ruleForm')">修改</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+import Wangeditor from '@/components/Wangeditor'
+
+export default {
+  components: { Pagination, Wangeditor },
+  data() {
+    return {
+      events: {
+        click: e => {
+          // _self.postData.Coordinate = e.lnglat.lat + ',' + e.lnglat.lng
+          this.listData.shopLongitude = e.lnglat.lng
+          this.listData.shopLatitude = e.lnglat.lat
+        }
+      },
+      listData: {
+        id: '',
+        shopName: '',
+        remark: '',
+        appIndexImg: '',
+        appListImg: '',
+        appCarouselImg: [],
+        sort: '',
+        shopTypeId: '',
+        shopStatus: '',
+        shopTel: '',
+        shopAddress: '',
+        averagePrice: '',
+        shopLongitude: '',
+        shopLatitude: '',
+        shopIntroduction: ''
+      },
+      displayAppCarouselImg: [],
+      dialogImageUrl: '',
+      dialogVisible: false,
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
+      markers: [],
+      shopTypeList: [],
+      searchOption: {
+        city: '南京',
+        citylimit: false
+      },
+      mapCenter: [118.789509, 32.019989],
+      tableKey: 0,
+      rules: {
+        typeName: [
+          { required: true, message: '请输入商铺名称', trigger: 'blur' }
+        ],
+        remark: [
+          { required: true, message: '请输入商铺说明', trigger: 'blur' }
+        ],
+        shopTel: [
+          { required: true, message: '请输入联系电话', trigger: 'blur' }
+        ],
+        shopAddress: [
+          { required: true, message: '请输入商铺地址', trigger: 'blur' }
+        ],
+        appIndexImg: [
+          { required: true, message: 'app首页展示图', trigger: 'blur' }
+        ],
+        appListImg: [
+          { required: true, message: 'app列表展示图', trigger: 'blur' }
+        ],
+        appCarouselImg: [
+          { required: true, message: 'app商铺轮播图', trigger: 'blur' }
+        ],
+      }
+    }
+  },
+  created() {
+    this.listData.id = this.$route.query.id
+    this.getById()
+    this.getShopTypeList()
+  },
+  methods: {
+     addMarker() {
+      const lng = 121.5 + Math.round(Math.random() * 1000) / 10000
+      const lat = 31.197646 + Math.round(Math.random() * 500) / 10000
+      this.markers.push([lng, lat])
+    },
+    getById() {
+      this.$store.dispatch('shopType/GetShop', this.listData.id).then((res) => {
+        const shopData = res.data
+        this.listData = shopData
+        alert(this.listData.shopIntroduction)
+        // 多张图片进行遍历
+        for (let i = 0; i < shopData.appCarouselImg.length; i++) {
+          this.displayAppCarouselImg.push({ url: shopData.appCarouselImg[i] })
+        }
+      })
+    },
+    beforeAvatarUpload(file) {
+    },
+    handleAppIndexSuccess(res, file) {
+      this.listData.appIndexImg = res.data[0]
+    },
+    handleAppListSuccess(res, file) {
+      this.listData.appListImg = res.data[0]
+    },
+    handleRemove(file, fileList) {
+      this.listData.appCarouselImg = []
+      for (let i = 0; i < fileList.length; i++) {
+        this.listData.appCarouselImg.push(fileList[i].response.data[0])
+      }
+    },
+    handleSuccessCarouselImg(response, file, fileList) { // 活动配图上传成功时回调
+      const resImg = response.data[0]
+      this.listData.appCarouselImg.push(resImg)
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    getShopTypeList() {
+      this.$store.dispatch('shopType/FetchShopTypeSelect', this.listData).then((res) => {
+        this.shopTypeList = res.data
+      }).catch(() => {
+        console.log('error ListAnnouncement')
+      })
+    },
+    onSearchResult(pois) {
+      // 搜索地图
+      let latSum = 0
+      let lngSum = 0
+      if (pois.length > 0) {
+        pois.forEach(poi => {
+          const { lng, lat } = poi
+          lngSum += lng
+          latSum += lat
+          this.markers.push([poi.lng, poi.lat])
+        })
+        const center = {
+          lng: lngSum / pois.length,
+          lat: latSum / pois.length
+        }
+        this.mapCenter = [center.lng, center.lat]
+      }
+    },
+    wangeditorValue(value) {
+      this.listData.shopIntroduction = value // 在这里接受子组件传过来的参数，赋值给data里的参数
+    },
+    submitForm(formName) { // 提交
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.updateShop()
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    resetForm(formName) { // 重置
+      // 重置为未注册
+      this.isRegistered = true
+      // 重置为非户主
+      this.roleDisabled = false
+
+      console.log(this.isRegistered)
+      this.$refs[formName].resetFields()
+    },
+    updateShop() {
+      // 加载框
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.$store.dispatch('shopType/UpdateShop', this.listData).then((res) => {
+        if (res.code === '0') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+          this.$router.push({ name: 'shop-index' })
+          loading.close()
+          return
+        }
+        this.$message.error(res.message)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+        console.log('error UpdateShop')
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+  
+.add-ruleForm{
+  width: 800px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
+</style>
+<style scoped>
+.search-box {
+  position: absolute;
+  top: 25px;
+  left: 20px;
+}
+
+.amap-page-container {
+  position: relative;
+}
+</style>

VUECODE/smart-property-manage/src/views/rental/rentalIndex.vue

@@ -0,0 +1,328 @@
+
+<template>
+  <div class="root">
+    <el-form :inline="true" :model="listQuery" class="form-listQuery">
+      <el-form-item class="filter-item" label="房间编号">
+        <el-input v-model.trim="listQuery.id" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="房间编号" />
+      </el-form-item>
+      <el-form-item class="filter-item" label="房间名称" >
+        <el-input v-model.trim="listQuery.shopName" placeholder="房间名称" />
+      </el-form-item>
+      <el-form-item class="filter-item" label="租金从" >
+        <el-input v-model.trim="listQuery.shopName" placeholder="租金从" />
+      </el-form-item>
+      <el-form-item class="filter-item" label="到" >
+        <el-input v-model.trim="listQuery.shopName" placeholder="到" />
+      </el-form-item>
+      <el-form-item class="filter-item" label="租赁方式" >
+        <el-select v-model="listQuery.shopStatus" placeholder="请选择">
+            <el-option label="整租" value="1"/>
+            <el-option label="合租" value="2"/>
+          </el-select>
+      </el-form-item>
+      <el-form-item class="filter-item" label="户型" >
+        <el-select v-model="listQuery.shopStatus" placeholder="请选择">
+            <el-option label="一室居" value="1"/>
+            <el-option label="二室居" value="2"/>
+            <el-option label="三室居" value="3"/>
+            <el-option label="四室居及以上" value="4"/>
+          </el-select>
+      </el-form-item>
+      <el-form-item class="filter-item" label="上架状态" >
+        <el-select v-model="listQuery.shopStatus" placeholder="请选择">
+            <el-option label="已上架" value="1"/>
+            <el-option label="已下架" value="2"/>
+          </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" class="filter-item" @click="handleFilter">清空</el-button>
+        <el-button type="primary" @click="search">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="button">
+      <el-button type="primary" @click="add">添加</el-button>
+      <el-button type="warning" @click="edit">修改</el-button>
+      <el-button type="danger" @click="shelfShop">上架房间</el-button>
+      <el-button type="danger" @click="obtainedShop">下架房间</el-button>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="rentalList"
+      border
+      tooltip-effect="dark"
+      style="width: 100%; margin-top: 20px;"
+      @selection-change="handleSelectionChange">
+      <el-table-column
+        type="selection"
+        width="55"/>
+      <el-table-column prop="id" label="房间编号" align="center"/>
+      <el-table-column prop="shopName" label="房间名称" align="center" >
+        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.id)">{{ scope.row.shopName }}</span></a></template>
+      </el-table-column>
+      <el-table-column prop="sort" label="权重" align="center"/>
+      <el-table-column prop="typeName" label="租金" align="center"/>
+      <el-table-column prop="shopStatus" label="上架状态" align="center">\
+        <template slot-scope="scope">
+          <span v-if="scope.row.shopStatus === '1'">已上架</span>
+          <span v-if="scope.row.shopStatus === '2'">已下架</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="shopStatus" label="租赁方式" align="center">\
+        <template slot-scope="scope">
+          <span v-if="scope.row.shopStatus === '1'">整租</span>
+          <span v-if="scope.row.shopStatus === '2'">合租</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="shopStatus" label="户型" align="center">\
+        <template slot-scope="scope">
+          <span v-if="scope.row.shopStatus === '1'">一室居</span>
+          <span v-if="scope.row.shopStatus === '2'">二室居</span>
+          <span v-if="scope.row.shopStatus === '3'">三室居</span>
+          <span v-if="scope.row.shopStatus === '4'">四室居及以上</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="updateDate" label="编辑时间" align="center" ><template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template></el-table-column>
+      <el-table-column prop="userName" label="编辑人" align="center"/>
+    </el-table>
+    <div class="block">
+      <el-pagination
+        :current-page.sync="listQuery.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size.sync="listQuery.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState, mapActions, mapMutations } from 'vuex'
+
+export default {
+  data() {
+    return {
+      listQuery: {
+        id: '',
+        shopName: '',
+        shopTypeId: '',
+        shopStatus: '',
+        pageNum: 1,
+        pageSize: 10
+      },
+      total: 0, // 数据总数
+      shopList: [],
+      shopTypeList: [],
+      deleteIds: [], // 选择的id集合
+      listLoading: true // 加载圈
+    }
+  },
+  mounted() {
+    // 获取数据
+    this.dataQuery()
+    this.getShopTypeList()
+  },
+  methods: {
+    ...mapActions('shopType', [
+      'FetchShopList',
+      'FetchShopTypeSelect'
+    ]),
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.listQuery.pageSize = val
+      this.dataQuery()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.listQuery.pageNum = val
+      this.dataQuery()
+    },
+    padDate(value) {
+      value = value < 10 ? '0' + value : value
+      return value
+    },
+    getStatus(row) { // 获取状态
+      let statusName = ''
+
+      // 判断状态
+      switch (row.status) {
+        case '0':
+          statusName = '已作废'
+          break
+        case '1':
+          statusName = '已发布'
+          break
+        case '2':
+          statusName = '草稿'
+          break
+      }
+
+      // 如果修改时间和创建时间不一致, 就显示已修改
+      if (row.status === '1' && (row.updateDate > row.createDate)) {
+        statusName = '已修改'
+      }
+
+      return statusName
+    },
+    dataQuery() { // 查询数据
+      this.listLoading = true
+      this.$store.dispatch('shopType/FetchShopList', this.listQuery).then((res) => {
+        const resData = res.data
+        this.rentalList = resData.list
+        this.total = resData.total
+        this.listLoading = false
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error ListAnnouncement')
+      })
+    },
+    getShopTypeList() {
+      this.$store.dispatch('shopType/FetchShopTypeSelect', this.listQuery).then((res) => {
+        this.shopTypeList = res.data
+      }).catch(() => {
+        console.log('error ListAnnouncement')
+      })
+    },
+    handleSelectionChange(data) {
+      // 设置为 空
+      this.deleteIds = []
+      for (let i = 0; i < data.length; i++) {
+        this.deleteIds.push(data[i].id)
+      }
+    },
+	  search() {
+      this.listQuery.pageNum = 1
+      this.dataQuery()
+    },
+    handleFilter() {
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 10
+      this.listQuery.id =''
+      this.listQuery.shopName=''
+      this.listQuery.shopTypeId=''
+      this.listQuery.shopStatus=''
+      this.dataQuery()
+    },
+    // 添加公告
+    add() {
+      this.$router.push({ name: 'shop-add' })
+    },
+    edit(){// 编辑公告
+      const ids = this.deleteIds
+      if (ids.length > 1) {
+        this.$message.error('只能选择一行数据进行修改!')
+        return
+      }
+      if (ids < 1) {
+        this.$message.error('请选择一行数据进行修改!')
+        return
+      }
+       let ide= this.deleteIds[0]
+       this.listQuery.id = ide
+       this.$router.push({ name: 'shop-edit', query: { id: ide }})
+      },
+    deleteAnnouncement(){
+       let ide= this.deleteIds[0]
+       this.listQuery.id = ide 
+      this.$store.dispatch('AnnouncementById', this.listQuery).then((res) => {
+        const resData = res.data
+        const announcement = resData.tpAnnouncement
+        const imgList = resData.studentList
+        this.listQuery.status= announcement.status
+        console.log("1",this.listQuery.status)
+        if(this.listQuery.status == 0){
+          this.$message.error('已作废不可以作废')
+          return
+        }
+        this.deleteId()     
+      })    
+    },
+    shelfShop() {
+      this.listLoading = true
+      const ids = this.deleteIds
+      if (ids < 1) {
+        this.$message.error('请至少选择一行数据上架!')
+        return
+      }
+      this.$store.dispatch('shopType/ShelfShop', ids).then((res) => {
+        this.listLoading = false
+        this.dataQuery()
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error DeleteAnnouncement')
+      })
+    },
+    obtainedShop() {
+      this.listLoading = true
+      const ids = this.deleteIds
+      if (ids < 1) {
+        this.$message.error('请至少选择一行数据下架!')
+        return
+      }
+      this.$store.dispatch('shopType/ObtainedShop', ids).then((res) => {
+        this.listLoading = false
+        this.dataQuery()
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error DeleteAnnouncement')
+      })
+    },
+    deleteId(){
+       const ids = this.deleteIds
+      this.listLoading = true
+      console.log(ids)
+      this.$store.dispatch('DeleteAnnouncement', ids).then((res) => {
+        this.listLoading = false
+        this.listQuery.announcementTitle = ''
+        this.dataQuery()
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error DeleteAnnouncement')
+      })
+    },
+
+
+    clickTitle(id) {
+      this.$router.push({ name: 'shop-edit', query: { id: id }})
+    },
+    formatDate(val) {
+      if (val === null) {
+        return ''
+      }
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = value.getMonth() + 1
+      var day = value.getDate()
+      return year + '-' + month + '-' + day
+    }
+  }
+}
+</script>
+
+<style scoped>
+.root{
+  display: flex;
+  flex-flow: column;
+}
+.form-listQuery{
+  margin-top: 20px;
+  margin-left: 30px;
+}
+.operation{
+  display: flex;
+  justify-content: space-between;
+  margin-left: 20px;
+  margin-right: 20px;
+}
+.block{
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
+}
+.button {
+  margin-left: 20px;
+}
+</style>
+

VUECODE/smart-property-manage/src/views/ticket/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="root">
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
-      <el-form-item class="filter-item" label="工单编号">
+      <el-form-item class="filter-item" label="房间编号">
         <el-input v-model.trim="listQuery.id" placeholder="工单编号" />
       </el-form-item>
       <el-form-item label="类型">