合并

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

@@ -35,23 +35,21 @@ public class BuildingController extends BaseController {
     @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:分页第几页" +
+            @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageNum",value = "pageNum:分页第几页" +
+                    "pageSize:每页长度"),
+            @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageSize",value = "pageSize:第几页" +
                     "pageSize:每页长度")
-
     })
-    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
-    @RequestMapping(value = "/buildinglist", method = RequestMethod.POST)
-    public ResponseBean buildingList(@RequestBody String parameter, HttpSession session){
-        SysUser sessionUser= getSessionUser(session);
-        ResponseBean  responseBean = iBuildingService.buildingList(parameter);
+
+    @RequestMapping(value = "/buildinglist", method = RequestMethod.GET)
+    public ResponseBean buildingList(@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize){
+        ResponseBean  responseBean = iBuildingService.buildingList(pageNum,pageSize);
         return responseBean;
     }
 
@@ -72,17 +70,31 @@ public class BuildingController extends BaseController {
 
     @ApiOperation(value = "楼盘预约", notes = "楼盘预约")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "pageNum:分页第几页" +
+            @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageNum",value = "分页第几页" +
+                    "pageSize:每页长度"),
+            @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageSize",value = "pageSize:第几页" +
                     "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){
+    @RequestMapping(value = "/appointmentlsit", method = RequestMethod.GET)
+    public ResponseBean appointmentList(@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize, HttpSession session){
 //        SysUser sessionUser= getSessionUser(session);
-        ResponseBean  responseBean = iBuildingService.appointmentList(parameter);
+        ResponseBean  responseBean = iBuildingService.appointmentList(pageNum,pageSize);
         return responseBean;
     }
 
+    @ApiOperation(value = "楼盘添加", notes = "楼盘添加")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "buildingName:楼盘名称," +
+                    "name:楼盘别名，price:价格，openingDate:开盘时间，coordinate:项目坐标，propertyType:物业类型，dynamic:最新动态，tel:电话")
+
+    })
+
+    @RequestMapping(value = "/building/add", method = RequestMethod.POST)
+    public ResponseBean buildingAdd(@RequestBody String parameter, HttpSession session){
+        ResponseBean  responseBean = iBuildingService.buildingAdd(parameter);
+        return responseBean;
+    }
 
 }

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

@@ -0,0 +1,51 @@
+package com.example.wholeestate.controller;
+
+
+import com.example.wholeestate.common.base.BaseController;
+import com.example.wholeestate.common.resp.ResponseBean;
+import com.example.wholeestate.model.BuildingDynamic;
+import com.example.wholeestate.service.IBuildingDynamicService;
+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.*;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * <p>
+ * 项目动态表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-21
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "项目动态管理API",description = "项目动态管理API")
+public class BuildingDynamicController extends BaseController {
+    @Autowired
+    private IBuildingDynamicService iBuildingDynamicService;
+    @ApiOperation(value = "项目动态管理列表", notes = "项目动态管理列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "pageNum:分页第几页" +
+                    "pageSize:每页长度")
+
+    })
+    @RequestMapping(value = "/iBuildingDynamicList", method = RequestMethod.POST)
+    public ResponseBean iBuildingDynamicList(@RequestBody String parameter, HttpSession session){
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(parameter);
+        return responseBean;
+    }
+    @RequestMapping(value = "/iBuildingDynamicSelectId/{id}", method = RequestMethod.GET)
+    @ApiOperation(value = "项目动态详情", notes = "项目动态详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass=Integer.class, name = "id", value = "项目动态id"),
+    })
+    public ResponseBean iBuildingDynamicSelectId(@PathVariable(value = "id") Integer id, HttpSession session){
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicSelectId(id);
+        return responseBean;
+    }
+}

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

@@ -2,9 +2,17 @@ package com.example.wholeestate.controller;
 
 
 import com.example.wholeestate.common.base.BaseController;
