新需求基础代码

src/main/java/com/huiju/estateagents/controller/TaHouseSalesController.java → src/main/java/com/huiju/estateagents/controller/TaBuildingRoomController.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.entity.TaHouseSales;
-import com.huiju.estateagents.service.ITaHouseSalesService;
+import com.huiju.estateagents.entity.TaBuildingRoom;
+import com.huiju.estateagents.service.ITaBuildingRoomService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
-    * 房源与销售批次表  前端控制器
+    * 房间表  前端控制器
     * </p>
  *
  * @author jobob
@@ -22,12 +22,12 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("/")
-public class TaHouseSalesController extends BaseController {
+public class TaBuildingRoomController extends BaseController {
 
-    private final Logger logger = LoggerFactory.getLogger(TaHouseSalesController.class);
+    private final Logger logger = LoggerFactory.getLogger(TaBuildingRoomController.class);
 
     @Autowired
-    public ITaHouseSalesService iTaHouseSalesService;
+    public ITaBuildingRoomService iTaBuildingRoomService;
 
 
     /**
@@ -36,21 +36,21 @@ public class TaHouseSalesController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taHouseSales",method= RequestMethod.GET)
-    public ResponseBean taHouseSalesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value="/taBuildingRoom",method= RequestMethod.GET)
+    public ResponseBean taBuildingRoomList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaHouseSales> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaHouseSales> queryWrapper = new QueryWrapper<>();
+		    IPage<TaBuildingRoom> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaBuildingRoom> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
 
-            IPage<TaHouseSales> result = iTaHouseSalesService.page(pg, queryWrapper);
+            IPage<TaBuildingRoom> result = iTaBuildingRoomService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
-            logger.error("taHouseSalesList -=- {}",e.toString());
+            logger.error("taBuildingRoomList -=- {}",e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -58,21 +58,21 @@ public class TaHouseSalesController extends BaseController {
 
     /**
      * 保存对象
-     * @param taHouseSales 实体对象
+     * @param taBuildingRoom 实体对象
      * @return
      */
-    @RequestMapping(value="/taHouseSales",method= RequestMethod.POST)
-    public ResponseBean taHouseSalesAdd(@RequestBody TaHouseSales taHouseSales){
+    @RequestMapping(value="/taBuildingRoom",method= RequestMethod.POST)
+    public ResponseBean taBuildingRoomAdd(@RequestBody TaBuildingRoom taBuildingRoom){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaHouseSalesService.save(taHouseSales)){
-                responseBean.addSuccess(taHouseSales);
+            if (iTaBuildingRoomService.save(taBuildingRoom)){
+                responseBean.addSuccess(taBuildingRoom);
             }else {
                 responseBean.addError("fail");
             }
         }catch (Exception e){
             e.printStackTrace();
-            logger.error("taHouseSalesAdd -=- {}",e.toString());
+            logger.error("taBuildingRoomAdd -=- {}",e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -83,18 +83,18 @@ public class TaHouseSalesController extends BaseController {
      * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taHouseSales/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taHouseSalesDelete(@PathVariable Integer id){
+    @RequestMapping(value="/taBuildingRoom/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taBuildingRoomDelete(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaHouseSalesService.removeById(id)){
+            if(iTaBuildingRoomService.removeById(id)){
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");
             }
         }catch (Exception e){
             e.printStackTrace();
-            logger.error("taHouseSalesDelete -=- {}",e.toString());
+            logger.error("taBuildingRoomDelete -=- {}",e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -103,22 +103,22 @@ public class TaHouseSalesController extends BaseController {
     /**
      * 修改对象
      * @param id  实体ID
-     * @param taHouseSales 实体对象
+     * @param taBuildingRoom 实体对象
      * @return
      */
-    @RequestMapping(value="/taHouseSales/{id}",method= RequestMethod.PUT)
-    public ResponseBean taHouseSalesUpdate(@PathVariable Integer id,
-                                           @RequestBody TaHouseSales taHouseSales){
+    @RequestMapping(value="/taBuildingRoom/{id}",method= RequestMethod.PUT)
+    public ResponseBean taBuildingRoomUpdate(@PathVariable Integer id,
+                                             @RequestBody TaBuildingRoom taBuildingRoom){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaHouseSalesService.updateById(taHouseSales)){
-                responseBean.addSuccess(taHouseSales);
+            if (iTaBuildingRoomService.updateById(taBuildingRoom)){
+                responseBean.addSuccess(taBuildingRoom);
             }else {
                 responseBean.addError("fail");
             }
         }catch (Exception e){
             e.printStackTrace();
-            logger.error("taHouseSalesUpdate -=- {}",e.toString());
+            logger.error("taBuildingRoomUpdate -=- {}",e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -128,14 +128,14 @@ public class TaHouseSalesController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taHouseSales/{id}",method= RequestMethod.GET)
-    public ResponseBean taHouseSalesGet(@PathVariable Integer id){
+    @RequestMapping(value="/taBuildingRoom/{id}",method= RequestMethod.GET)
+    public ResponseBean taBuildingRoomGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaHouseSalesService.getById(id));
+            responseBean.addSuccess(iTaBuildingRoomService.getById(id));
         }catch (Exception e){
             e.printStackTrace();
-            logger.error("taHouseSalesDelete -=- {}",e.toString());
+            logger.error("taBuildingRoomDelete -=- {}",e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

src/main/java/com/huiju/estateagents/entity/TaHouseSales.java → src/main/java/com/huiju/estateagents/entity/TaBuildingRoom.java

@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
 
 /**
  * <p>
- * 房源与销售批次表 
+ * 房间表 
  * </p>
  *
  * @author jobob
@@ -20,35 +20,60 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class TaHouseSales implements Serializable {
+public class TaBuildingRoom implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-     * 房源与销售批次表
+     * 房间id
      */
-    @TableId(value = "house_sales_id", type = IdType.AUTO)
-    private Integer houseSalesId;
+    @TableId(value = "room_id", type = IdType.AUTO)
+    private Integer roomId;
 
     /**
-     * 销售批次id
+     * 楼盘id
      */
-    private Integer salesBatchId;
+    private String buildingId;
 
     /**
-     * 房源id
+     * 楼栋 与楼盘区分
      */
-    private Integer houseId;
+    private Integer blockId;
 
     /**
-     * 创建时间
+     * 单元id
      */
-    private LocalDateTime createDate;
+    private Integer unitId;
+
+    /**
+     * 层id
+     */
+    private Integer floorId;
+
+    /**
+     * 房间名称
+     */
+    private String roomName;
+
+    /**
+     * 状态
+     */
+    private String status;
 
     /**
      * 公司id
      */
     private Integer orgId;
 
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新时间
+     */
+    private String updateDate;
+
 
 }

src/main/java/com/huiju/estateagents/entity/TaHousingResources.java

@@ -39,17 +39,22 @@ public class TaHousingResources implements Serializable {
     /**
      * 楼栋 与楼盘区分
      */
-    private String blockId;
+    private Integer blockId;
 
     /**
      * 楼栋名称
      */
     private String blockName;
 
+    /**
+     * 销售批次id
+     */
+    private String salesBatchId;
+
     /**
      * 单元id
      */
-    private String unitId;
+    private Integer unitId;
 
     /**
      * 单元名称
@@ -59,7 +64,7 @@ public class TaHousingResources implements Serializable {
     /**
      * 层id
      */
-    private String floorId;
+    private Integer floorId;
 
     /**
      * 楼层名称
@@ -67,9 +72,14 @@ public class TaHousingResources implements Serializable {
     private String floorName;
 
     /**
-     * 房号
+     * 房号id
+     */
+    private String roomId;
+
+    /**
+     * 房间名称
      */
-    private String roomNumber;
+    private String roomName;
 
     /**
      * 价格

src/main/java/com/huiju/estateagents/mapper/TaHouseSalesMapper.java → src/main/java/com/huiju/estateagents/mapper/TaBuildingRoomMapper.java

@@ -1,18 +1,18 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huiju.estateagents.entity.TaHouseSales;
+import com.huiju.estateagents.entity.TaBuildingRoom;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
- * 房源与销售批次表  Mapper 接口
+ * 房间表  Mapper 接口
  * </p>
  *
  * @author jobob
  * @since 2020-02-10
  */
 @Mapper
-public interface TaHouseSalesMapper extends BaseMapper<TaHouseSales> {
+public interface TaBuildingRoomMapper extends BaseMapper<TaBuildingRoom> {
 
 }

src/main/java/com/huiju/estateagents/service/ITaHouseSalesService.java → src/main/java/com/huiju/estateagents/service/ITaBuildingRoomService.java

@@ -1,16 +1,16 @@
 package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huiju.estateagents.entity.TaHouseSales;
+import com.huiju.estateagents.entity.TaBuildingRoom;
 
 /**
  * <p>
- * 房源与销售批次表  服务类
+ * 房间表  服务类
  * </p>
  *
  * @author jobob
  * @since 2020-02-10
  */
-public interface ITaHouseSalesService extends IService<TaHouseSales> {
+public interface ITaBuildingRoomService extends IService<TaBuildingRoom> {
 
 }

src/main/java/com/huiju/estateagents/service/impl/TaBuildingRoomServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaBuildingRoom;
+import com.huiju.estateagents.mapper.TaBuildingRoomMapper;
+import com.huiju.estateagents.service.ITaBuildingRoomService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 房间表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-10
+ */
+@Service
+public class TaBuildingRoomServiceImpl extends ServiceImpl<TaBuildingRoomMapper, TaBuildingRoom> implements ITaBuildingRoomService {
+
+}

src/main/java/com/huiju/estateagents/service/impl/TaHouseSalesServiceImpl.java

@@ -1,20 +0,0 @@
-package com.huiju.estateagents.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huiju.estateagents.entity.TaHouseSales;
-import com.huiju.estateagents.mapper.TaHouseSalesMapper;
-import com.huiju.estateagents.service.ITaHouseSalesService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 房源与销售批次表  服务实现类
- * </p>
- *
- * @author jobob
- * @since 2020-02-10
- */
-@Service
-public class TaHouseSalesServiceImpl extends ServiceImpl<TaHouseSalesMapper, TaHouseSales> implements ITaHouseSalesService {
-
-}

src/main/resources/mapper/TaHouseSalesMapper.xml → src/main/resources/mapper/TaBuildingRoomMapper.xml

@@ -1,5 +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.huiju.estateagents.mapper.TaHouseSalesMapper">
+<mapper namespace="com.huiju.estateagents.mapper.TaBuildingRoomMapper">
 
 </mapper>