house

src/main/java/com/yunzhi/marketing/xlk/controller/HousePropertyController.java

@@ -0,0 +1,143 @@
+package com.yunzhi.marketing.xlk.controller;
+
+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.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.xlk.entity.HouseProperty;
+import com.yunzhi.marketing.xlk.service.IHousePropertyService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 帮我找房基本属性表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2021-06-15
+ */
+@RestController
+@RequestMapping("/")
+public class HousePropertyController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(HousePropertyController.class);
+
+    @Autowired
+    public IHousePropertyService iHousePropertyService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/houseProperty",method= RequestMethod.GET)
+    public ResponseBean housePropertyList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<HouseProperty> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<HouseProperty> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<HouseProperty> result = iHousePropertyService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("housePropertyList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param houseProperty 实体对象
+     * @return
+     */
+    @RequestMapping(value="/houseProperty",method= RequestMethod.POST)
+    public ResponseBean housePropertyAdd(@RequestBody HouseProperty houseProperty){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iHousePropertyService.save(houseProperty)){
+                responseBean.addSuccess(houseProperty);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("housePropertyAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/houseProperty/{id}", method= RequestMethod.DELETE)
+    public ResponseBean housePropertyDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iHousePropertyService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("housePropertyDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param houseProperty 实体对象
+     * @return
+     */
+    @RequestMapping(value="/houseProperty/{id}",method= RequestMethod.PUT)
+    public ResponseBean housePropertyUpdate(@PathVariable Integer id,
+                                        @RequestBody HouseProperty houseProperty){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iHousePropertyService.updateById(houseProperty)){
+                responseBean.addSuccess(houseProperty);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("housePropertyUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/houseProperty/{id}",method= RequestMethod.GET)
+    public ResponseBean housePropertyGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iHousePropertyService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("housePropertyDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/yunzhi/marketing/xlk/entity/HouseProperty.java

@@ -0,0 +1,42 @@
+package com.yunzhi.marketing.xlk.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 帮我找房基本属性表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-06-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_house_property")
+public class HouseProperty implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 属性
+     */
+    private String kind;
+
+    /**
+     * 属性值
+     */
+    private String propertyValue;
+
+    /**
+     * 属性名称
+     */
+    private String propertyName;
+
+
+}

src/main/java/com/yunzhi/marketing/xlk/entity/SearchHouse.java

@@ -1,8 +1,6 @@
 package com.yunzhi.marketing.xlk.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -17,7 +15,7 @@ import java.time.LocalDateTime;
  * </p>
  *
  * @author jobob
- * @since 2021-05-19
+ * @since 2021-06-15
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -27,12 +25,6 @@ public class SearchHouse implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 主键
-     */
-    @TableId(type = IdType.UUID)
-    private String id;
-
     /**
      * 创建人小程序人员
      */
@@ -73,34 +65,69 @@ public class SearchHouse implements Serializable {
     private String intentBuilding;
 
     /**
-     * 最小面积
+     * 总预算范围最小价格
      */
-    private String minArea;
+    private String minPrice;
 
     /**
-     * 最大面积
+     * 总预算范围最大价格
      */
-    private String maxArea;
+    private String maxPrice;
 
     /**
-     * 最小户型
+     * 首套还是二套
      */
-    private String minHouseType;
+    private String houseNumber;
 
     /**
-     * 最大户型
+     * 0待回访，1已回访，2无效
      */
-    private String maxHouseType;
+    private String status;
 
     /**
-     * 最小价格
+     * 审核结果
      */
-    private String minPrice;
+    private String auditRemark;
 
     /**
-     * 最大价格
+     * 帮我找房类型 1买房2租房3海外置业4增值服务
      */
-    private String maxPrice;
+    private Integer type;
+
+    /**
+     * 房屋属性
+     */
+    private String houseAttribute;
+
+    /**
+     * 居室要求
+     */
+    private String housetRoomType;
+
+    /**
+     * 面积要求
+     */
+    private String houseArea;
+
+    /**
+     * 价格要求
+     */
+    private String housePrice;
+
+    /**
+     * 偏好设置
+     */
+    private String housePreference;
+
+    /**
+     * 购房目的
+     */
+    private String housePurpose;
+
+    /**
+     * 购房时间
+     */
+    private String houseTime;
 
     /**
      * 备注
@@ -108,14 +135,94 @@ public class SearchHouse implements Serializable {
     private String remark;
 
     /**
-     * 0待回访，1已回访，2无效
+     * 租房预算
      */
-    private String status = "0";
+    private String rentHouseBudget;
 
     /**
-     * 审核结果
+     * 租房居室
      */
-    private String auditRemark;
+    private String rentHousetRoomType;
+
+    /**
+     * 租房地址
+     */
+    private String rentHouseCity;
+
+    /**
+     * 租房要求
+     */
+    private String rentHouseDemand;
+
+    /**
+     * 海外城市
+     */
+    private String overseasHouseCity;
+
+    /**
+     * 海外房子预算
+     */
+    private String overseasHouseBudget;
+
+    /**
+     * 海外房屋类型
+     */
+    private String overseasHouseType;
+
+    /**
+     * 海外购房目的
+     */
+    private String overseasHousePurpose;
+
+    /**
+     * 装修预算
+     */
+    private String fitmentBudget;
+
+    /**
+     * 房屋现状
+     */
+    private String fitmentHousePresent;
+
+    /**
+     * 家装模式
+     */
+    private String fitmentMode;
+
+    /**
+     * 看中的家装的方面
+     */
+    private String fitmentFactor;
+
+    /**
+     * 家装风格
+     */
+    private String fitmentStyle;
+
+    /**
+     * 家装诉求
+     */
+    private String fitmentAppeal;
+
+    /**
+     * 家装特殊区域
+     */
+    private String fitmentSpecialArea;
+
+    /**
+     * 智能家居
+     */
+    private String fitmentIntelligent;
+
+    /**
+     * 租房偏好
+     */
+    private String rentHousePreference;
+
+    /**
+     * 装修面积
+     */
+    private String fitmentArea;
 
 
 }

src/main/java/com/yunzhi/marketing/xlk/mapper/HousePropertyMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.marketing.xlk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.marketing.xlk.entity.HouseProperty;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 帮我找房基本属性表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-06-15
+ */
+@Mapper
+public interface HousePropertyMapper extends BaseMapper<HouseProperty> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/service/IHousePropertyService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.marketing.xlk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.marketing.xlk.entity.HouseProperty;
+
+/**
+ * <p>
+ * 帮我找房基本属性表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-06-15
+ */
+public interface IHousePropertyService extends IService<HouseProperty> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/service/impl/HousePropertyServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yunzhi.marketing.xlk.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.marketing.xlk.entity.HouseProperty;
+import com.yunzhi.marketing.xlk.mapper.HousePropertyMapper;
+import com.yunzhi.marketing.xlk.service.IHousePropertyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 帮我找房基本属性表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-06-15
+ */
+@Service
+public class HousePropertyServiceImpl extends ServiceImpl<HousePropertyMapper, HouseProperty> implements IHousePropertyService {
+
+}

src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8081
 spring:
   application:
     name: marketing-cloud

src/main/resources/mapper/xlk/HousePropertyMapper.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.yunzhi.marketing.xlk.mapper.HousePropertyMapper">
+
+</mapper>