feat: 房源

ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HouseResourceController.java

@@ -6,7 +6,6 @@ import com.ruoyi.system.domain.house.HouseResource;
 import com.ruoyi.system.domain.house.vo.*;
 import com.ruoyi.system.service.house.HouseResourceService;
 import org.springframework.beans.BeanUtils;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -56,8 +55,8 @@ public class HouseResourceController {
         return AjaxResult.success();
     }
 
-    @GetMapping("/page")
-    public AjaxResult getPageHouseResources(HouseResourcePageQuery query) {
+    @PostMapping("/page")
+    public AjaxResult getPageHouseResources(@RequestBody HouseResourcePageQuery query) {
         if (Objects.nonNull(query.getIncomeSort()) && query.getIncomeSort().length() > 4) {
             return AjaxResult.error("<UNK>4<UNK>");
         }

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/HouseResourcePageQuery.java

@@ -79,4 +79,18 @@ public class HouseResourcePageQuery extends PageDomain {
     private Integer year;
 
     private Integer registrationPlaceFlag;
+
+    private List<AiQuery> aiQueries;
+
+    @Data
+    public static class AiQuery {
+
+        private String two;
+
+        private String three;
+
+        private String four;
+
+        private Integer wgType;
+    }
 }

ruoyi-system/src/main/resources/mapper/house/HouseResourceMapper.xml

@@ -187,6 +187,13 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="query.aiQueries != null and query.aiQueries.size() > 0">
+                and (
+                <foreach collection="query.aiQueries" item="ai" separator=" or ">
+                    (t1.two = #{ai.two} and t1.three = #{ai.three} and t1.four = #{ai.four} and t1.type = #{ai.wgType})
+                </foreach>
+                )
+            </if>
         </where>
         GROUP BY t1.id
         <if test="query.dayPriceMin != null and query.dayPriceMin != '' and query.dayPriceMax != null and query.dayPriceMax != ''">