feat: 房源

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

@@ -27,14 +27,14 @@ public class HouseResourceAssociationObjectController {
         return AjaxResult.success();
     }
 
-    @GetMapping
-    public AjaxResult getHouseResourceAssociationObjectByHouseResourceIdType(@RequestParam String houseResourceId, @RequestParam int type) {
-        return AjaxResult.success(houseResourceAssociationObjectService.queryHouseResourceAssociationObjectByHouseResourceIdType(houseResourceId, type));
-    }
-
     @DeleteMapping
     public AjaxResult deleteHouseResourceAssociationObjectById(@RequestParam String id) {
         houseResourceAssociationObjectService.deleteHouseResourceAssociationObjectById(id);
         return AjaxResult.success();
     }
+
+    @GetMapping("/detail")
+    public AjaxResult deleteHouseResourceAssociationObjectById(@RequestParam String houseResourceId, @RequestParam int type) {
+        return AjaxResult.success(houseResourceAssociationObjectService.queryHouseResourceAssociationObjectByHouseResourceIdType(houseResourceId, type));
+    }
 }

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

@@ -4,18 +4,12 @@ import com.ruoyi.system.domain.grid.GridCompany;
 import com.ruoyi.system.domain.grid.GridShop;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class HouseResourceAssociationObjectVo {
 
-    private String id;
-
-    private int type;
-
-    private String houseResourceId;
-
-    private String businessId;
-
-    private GridCompany gridCompany;
+    private List<GridCompany> gridCompanyList;
 
-    private GridShop gridShop;
+    private List<GridShop> gridShopList;
 }

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