+import com.example.wholeestate.common.resp.ResponseBean;
+import com.example.wholeestate.model.SysUser;
+import com.example.wholeestate.service.ICustomerService;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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.*;
+
+import javax.servlet.http.HttpSession;
 
 /**
  * <p>
@@ -18,5 +26,30 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/")
 @Api(value = "用户 API", description = "用户 API")
 public class CustomerController extends BaseController {
+    @Autowired
+    private ICustomerService iCustomerService;
+
+    @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 = "/customerList", method = RequestMethod.POST)
+    public ResponseBean buildingList(@RequestBody String parameter, HttpSession session){
+        ResponseBean  responseBean = iCustomerService.customerList(parameter);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/customerSelectId/{id}", method = RequestMethod.GET)
+    @ApiOperation(value = "会员详情", notes = "会员详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass=Integer.class, name = "id", value = "会员id"),
+    })
+    public ResponseBean customerSelectId(@PathVariable(value = "id") Integer id, HttpSession session){
+        ResponseBean  responseBean = iCustomerService.customerSelectId(id);
+        return responseBean;
+    }
 
 }

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

@@ -0,0 +1,24 @@
+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.BuildingDynamic;
+
+/**
+ * <p>
+ * 项目动态表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-21
+ */
+public interface BuildingDynamicMapper extends BaseMapper<BuildingDynamic> {
+
+    /**
+     * 会员列列表
+     * @param page
+     * @return
+     */
+    IPage<BuildingDynamic> buildingDynamicList(Page<BuildingDynamic> page);
+}

whole-estate/src/main/java/com/example/wholeestate/dao/CustomerMapper.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.Customer;
 
 /**
@@ -13,4 +15,10 @@ import com.example.wholeestate.model.Customer;
  */
 public interface CustomerMapper extends BaseMapper<Customer> {
 
+    /**
+     * 会员列表
+     * @param page
+     * @return
+     */
+    IPage<Customer> customerList(Page<Customer> page);
 }

whole-estate/src/main/java/com/example/wholeestate/model/BuildingDynamic.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-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_building_dynamic")
+public class BuildingDynamic implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 动态ID
+     */
+    private String dynamicId;
+
+    /**
+     * 楼盘ID
+     */
+    private String buildingId;
+
+    /**
+     * 首页图片URL
+     */
+    private String imgUrl;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 发布时间
+     */
+    private LocalDateTime publishDate;
+
+    /**
+     * 描述
+     */
+    private String desc;
+
+    /**
+     * url
+     */
+    private String url;
+
+    /**
+     * 0正常，-1删除
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

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

@@ -0,0 +1,30 @@
+package com.example.wholeestate.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.example.wholeestate.common.resp.ResponseBean;
+import com.example.wholeestate.model.BuildingDynamic;
+
+/**
+ * <p>
+ * 项目动态表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-21
+ */
+public interface IBuildingDynamicService extends IService<BuildingDynamic> {
+
+    /**
+     * 项目动态管理列表
+     * @param parameter
+     * @return
+     */
+    ResponseBean iBuildingDynamicList(String parameter);
+
+    /**
+     * 项目详情
+     * @param id
+     * @return
+     */
+    ResponseBean iBuildingDynamicSelectId(Integer id);
+}

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

@@ -13,12 +13,14 @@ import com.example.wholeestate.model.Building;
  * @since 2019-03-20
  */
 public interface IBuildingService extends IService<Building> {
+
     /**
      * 楼盘列表
-     * @param parameter
+     * @param pageNum
+     * @param pageSize
      * @return
      */
-    ResponseBean buildingList(String parameter);
+    ResponseBean buildingList(Integer pageNum,Integer pageSize);
 
     /**
      * 楼盘详情
@@ -36,8 +38,15 @@ public interface IBuildingService extends IService<Building> {
 
     /**
      *
+     * @param
+     * @return
+     */
+    ResponseBean appointmentList(Integer pageNum, Integer pageSize);
+
+    /**
+     * 添加楼盘
      * @param parameter
      * @return
      */
-    ResponseBean appointmentList(String parameter);
+    ResponseBean buildingAdd(String parameter);
 }

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

@@ -14,6 +14,17 @@ import com.example.wholeestate.model.Customer;
  */
 public interface ICustomerService extends IService<Customer> {
 
+    /**
+     * 会员列表
+     * @param parameter
+     * @return
+     */
+    ResponseBean customerList(String parameter);
 
-
+    /**
+     * 会员详情
+     * @param id
+     * @return
+     */
+    ResponseBean customerSelectId(Integer id);
 }

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

