合并

whole-estate/src/main/java/com/example/wholeestate/controller/BuildingController.java

@@ -11,10 +11,7 @@ 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 org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpSession;
 
@@ -32,17 +29,60 @@ import javax.servlet.http.HttpSession;
 public class BuildingController extends BaseController {
 @Autowired
     private IBuildingService iBuildingService;
-    @ApiOperation(value = "楼盘API", notes = "楼盘API")
+
+    @RequestMapping(value = "/buildingSelectId/{id}", method = RequestMethod.GET)
+    @ApiOperation(value = "楼盘详情", notes = "楼盘详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass=Integer.class, name = "id", value = "楼盘id"),
+    })
+//    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    public ResponseBean buildingSelectId(@PathVariable(value = "id") Integer id, HttpSession session){
+//    SysUser sessionUser= getSessionUser(session);
+        ResponseBean  responseBean = iBuildingService.buildingSelectId(id);
+        return responseBean;
+    }
+    @ApiOperation(value = "楼盘列表", notes = "楼盘列表")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "pageNum:分页第几页" +
                     "pageSize:每页长度")
 
     })
     @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
-    @RequestMapping(value = "/buildingList", method = RequestMethod.POST)
+    @RequestMapping(value = "/buildinglist", method = RequestMethod.POST)
     public ResponseBean buildingList(@RequestBody String parameter, HttpSession session){
-    SysUser sessionUser= getSessionUser(session);
+        SysUser sessionUser= getSessionUser(session);
         ResponseBean  responseBean = iBuildingService.buildingList(parameter);
         return responseBean;
     }
+
+    @ApiOperation(value = "楼盘修改", notes = "楼盘修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "buildingId:楼盘ID，buildingName:楼盘名称," +
+                    "name:楼盘别名，price:价格，openingDate:开盘时间，coordinate:项目坐标，propertyType:物业类型，dynamic:最新动态，tel:电话")
+
+    })
+
+//    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/building/update", method = RequestMethod.POST)
+    public ResponseBean buildingUpdate(@RequestBody String parameter, HttpSession session){
+        SysUser sessionUser= getSessionUser(session);
+        ResponseBean  responseBean = iBuildingService.buildingUpdate(parameter);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "楼盘预约", notes = "楼盘预约")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "pageNum:分页第几页" +
+                    "pageSize:每页长度")
+
+    })
+//    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/appointmentlsit", method = RequestMethod.POST)
+    public ResponseBean appointmentList(@RequestBody String parameter, HttpSession session){
+//        SysUser sessionUser= getSessionUser(session);
+        ResponseBean  responseBean = iBuildingService.appointmentList(parameter);
+        return responseBean;
+    }
+
+
 }

whole-estate/src/main/java/com/example/wholeestate/dao/AppointmentMapper.java

@@ -0,0 +1,24 @@
+package com.example.wholeestate.dao;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.wholeestate.model.Appointment;
+
+/**
+ * <p>
+ * 预约记录表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-20
+ */
+public interface AppointmentMapper extends BaseMapper<Appointment> {
+    /**
+     * 预约列表
+     * @param page
+     * @return
+     */
+    IPage<Appendable> appendableList(Page<Appendable> page);
+
+}

whole-estate/src/main/java/com/example/wholeestate/dao/BuildingMapper.java

@@ -1,6 +1,8 @@
 package com.example.wholeestate.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.wholeestate.model.Building;
 
 /**
@@ -12,5 +14,11 @@ import com.example.wholeestate.model.Building;
  * @since 2019-03-20
  */
 public interface BuildingMapper extends BaseMapper<Building> {
+    /**
+     * 楼盘列表
+     * @param page
+     * @return
+     */
+    IPage<Building> buildingList(Page page);
 
 }

whole-estate/src/main/java/com/example/wholeestate/model/Appointment.java

@@ -0,0 +1,72 @@
+package com.example.wholeestate.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-03-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_appointment")
+public class Appointment implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 预约ID
+     */
+    private String appointmentId;
+
+    /**
+     * 楼盘ID
+     */
+    private String buildingId;
+
+    /**
+     * 用户ID
+     */
+    private String customerId;
+
+    /**
+     * 预约时间
+     */
+    private String appointmentDate;
+
+    /**
+     * 姓名
+     */
+    private String customerName;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 0正常，-1删除
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

whole-estate/src/main/java/com/example/wholeestate/model/Building.java

