Merge branch 'dev' into 'main'

Dev

See merge request !4

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

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.house;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.house.HouseResource;
+import com.ruoyi.system.domain.house.vo.HouseResourcePageQuery;
 import com.ruoyi.system.service.house.HouseResourceService;
 import org.springframework.web.bind.annotation.*;
 
@@ -44,4 +45,10 @@ public class HouseResourceController {
         houseResourceService.batchSaveHouseResources(houseResources);
         return AjaxResult.success();
     }
+
+    @GetMapping("/page")
+    public AjaxResult pageHouseResources(HouseResourcePageQuery query) {
+        return AjaxResult.success(houseResourceService.pageHouseResources(query));
+    }
+
 }

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

+package com.ruoyi.system.domain.house.vo;
+
+import com.ruoyi.common.core.page.PageDomain;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class HouseResourcePageQuery extends PageDomain {
+
+    private String two;
+
+    private String three;
+
+    private String four;
+
+    private String houseResourceAttribute;
+
+    private String sortWay;
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/house/HouseResourceMapper.java

 package com.ruoyi.system.mapper.house;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ruoyi.system.domain.house.HouseResource;
+import com.ruoyi.system.domain.house.vo.HouseResourcePageQuery;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -15,4 +18,6 @@ public interface HouseResourceMapper {
     void deleteHouseResourceById(String id);
 
     void batchInsertHouseResources(List<HouseResource> houseResources);
+
+    IPage<HouseResource> selectPage(IPage<HouseResource> page, @Param("query") HouseResourcePageQuery houseResourcePageQuery);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/house/HouseResourceService.java

 package com.ruoyi.system.service.house;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ruoyi.system.domain.house.HouseResource;
+import com.ruoyi.system.domain.house.vo.HouseResourcePageQuery;
 
 import java.util.List;
 
@@ -15,4 +17,6 @@ public interface HouseResourceService {
     void deleteHouseResourceById(String id);
 
     void batchSaveHouseResources(List<HouseResource> houseResources);
+
+    IPage<HouseResource> pageHouseResources(HouseResourcePageQuery query);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceServiceImpl.java

 package com.ruoyi.system.service.house.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.system.domain.house.HouseResource;
+import com.ruoyi.system.domain.house.vo.HouseResourcePageQuery;
 import com.ruoyi.system.mapper.house.HouseResourceMapper;
 import com.ruoyi.system.service.house.HouseResourceService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 
@@ -47,4 +51,9 @@ public class HouseResourceServiceImpl implements HouseResourceService {
     public void batchSaveHouseResources(List<HouseResource> houseResources) {
         houseResourceMapper.batchInsertHouseResources(houseResources);
     }
+
+    @Override
+    public IPage<HouseResource> pageHouseResources(HouseResourcePageQuery query) {
+        return houseResourceMapper.selectPage(new Page<>(query.getPageNum(), query.getPageSize()), query);
+    }
 }

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

@@ -97,4 +97,25 @@
             #{item.planeGraphUrl})
         </foreach>
     </insert>
+
+    <select id="selectPage" resultType="com.ruoyi.system.domain.house.HouseResource">
+        select * from house_resource
+        <where>
+            <if test="query.two != null and query.two != ''">
+                and two like concat('%', #{query.two}, '%')
+            </if>
+            <if test="query.three != null and query.three != ''">
+                and three like concat('%', #{query.three}, '%')
+            </if>
+            <if test="query.four != null and query.four != ''">
+                and four like concat('%', #{query.four}, '%')
+            </if>
+            <if test="query.houseResourceAttribute != null and query.houseResourceAttribute != ''">
+                and house_resource_attribute = #{query.houseResourceAttribute}
+            </if>
+            <if test="query.sortWay != null and query.sortWay != ''">
+                order by houseArea ${query.sortWay}
+            </if>
+        </where>
+    </select>
 </mapper>
\ No newline at end of file