Merge branch 'refs/heads/main' into dev-lb

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

@@ -34,7 +34,7 @@ public class HouseResourceAssociationObjectController {
     }
 
     @GetMapping("/detail")
-    public AjaxResult deleteHouseResourceAssociationObjectById(@RequestParam String houseResourceId, @RequestParam int type) {
-        return AjaxResult.success(houseResourceAssociationObjectService.queryHouseResourceAssociationObjectByHouseResourceIdType(houseResourceId, type));
+    public AjaxResult getHouseResourceAssociationObjectDetail(@RequestParam String houseResourceId) {
+        return AjaxResult.success(houseResourceAssociationObjectService.queryHouseResourceAssociationObjectByHouseResourceIdType(houseResourceId));
     }
 }

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

@@ -48,6 +48,8 @@ public class HouseResourceDetail {
 
     private String houseResourceEquityTel;
 
+    private String ownership;
+
     private int decorationCondition;
 
     private String decorationConditionText;

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

@@ -48,6 +48,8 @@ public class HouseResourcePage {
 
     private String houseResourceEquityTel;
 
+    private String ownership;
+
     private int decorationCondition;
 
     private String decorationConditionText;

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

@@ -17,5 +17,5 @@ public interface HouseResourceAssociationObjectMapper {
 
     void deleteByHouseResourceId(String houseResourceId);
 
-    List<HouseResourceAssociationObject> selectHouseResourceObjectAssociationByHouseResourceIdType(@Param("houseResourceId") String houseResourceId, @Param("type") int type);
+    List<HouseResourceAssociationObject> selectHouseResourceObjectAssociationByHouseResourceIdType(@Param("houseResourceId") String houseResourceId);
 }

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

@@ -13,5 +13,5 @@ public interface HouseResourceAssociationObjectService {
 
     void deleteHouseResourceAssociationObjectById(String id);
 
-    HouseResourceAssociationObjectVo queryHouseResourceAssociationObjectByHouseResourceIdType(String houseResourceId, int type);
+    HouseResourceAssociationObjectVo queryHouseResourceAssociationObjectByHouseResourceIdType(String houseResourceId);
 }

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

@@ -11,6 +11,7 @@ import com.ruoyi.system.service.house.HouseResourceAssociationObjectService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 
@@ -49,10 +50,10 @@ public class HouseResourceAssociationObjectServiceImpl implements HouseResourceA
     }
 
     @Override
-    public HouseResourceAssociationObjectVo queryHouseResourceAssociationObjectByHouseResourceIdType(String houseResourceId, int type) {
-        List<HouseResourceAssociationObject> houseResourceAssociationObject = houseResourceAssociationObjectMapper.selectHouseResourceObjectAssociationByHouseResourceIdType(houseResourceId, type);
-        if (Objects.isNull(houseResourceAssociationObject)) {
-            return null;
+    public HouseResourceAssociationObjectVo queryHouseResourceAssociationObjectByHouseResourceIdType(String houseResourceId) {
+        List<HouseResourceAssociationObject> houseResourceAssociationObject = houseResourceAssociationObjectMapper.selectHouseResourceObjectAssociationByHouseResourceIdType(houseResourceId);
+        if (CollectionUtils.isEmpty(houseResourceAssociationObject)) {
+            return new HouseResourceAssociationObjectVo();
         }
         List<GridCompany> gridCompanyList = new ArrayList<>();
         List<GridShop> gridShopList = new ArrayList<>();

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

@@ -14,9 +14,12 @@ import com.ruoyi.system.domain.house.vo.HouseResourceDetail;
 import com.ruoyi.system.domain.house.vo.HouseResourcePage;
 import com.ruoyi.system.domain.house.vo.HouseResourcePageQuery;
 import com.ruoyi.system.domain.house.vo.HouseResourceSaveUpdateDto;
+import com.ruoyi.system.domain.other.Labels;
+import com.ruoyi.system.domain.other.LabelsExample;
 import com.ruoyi.system.mapper.grid.GridRegionMapper;
 import com.ruoyi.system.mapper.house.HouseResourceAssociationObjectMapper;
 import com.ruoyi.system.mapper.house.HouseResourceMapper;
+import com.ruoyi.system.mapper.other.LabelsMapper;
 import com.ruoyi.system.service.grid.GridCompanyService;
 import com.ruoyi.system.service.grid.GridShopService;
 import com.ruoyi.system.service.house.HouseResourceService;
@@ -26,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class HouseResourceServiceImpl implements HouseResourceService {
@@ -40,12 +44,15 @@ public class HouseResourceServiceImpl implements HouseResourceService {
 
     private final GridShopService gridShopService;
 
-    public HouseResourceServiceImpl(HouseResourceMapper houseResourceMapper, HouseResourceAssociationObjectMapper houseResourceAssociationObjectMapper, GridRegionMapper gridRegionMapper, GridCompanyService gridCompanyService, GridShopService gridShopService) {
+    private final LabelsMapper labelsMapper;
+
+    public HouseResourceServiceImpl(HouseResourceMapper houseResourceMapper, HouseResourceAssociationObjectMapper houseResourceAssociationObjectMapper, GridRegionMapper gridRegionMapper, GridCompanyService gridCompanyService, GridShopService gridShopService, LabelsMapper labelsMapper) {
         this.houseResourceMapper = houseResourceMapper;
         this.houseResourceAssociationObjectMapper = houseResourceAssociationObjectMapper;
         this.gridRegionMapper = gridRegionMapper;
         this.gridCompanyService = gridCompanyService;
         this.gridShopService = gridShopService;
+        this.labelsMapper = labelsMapper;
     }
 
     @Override

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

@@ -41,6 +41,6 @@
 
     <select id="selectHouseResourceObjectAssociationByHouseResourceIdType"
             resultType="com.ruoyi.system.domain.house.HouseResourceAssociationObject">
-        SELECT id, type, house_resource_id, business_id  WHERE house_resource_id = #{houseResourceId} and type = #{type}
+        SELECT id, type, house_resource_id, business_id from house_resource_association_object  WHERE house_resource_id = #{houseResourceId}
     </select>
 </mapper>
\ No newline at end of file