Merge branch 'dev' into 'main'

Dev

See merge request !60

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

@@ -27,19 +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("/log")
-    public AjaxResult getHouseResourceAssociationObjectLog(@RequestParam String houseResourceId, @RequestParam int type) {
-        return AjaxResult.success(houseResourceAssociationObjectService.queryHouseResourceAssociationObjectLog(houseResourceId, type));
+    @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/HouseResourceAssociationObject.java

@@ -2,8 +2,6 @@ package com.ruoyi.system.domain.house;
 
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 public class HouseResourceAssociationObject {
 
@@ -14,8 +12,4 @@ public class HouseResourceAssociationObject {
     private String houseResourceId;
 
     private String businessId;
-
-    private int operateType;
-
-    private Date relieveTime;
 }

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/domain/house/vo/HouseResourceSaveUpdateDto.java

 package com.ruoyi.system.domain.house.vo;
 
+import com.ruoyi.system.domain.grid.GridCompany;
+import com.ruoyi.system.domain.grid.GridShop;
 import com.ruoyi.system.domain.house.HouseResource;
-import com.ruoyi.system.domain.house.HouseResourceAssociationObject;
 import lombok.Data;
 
 import java.util.List;
@@ -11,5 +12,7 @@ public class HouseResourceSaveUpdateDto {
 
     private HouseResource houseResource;
 
-    private List<HouseResourceAssociationObject> houseResourceAssociationObjects;
+    private List<GridCompany> companyList;
+
+    private List<GridShop> shopList;
 }

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

@@ -15,7 +15,7 @@ public interface HouseResourceAssociationObjectMapper {
 
     void deleteHouseResourceObjectAssociationById(String id);
 
-    HouseResourceAssociationObject selectHouseResourceObjectAssociationByHouseResourceIdType(@Param("houseResourceId") String houseResourceId, @Param("type") int type);
+    void deleteByHouseResourceId(String houseResourceId);
 
-    List<HouseResourceAssociationObject> selectHouseResourceObjectAssociationLog(@Param("houseResourceId") String houseResourceId, @Param("type") int type, @Param("operateType") int operateType);
+    List<HouseResourceAssociationObject> selectHouseResourceObjectAssociationByHouseResourceIdType(@Param("houseResourceId") String houseResourceId, @Param("type") int type);
 }

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

@@ -14,6 +14,4 @@ public interface HouseResourceAssociationObjectService {
     void deleteHouseResourceAssociationObjectById(String id);
 
     HouseResourceAssociationObjectVo queryHouseResourceAssociationObjectByHouseResourceIdType(String houseResourceId, int type);
-
-    List<HouseResourceAssociationObjectVo> queryHouseResourceAssociationObjectLog(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

@@ -50,42 +50,24 @@ public class HouseResourceAssociationObjectServiceImpl implements HouseResourceA
 
     @Override
     public HouseResourceAssociationObjectVo queryHouseResourceAssociationObjectByHouseResourceIdType(String houseResourceId, int type) {
-        HouseResourceAssociationObject houseResourceAssociationObject = houseResourceAssociationObjectMapper.selectHouseResourceObjectAssociationByHouseResourceIdType(houseResourceId, 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();
-        BeanUtils.copyProperties(houseResourceAssociationObject, houseResourceAssociationObjectVo);
-        if (type == 1) {
-            GridCompany gridCompany = gridCompanyMapper.selectByPrimaryKey(houseResourceAssociationObject.getBusinessId());
-            houseResourceAssociationObjectVo.setGridCompany(gridCompany);
-        } else if (type == 2) {
-            GridShop gridShop = gridShopMapper.selectByPrimaryKey(Long.parseLong(houseResourceAssociationObject.getBusinessId()));
-            houseResourceAssociationObjectVo.setGridShop(gridShop);
+        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;
     }
-
-    @Override
-    public List<HouseResourceAssociationObjectVo> queryHouseResourceAssociationObjectLog(String houseResourceId, int type) {
-        List<HouseResourceAssociationObject> houseResourceAssociationObjects = houseResourceAssociationObjectMapper.selectHouseResourceObjectAssociationLog(houseResourceId, type, 2);
-        if (houseResourceAssociationObjects.isEmpty()) {
-            return Collections.emptyList();
-        }
-        List<HouseResourceAssociationObjectVo> list = new ArrayList<>();
-        houseResourceAssociationObjects.forEach(x -> {
-            if (x.getType() == 1) {
-                HouseResourceAssociationObjectVo houseResourceAssociationObjectVo = new HouseResourceAssociationObjectVo();
-                GridCompany gridCompany = gridCompanyMapper.selectByPrimaryKey(x.getBusinessId());
-                houseResourceAssociationObjectVo.setGridCompany(gridCompany);
-                list.add(houseResourceAssociationObjectVo);
-            } else if (x.getType() == 2) {
-                HouseResourceAssociationObjectVo houseResourceAssociationObjectVo = new HouseResourceAssociationObjectVo();
-                GridShop gridShop = gridShopMapper.selectByPrimaryKey(Long.parseLong(x.getBusinessId()));
-                houseResourceAssociationObjectVo.setGridShop(gridShop);
-                list.add(houseResourceAssociationObjectVo);
-            }
-        });
-        return list;
-    }
 }

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

@@ -6,20 +6,18 @@
         <result property="type" column="type" jdbcType="INTEGER"/>
         <result property="houseResourceId" column="house_resource_id" jdbcType="VARCHAR"/>
         <result property="businessId" column="business_id" jdbcType="VARCHAR"/>
-        <result property="operateType" column="operate_type" jdbcType="INTEGER"/>
-        <result property="relieveTime" column="relieve_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <insert id="insertHouseResourceObjectAssociation" parameterType="com.ruoyi.system.domain.house.HouseResourceAssociationObject">
         INSERT INTO house_resource_association_object
-            (id, type, house_resource_id, business_id, operate_type, relieve_time)
+            (id, type, house_resource_id, business_id)
         VALUES
             (#{id,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER},
-             #{houseResourceId,jdbcType=VARCHAR}, #{businessId,jdbcType=VARCHAR}, #{operateType,jdbcType=INTEGER}, #{relieveTime,jdbcType=TIMESTAMP})
+             #{houseResourceId,jdbcType=VARCHAR}, #{businessId,jdbcType=VARCHAR})
     </insert>
 
     <select id="selectHouseResourceObjectAssociationById" parameterType="String" resultType="com.ruoyi.system.domain.house.HouseResourceAssociationObject">
-        SELECT id, type, house_resource_id, business_id, operate_type, relieve_time
+        SELECT id, type, house_resource_id, business_id
         FROM house_resource_association_object
         WHERE id = #{id}
     </select>
@@ -28,9 +26,7 @@
         UPDATE house_resource_association_object
         SET type = #{type,jdbcType=INTEGER},
             house_resource_id = #{houseResourceId,jdbcType=VARCHAR},
-            business_id = #{businessId,jdbcType=VARCHAR},
-            operate_type = #{operateType,jdbcType=INTEGER},
-            relieve_time = #{relieveTime,jdbcType=TIMESTAMP}
+            business_id = #{businessId,jdbcType=VARCHAR}
         WHERE id = #{id,jdbcType=VARCHAR}
     </update>
 
@@ -38,15 +34,13 @@
         DELETE FROM house_resource_association_object
         WHERE id = #{id}
     </delete>
+    <delete id="deleteByHouseResourceId">
+        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, operate_type, relieve_time
-        FROM house_resource_association_object where house_resource_id = #{houseResourceId} and type = #{type} and operate_type = 1
-    </select>
-    <select id="selectHouseResourceObjectAssociationLog"
-            resultType="com.ruoyi.system.domain.house.HouseResourceAssociationObject">
-        SELECT id, type, house_resource_id, business_id, operate_type, relieve_time
-        FROM house_resource_association_object where house_resource_id = #{houseResourceId} and type = #{type} and operate_type = #{operateType}
+        SELECT id, type, house_resource_id, business_id  WHERE house_resource_id = #{houseResourceId} and type = #{type}
     </select>
 </mapper>
\ No newline at end of file