Merge branch 'dev' into 'main'

Dev

See merge request !19

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

@@ -3,6 +3,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.domain.house.vo.HouseResourceSaveDto;
 import com.ruoyi.system.service.house.HouseResourceService;
 import org.springframework.web.bind.annotation.*;
 
@@ -19,8 +20,8 @@ public class HouseResourceController {
     }
 
     @PostMapping
-    public void saveHouseResource(@RequestBody HouseResource houseResource) {
-        houseResourceService.saveHouseResource(houseResource);
+    public void saveHouseResource(@RequestBody HouseResourceSaveDto dto) {
+        houseResourceService.saveHouseResource(dto);
     }
 
     @GetMapping

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

+package com.ruoyi.system.domain.house.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class HouseResourcePage {
+
+    private String id;
+
+    private String relationId;
+
+    private String two;
+
+    private String three;
+
+    private String four;
+
+    private int type;
+
+    private String projectId;
+
+    private String houseResourceUrl;
+
+    private List<String> houseResourceUrlList;
+
+    private String houseNumber;
+
+    private Integer houseArea;
+
+    private String houseResourceAttribute;
+
+    private String houseResourceType;
+
+    private String houseResourceUse;
+
+    private String houseResourceEquity;
+
+    private String houseResourceEquityTel;
+
+    private String decorationCondition;
+
+    private String orientation;
+
+    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 String planeGraphUrl;
+}

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

+package com.ruoyi.system.domain.house.vo;
+
+import com.ruoyi.system.domain.house.HouseResource;
+import com.ruoyi.system.domain.house.HouseResourceAssociationObject;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class HouseResourceSaveDto {
+
+    private HouseResource houseResource;
+
+    private List<HouseResourceAssociationObject> houseResourceAssociationObjects;
+}

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

@@ -2,6 +2,7 @@ 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.HouseResourcePage;
 import com.ruoyi.system.domain.house.vo.HouseResourcePageQuery;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,5 +20,5 @@ public interface HouseResourceMapper {
 
     void batchInsertHouseResources(List<HouseResource> houseResources);
 
-    IPage<HouseResource> selectPage(IPage<HouseResource> page, @Param("query") HouseResourcePageQuery houseResourcePageQuery);
+    IPage<HouseResourcePage> selectPage(IPage<HouseResource> page, @Param("query") HouseResourcePageQuery houseResourcePageQuery);
 }

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

@@ -2,13 +2,15 @@ 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.HouseResourcePage;
 import com.ruoyi.system.domain.house.vo.HouseResourcePageQuery;
+import com.ruoyi.system.domain.house.vo.HouseResourceSaveDto;
 
 import java.util.List;
 
 public interface HouseResourceService {
 
-    void saveHouseResource(HouseResource houseResource);
+    void saveHouseResource(HouseResourceSaveDto dto);
 
     HouseResource queryHouseResourceById(String id);
 
@@ -18,5 +20,5 @@ public interface HouseResourceService {
 
     void batchSaveHouseResources(List<HouseResource> houseResources);
 
-    IPage<HouseResource> pageHouseResources(HouseResourcePageQuery query);
+    IPage<HouseResourcePage> pageHouseResources(HouseResourcePageQuery query);
 }

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

@@ -3,13 +3,16 @@ 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.HouseResourcePage;
 import com.ruoyi.system.domain.house.vo.HouseResourcePageQuery;
+import com.ruoyi.system.domain.house.vo.HouseResourceSaveDto;
+import com.ruoyi.system.mapper.house.HouseResourceAssociationObjectMapper;
 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.Arrays;
 import java.util.List;
 import java.util.UUID;
 
@@ -18,15 +21,25 @@ public class HouseResourceServiceImpl implements HouseResourceService {
 
     private final HouseResourceMapper houseResourceMapper;
 
-    public HouseResourceServiceImpl(HouseResourceMapper houseResourceMapper) {
+    private final HouseResourceAssociationObjectMapper houseResourceAssociationObjectMapper;
+
+    public HouseResourceServiceImpl(HouseResourceMapper houseResourceMapper, HouseResourceAssociationObjectMapper houseResourceAssociationObjectMapper) {
         this.houseResourceMapper = houseResourceMapper;
+        this.houseResourceAssociationObjectMapper = houseResourceAssociationObjectMapper;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void saveHouseResource(HouseResource houseResource) {
-        houseResource.setId(UUID.randomUUID().toString().replaceAll("-", ""));
-        houseResourceMapper.insertHouseResource(houseResource);
+    public void saveHouseResource(HouseResourceSaveDto dto) {
+        String houseResourceId = UUID.randomUUID().toString().replaceAll("-", "");
+        dto.getHouseResource().setId(houseResourceId);
+        houseResourceMapper.insertHouseResource(dto.getHouseResource());
+
+        dto.getHouseResourceAssociationObjects().forEach(x -> {
+            x.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+            x.setHouseResourceId(houseResourceId);
+            houseResourceAssociationObjectMapper.insertHouseResourceObjectAssociation(x);
+        });
     }
 
     @Override
@@ -53,7 +66,11 @@ public class HouseResourceServiceImpl implements HouseResourceService {
     }
 
     @Override
-    public IPage<HouseResource> pageHouseResources(HouseResourcePageQuery query) {
-        return houseResourceMapper.selectPage(new Page<>(query.getPageNum(), query.getPageSize()), query);
+    public IPage<HouseResourcePage> pageHouseResources(HouseResourcePageQuery query) {
+        IPage<HouseResourcePage> page = houseResourceMapper.selectPage(new Page<>(query.getPageNum(), query.getPageSize()), query);
+        page.getRecords().forEach(x -> {
+            x.setHouseResourceUrlList(Arrays.asList(x.getHouseResourceUrl().split(",")));
+        });
+        return page;
     }
 }

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

@@ -98,7 +98,7 @@
         </foreach>
     </insert>
 
-    <select id="selectPage" resultType="com.ruoyi.system.domain.house.HouseResource">
+    <select id="selectPage" resultType="com.ruoyi.system.domain.house.vo.HouseResourcePage">
         select * from house_resource
         <where>
             <if test="query.two != null and query.two != ''">