+package com.ruoyi.system.domain.house.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class HouseResourceDetail {
+
+    private String id;
+
+    private String relationId;
+
+    private String two;
+
+    private String wgName2;
+
+    private String three;
+
+    private String four;
+
+    private String wgName4;
+
+    private int type;
+
+    private String projectId;
+
+    private String houseResourceUrl;
+
+    private List<String> houseResourceUrlList;
+
+    private String houseNumber;
+
+    private Integer houseArea;
+
+    private int houseResourceAttribute;
+
+    private String houseResourceAttributeText;
+
+    private int houseResourceType;
+
+    private String houseResourceTypeText;
+
+    private String houseResourceUse;
+
+    private String houseResourceEquity;
+
+    private String houseResourceEquityTel;
+
+    private int decorationCondition;
+
+    private String decorationConditionText;
+
+    private int orientation;
+
+    private String orientationText;
+
+    private Boolean landingHeadFlag;
+
+    private Integer commonAreaNumber;
+
+    private Integer officeNumber;
+
+    private Integer meetingNumber;
+
+    private Integer stationNumber;
+
+    private String setUp;
+
+    private String labelId;
+
+    private BigDecimal unitPrice;
+
+    private int rentalUnit;
+
+    private String rentalUnitText;
+
+    private String planeGraphUrl;
+
+    private int hireStatus;
+
+    private String hireStatusText;
+}

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

 package com.ruoyi.system.mapper.house;
 
 import com.ruoyi.system.domain.house.HouseResourceAssociationObject;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface HouseResourceAssociationObjectMapper {
 
@@ -13,4 +16,6 @@ public interface HouseResourceAssociationObjectMapper {
     void deleteHouseResourceObjectAssociationById(String id);
 
     void deleteByHouseResourceId(String houseResourceId);
+
+    List<HouseResourceAssociationObject> selectHouseResourceObjectAssociationByHouseResourceIdType(@Param("houseResourceId") String houseResourceId, @Param("type") int type);
 }

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

@@ -12,4 +12,6 @@ public interface HouseResourceAssociationObjectService {
     void updateHouseResourceAssociationObject(HouseResourceAssociationObject houseResourceAssociationObject);
 
     void deleteHouseResourceAssociationObjectById(String id);
+
+    HouseResourceAssociationObjectVo queryHouseResourceAssociationObjectByHouseResourceIdType(String houseResourceId, int type);
 }

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

@@ -2,6 +2,7 @@ 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.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;
@@ -12,7 +13,7 @@ public interface HouseResourceService {
 
     void saveHouseResource(HouseResourceSaveUpdateDto dto);
 
-    HouseResource queryHouseResourceById(String id);
+    HouseResourceDetail queryHouseResourceById(String id);
 
     void updateHouseResource(HouseResourceSaveUpdateDto dto);
 

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

@@ -47,4 +47,27 @@ public class HouseResourceAssociationObjectServiceImpl implements HouseResourceA
     public void deleteHouseResourceAssociationObjectById(String id) {
         houseResourceAssociationObjectMapper.deleteHouseResourceObjectAssociationById(id);
     }
+
+    @Override
+    public HouseResourceAssociationObjectVo queryHouseResourceAssociationObjectByHouseResourceIdType(String houseResourceId, int type) {
+        List<HouseResourceAssociationObject> houseResourceAssociationObject = houseResourceAssociationObjectMapper.selectHouseResourceObjectAssociationByHouseResourceIdType(houseResourceId, type);
+        if (Objects.isNull(houseResourceAssociationObject)) {
+            return null;
+        }
+        List<GridCompany> gridCompanyList = new ArrayList<>();
+        List<GridShop> gridShopList = new ArrayList<>();
+        HouseResourceAssociationObjectVo houseResourceAssociationObjectVo = new HouseResourceAssociationObjectVo();
+        for (HouseResourceAssociationObject resourceAssociationObject : houseResourceAssociationObject) {
+            if (resourceAssociationObject.getType() == 1) {
+                GridCompany gridCompany = gridCompanyMapper.selectByPrimaryKey(resourceAssociationObject.getBusinessId());
+                gridCompanyList.add(gridCompany);
+            } else if (resourceAssociationObject.getType() == 2) {
+                GridShop gridShop = gridShopMapper.selectByPrimaryKey(Long.parseLong(resourceAssociationObject.getBusinessId()));
+                gridShopList.add(gridShop);
+            }
+        }
+        houseResourceAssociationObjectVo.setGridCompanyList(gridCompanyList);
+        houseResourceAssociationObjectVo.setGridShopList(gridShopList);
+        return houseResourceAssociationObjectVo;
+    }
 }

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

@@ -10,6 +10,7 @@ import com.ruoyi.system.domain.grid.GridShop;
 import com.ruoyi.system.domain.house.HouseResource;
 import com.ruoyi.system.domain.house.HouseResourceAssociationObject;
 import com.ruoyi.system.domain.house.enums.HouseEnums;
+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;
@@ -19,6 +20,7 @@ import com.ruoyi.system.mapper.house.HouseResourceMapper;
 import com.ruoyi.system.service.grid.GridCompanyService;
 import com.ruoyi.system.service.grid.GridShopService;
 import com.ruoyi.system.service.house.HouseResourceService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -85,8 +87,29 @@ public class HouseResourceServiceImpl implements HouseResourceService {
     }
 
     @Override
-    public HouseResource queryHouseResourceById(String id) {
-        return houseResourceMapper.selectHouseResourceById(id);
+    public HouseResourceDetail queryHouseResourceById(String id) {
+        HouseResource houseResource = houseResourceMapper.selectHouseResourceById(id);
+        if (houseResource == null) {
+            return null;
+        }
+        HouseResourceDetail houseResourceDetail = new HouseResourceDetail();
+        BeanUtils.copyProperties(houseResource, houseResourceDetail);
+        GridRegionExample gridRegionExample = new GridRegionExample();
+        gridRegionExample.createCriteria().andWgCodeEqualTo(houseResourceDetail.getTwo()).andWgTypeEqualTo(String.valueOf(houseResourceDetail.getType()));
+        List<GridRegion> two = gridRegionMapper.selectByExample(gridRegionExample);
+        if (!two.isEmpty()) {
+            houseResourceDetail.setWgName2(two.get(0).getWgName());
+        }
+        if (StringUtils.hasText(houseResourceDetail.getHouseResourceUrl())) {
+            houseResourceDetail.setHouseResourceUrlList(Arrays.asList(houseResourceDetail.getHouseResourceUrl().split(",")));
+        }
+        houseResourceDetail.setHouseResourceAttributeText(HouseEnums.HouseResourceAttributeEnum.getDescByCode(houseResourceDetail.getHouseResourceAttribute()));
+        houseResourceDetail.setHouseResourceTypeText(HouseEnums.HouseResourceTypeEnum.getDescByCode(houseResourceDetail.getHouseResourceType()));
+        houseResourceDetail.setOrientationText(HouseEnums.OrientationEnum.getDescByCode(houseResourceDetail.getOrientation()));
+        houseResourceDetail.setDecorationConditionText(HouseEnums.DecorationConditionEnum.getDescByCode(houseResourceDetail.getDecorationCondition()));
+        houseResourceDetail.setRentalUnitText(HouseEnums.RentalUnitEnum.getDescByCode(houseResourceDetail.getRentalUnit()));
+        houseResourceDetail.setHireStatusText(HouseEnums.hireStatusTextEnum.getDescByCode(houseResourceDetail.getHireStatus()));
+        return houseResourceDetail;
     }
 
     @Override

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

@@ -38,4 +38,9 @@
         DELETE FROM house_resource_association_object
         WHERE house_resource_id = #{houseResourceId}
     </delete>
+
+    <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>
 </mapper>
\ No newline at end of file