house

src/main/java/com/yunzhi/marketing/interceptor/AccessInterceptor.java

@@ -253,12 +253,12 @@ public class AccessInterceptor implements HandlerInterceptor {
     private boolean inWhiteList(HttpServletRequest request) {
         String requestURI = request.getRequestURI();
 
-//        for (String it : whiteList) {
-//            if (requestURI.startsWith(it)) {
+        for (String it : whiteList) {
+            if (requestURI.startsWith(it)) {
                 return true;
-//            }
-//        }
+            }
+        }
 
-//        return false;
+        return false;
     }
 }

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

@@ -7,6 +7,8 @@ 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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +23,8 @@ import org.springframework.web.bind.annotation.*;
  * @since 2021-06-15
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
+@Api(value = "帮我找房问卷问题表", tags = "xlk-帮我找房问卷问题表")
 public class HousePropertyController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(HousePropertyController.class);
@@ -30,30 +33,10 @@ public class HousePropertyController extends BaseController {
     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;
+    @ApiOperation(value = "wx-获取帮我找房问卷问题表", notes = "admin-获取帮我找房问卷问题表")
+    @RequestMapping(value="/wx/houseProperty",method= RequestMethod.GET)
+    public ResponseBean housePropertyList(){
+        return ResponseBean.success(iHousePropertyService.list());
     }
 
     /**

src/main/java/com/yunzhi/marketing/xlk/dto/SearchHouseDTO.java

@@ -38,37 +38,163 @@ public class SearchHouseDTO 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;
 
     /**
      * 备注
      */
     private String remark;
+
+    /**
+     * 租房预算
+     */
+    private String rentHouseBudget;
+
+    /**
+     * 租房居室
+     */
+    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/entity/SearchHouse.java

@@ -1,6 +1,8 @@
 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;
@@ -25,6 +27,12 @@ public class SearchHouse implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+
     /**
      * 创建人小程序人员
      */