@@ -0,0 +1,64 @@
+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.BuildingDynamicMapper;
+import com.example.wholeestate.model.Building;
+import com.example.wholeestate.model.BuildingDynamic;
+import com.example.wholeestate.service.IBuildingDynamicService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ * 项目动态表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-21
+ */
+@Service
+public class BuildingDynamicServiceImpl extends ServiceImpl<BuildingDynamicMapper, BuildingDynamic> implements IBuildingDynamicService {
+    @Autowired
+    private BuildingDynamicMapper buildingDynamicMapper;
+    @Override
+    public ResponseBean iBuildingDynamicList(String parameter) {
+        ResponseBean response= new ResponseBean();
+        JSONObject object= JSONObject.parseObject(parameter);
+
+        Integer pageNum = object.getInteger("pageNum");
+        Integer pageSize = object.getInteger("pageSize");
+
+        Page<BuildingDynamic> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+        IPage<BuildingDynamic> buildingDynamic= buildingDynamicMapper.buildingDynamicList(page);
+        List<BuildingDynamic> buildingDynamicList=buildingDynamic.getRecords();
+
+        HashMap hashMap= new HashMap<>();
+        hashMap.put("list",buildingDynamicList);
+        hashMap.put("total",buildingDynamic.getTotal());
+        hashMap.put("pageNum",buildingDynamic.getCurrent());
+        hashMap.put("pageSize",buildingDynamic.getSize());
+        response.addSuccess(hashMap);
+        return response;
+    }
+
+    @Override
+    public ResponseBean iBuildingDynamicSelectId(Integer id) {
+        ResponseBean response= new ResponseBean();
+        QueryWrapper<BuildingDynamic> buildingDynamic=new QueryWrapper<>();
+        buildingDynamic.lambda().eq(BuildingDynamic::getStatus,0);
+        BuildingDynamic buildingDynamicList= buildingDynamicMapper.selectOne(buildingDynamic);
+        response.addSuccess(buildingDynamicList);
+        return response;
+    }
+}

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

@@ -35,13 +35,8 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     @Autowired
     private AppointmentMapper AppointmentMapper;
     @Override
-    public ResponseBean buildingList(String parameter) {
+    public ResponseBean buildingList(Integer pageNum,Integer pageSize) {
         ResponseBean response= new ResponseBean();
-        JSONObject object= JSONObject.parseObject(parameter);
-
-        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);
@@ -87,20 +82,14 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
             return response;
         }
         building.setOpeningDate(object.getDate("openingDate"));
-        building.setCreateDate(LocalDateTime.now());
-        buildingMapper.insert(building);
+        buildingMapper.updateById(building);
         response.addSuccess("成功");
         return response;
     }
 
     @Override
-    public ResponseBean appointmentList(String parameter) {
+    public ResponseBean appointmentList(Integer pageNum,Integer pageSize) {
         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);
@@ -116,5 +105,32 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         return response;
     }
 
+    @Override
+    public ResponseBean buildingAdd(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;
+        }
+
+
 
 }

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

@@ -1,15 +1,22 @@
 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.CustomerMapper;
 
+import com.example.wholeestate.model.Building;
 import com.example.wholeestate.model.Customer;
 import com.example.wholeestate.service.ICustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -24,4 +31,36 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
     @Autowired
     private CustomerMapper customerMapper;
 
+    @Override
+    public ResponseBean customerList(String parameter) {
+        ResponseBean response= new ResponseBean();
+        JSONObject object= JSONObject.parseObject(parameter);
+
+        Integer pageNum = object.getInteger("pageNum");
+        Integer pageSize = object.getInteger("pageSize");
+
+        Page<Customer> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+        IPage<Customer> customer= customerMapper.customerList(page);
+        List<Customer> customerList=customer.getRecords();
+
+        HashMap hashMap= new HashMap<>();
+        hashMap.put("list",customerList);
+        hashMap.put("total",customer.getTotal());
+        hashMap.put("pageNum",customer.getCurrent());
+        hashMap.put("pageSize",customer.getSize());
+        response.addSuccess(hashMap);
+        return response;
+    }
+
+    @Override
+    public ResponseBean customerSelectId(Integer id) {
+        ResponseBean response= new ResponseBean();
+        QueryWrapper<Customer> customer=new QueryWrapper<>();
+        customer.lambda().eq(Customer::getStatus,0);
+        Customer customerList= customerMapper.selectOne(customer);
+        response.addSuccess(customerList);
+        return response;
+    }
 }

whole-estate/src/main/resources/mapper/BuildingDynamicMapper.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.BuildingDynamicMapper">
+    <select id="buildingDynamicList" parameterType="com.example.wholeestate.model.BuildingDynamic">
+        select * from ta_building_dynamic;
+    </select>
+
+</mapper>

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

@@ -1,5 +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.CustomerMapper">
+    <select id="customerList" resultType="com.example.wholeestate.model.Customer">
+        select * from ta_customer;
+    </select>
 
 </mapper>