@@ -3,6 +3,8 @@ package com.example.wholeestate.model;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -26,7 +28,7 @@ public class Building implements Serializable {
     /**
      * 楼盘ID
      */
-    private String buildingId;
+    private Integer buildingId;
 
     /**
      * 楼盘名称
@@ -46,7 +48,7 @@ public class Building implements Serializable {
     /**
      * 开盘时间
      */
-    private LocalDateTime openingDate;
+    private Date openingDate;
 
     /**
      * 项目地址

whole-estate/src/main/java/com/example/wholeestate/service/IBuildingService.java

@@ -19,4 +19,25 @@ public interface IBuildingService extends IService<Building> {
      * @return
      */
     ResponseBean buildingList(String parameter);
+
+    /**
+     * 楼盘详情
+      * @param id
+     * @return
+     */
+    ResponseBean buildingSelectId(Integer id);
+
+    /**
+     * 修改楼盘
+     * @param parameter
+     * @return
+     */
+    ResponseBean buildingUpdate(String parameter);
+
+    /**
+     *
+     * @param parameter
+     * @return
+     */
+    ResponseBean appointmentList(String parameter);
 }

whole-estate/src/main/java/com/example/wholeestate/service/impl/BuildingServiceImpl.java

@@ -1,13 +1,24 @@
 package com.example.wholeestate.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.example.wholeestate.common.resp.ResponseBean;
+import com.example.wholeestate.dao.AppointmentMapper;
 import com.example.wholeestate.dao.BuildingMapper;
 import com.example.wholeestate.model.Building;
 import com.example.wholeestate.service.IBuildingService;
+import com.fasterxml.jackson.databind.util.ArrayBuilders;
+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>
  * 楼盘表 服务实现类
@@ -18,11 +29,92 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> implements IBuildingService {
+    @Autowired
+    private BuildingMapper buildingMapper;
 
+    @Autowired
+    private AppointmentMapper AppointmentMapper;
     @Override
     public ResponseBean buildingList(String parameter) {
         ResponseBean response= new ResponseBean();
         JSONObject object= JSONObject.parseObject(parameter);
-        return null;
+
+        Integer pageNum = object.getInteger("pageNum");
+        Integer pageSize = object.getInteger("pageSize");
+
+        Page<Building> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+         IPage<Building> building= buildingMapper.buildingList(page);
+        List<Building> buildingList=building.getRecords();
+
+        HashMap hashMap= new HashMap<>();
+        hashMap.put("list",buildingList);
+        hashMap.put("total",building.getTotal());
+        hashMap.put("pageNum",building.getCurrent());
+        hashMap.put("pageSize",building.getSize());
+        response.addSuccess(hashMap);
+        return response;
     }
+
+    @Override
+    public ResponseBean buildingSelectId(Integer id) {
+        ResponseBean response= new ResponseBean();
+        QueryWrapper<Building> buildingtWrapper = new QueryWrapper<>();
+        buildingtWrapper.lambda().eq(Building::getStatus,0);
+        Building building= buildingMapper.selectOne(buildingtWrapper);
+        response.addSuccess(building);
+        return response;
+    }
+
+    @Override
+    public ResponseBean buildingUpdate(String parameter) {
+        ResponseBean response= new ResponseBean();
+
+        JSONObject object= JSONObject.parseObject(parameter);
+
+        Building building = JSONObject.parseObject(parameter,Building.class);
+        if (!"".equals(building.getBuildingId())&&null!=building.getBuildingId()){
+            response.addError("楼盘名称不能为空");
+            return response;
+        }
+        if (!"".equals(building.getPrice())&&null!=building.getPrice()){
+            response.addError("价格不能为空");
+            return response;
+        }
+        if (!"".equals(building.getOpeningDate())&&null!=building.getOpeningDate()){
+            response.addError("开盘时间");
+            return response;
+        }
+        building.setOpeningDate(object.getDate("openingDate"));
+        building.setCreateDate(LocalDateTime.now());
+        buildingMapper.insert(building);
+        response.addSuccess("成功");
+        return response;
+    }
+
+    @Override
+    public ResponseBean appointmentList(String parameter) {
+        ResponseBean response= new ResponseBean();
+        JSONObject object= JSONObject.parseObject(parameter);
+
+        Integer pageNum = object.getInteger("pageNum");
+        Integer pageSize = object.getInteger("pageSize");
+
+        Page<Appendable> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+        IPage<Appendable> building= AppointmentMapper.appendableList(page);
+        List<Appendable> buildingList=building.getRecords();
+
+        HashMap hashMap= new HashMap<>();
+        hashMap.put("list",buildingList);
+        hashMap.put("total",building.getTotal());
+        hashMap.put("pageNum",building.getCurrent());
+        hashMap.put("pageSize",building.getSize());
+        response.addSuccess(hashMap);
+        return response;
+    }
+
+
 }

whole-estate/src/main/resources/mapper/AppointmentMapper.xml

@@ -0,0 +1,8 @@
+<?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.example.wholeestate.dao.AppointmentMapper">
+
+    <select id="appendableList" resultType="com.example.wholeestate.model.Appointment">
+        SELECT * FROM ta_appointment
+    </select>
+</mapper>

whole-estate/src/main/resources/mapper/BuildingMapper.xml

@@ -1,5 +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.example.wholeestate.dao.BuildingMapper">
-
+    <select id="buildingList" resultType="com.example.wholeestate.model.Building">
+        SELECT * FROM ta_building
+    </select>
 </mapper>