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

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

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

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/HouseResource.java

@@ -38,6 +38,8 @@ public class HouseResource implements Serializable {
 
     private String houseResourceEquityTel;
 
+    private String ownership;
+
     private String decorationCondition;
 
     private String orientation;

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/HouseResourceAssociationObject.java

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

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

@@ -18,6 +18,8 @@ public class HouseResourcePage {
 
     private String four;
 
+    private String wgName;
+
     private int type;
 
     private String projectId;

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

@@ -7,7 +7,7 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class HouseResourceSaveDto {
+public class HouseResourceSaveUpdateDto {
 
     private HouseResource houseResource;
 

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

@@ -4,17 +4,17 @@ 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 com.ruoyi.system.domain.house.vo.HouseResourceSaveUpdateDto;
 
 import java.util.List;
 
 public interface HouseResourceService {
 
-    void saveHouseResource(HouseResourceSaveDto dto);
+    void saveHouseResource(HouseResourceSaveUpdateDto dto);
 
     HouseResource queryHouseResourceById(String id);
 
-    void updateHouseResource(HouseResource houseResource);
+    void updateHouseResource(HouseResourceSaveUpdateDto dto);
 
     void deleteHouseResourceById(String id);
 

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

@@ -3,19 +3,18 @@ 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.HouseResourceAssociationObject;
 import com.ruoyi.system.domain.house.enums.HouseEnums;
 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.domain.house.vo.HouseResourceSaveUpdateDto;
 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.Arrays;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 @Service
 public class HouseResourceServiceImpl implements HouseResourceService {
@@ -31,7 +30,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void saveHouseResource(HouseResourceSaveDto dto) {
+    public void saveHouseResource(HouseResourceSaveUpdateDto dto) {
         String houseResourceId = UUID.randomUUID().toString().replaceAll("-", "");
         dto.getHouseResource().setId(houseResourceId);
         houseResourceMapper.insertHouseResource(dto.getHouseResource());
@@ -50,8 +49,23 @@ public class HouseResourceServiceImpl implements HouseResourceService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateHouseResource(HouseResource houseResource) {
-        houseResourceMapper.updateHouseResource(houseResource);
+    public void updateHouseResource(HouseResourceSaveUpdateDto dto) {
+        if (Objects.isNull(dto.getHouseResource().getId())) {
+            throw new RuntimeException("房源id不能为空");
+        }
+        houseResourceMapper.updateHouseResource(dto.getHouseResource());
+        dto.getHouseResourceAssociationObjects().forEach(x -> {
+            if (Objects.isNull(x.getId())) {
+                x.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+                x.setHouseResourceId(dto.getHouseResource().getId());
+                houseResourceAssociationObjectMapper.insertHouseResourceObjectAssociation(x);
+            } else {
+                HouseResourceAssociationObject houseResourceAssociationObject = houseResourceAssociationObjectMapper.selectHouseResourceObjectAssociationById(x.getId());
+                houseResourceAssociationObject.setOperateType(2);
+                houseResourceAssociationObject.setRelieveTime(new Date());
+                houseResourceAssociationObjectMapper.updateHouseResourceObjectAssociation(houseResourceAssociationObject);
+            }
+        });
     }
 
     @Override

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

@@ -7,18 +7,19 @@
         <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)
+            (id, type, house_resource_id, business_id, operate_type, relieve_time)
         VALUES
             (#{id,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER},
-             #{houseResourceId,jdbcType=VARCHAR}, #{businessId,jdbcType=VARCHAR}, #{operateType,jdbcType=INTEGER})
+             #{houseResourceId,jdbcType=VARCHAR}, #{businessId,jdbcType=VARCHAR}, #{operateType,jdbcType=INTEGER}, #{relieveTime,jdbcType=TIMESTAMP})
     </insert>
 
     <select id="selectHouseResourceObjectAssociationById" parameterType="String" resultType="com.ruoyi.system.domain.house.HouseResourceAssociationObject">
-        SELECT id, type, house_resource_id, business_id, operate_type
+        SELECT id, type, house_resource_id, business_id, operate_type, relieve_time
         FROM house_resource_association_object
         WHERE id = #{id}
     </select>
@@ -28,7 +29,8 @@
         SET type = #{type,jdbcType=INTEGER},
             house_resource_id = #{houseResourceId,jdbcType=VARCHAR},
             business_id = #{businessId,jdbcType=VARCHAR},
-            operate_type = #{operateType,jdbcType=INTEGER}
+            operate_type = #{operateType,jdbcType=INTEGER},
+            relieve_time = #{relieveTime,jdbcType=TIMESTAMP}
         WHERE id = #{id,jdbcType=VARCHAR}
     </update>
 
@@ -39,12 +41,12 @@
 
     <select id="selectHouseResourceObjectAssociationByHouseResourceIdType"
             resultType="com.ruoyi.system.domain.house.HouseResourceAssociationObject">
-        SELECT id, type, house_resource_id, business_id, operate_type
+        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
+        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>
 </mapper>
\ No newline at end of file

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

@@ -17,6 +17,7 @@
         <result property="houseResourceUse" column="house_resource_use" jdbcType="VARCHAR"/>
         <result property="houseResourceEquity" column="house_resource_equity" jdbcType="VARCHAR"/>
         <result property="houseResourceEquityTel" column="house_resource_equity_tel" jdbcType="VARCHAR"/>
+        <result property="ownership" column="ownership" jdbcType="VARCHAR" />
         <result property="decorationCondition" column="decoration_condition" jdbcType="INTEGER"/>
         <result property="orientation" column="orientation" jdbcType="INTEGER"/>
         <result property="landingHeadFlag" column="landing_head_flag" jdbcType="BIT"/>
@@ -35,12 +36,12 @@
     <insert id="insertHouseResource" parameterType="com.ruoyi.system.domain.house.HouseResource">
         INSERT INTO house_resource
         (id, relation_id, two, three, four, type, project_id, house_resource_url, house_number, house_area,
-         house_resource_attribute, house_resource_type, house_resource_use, house_resource_equity, house_resource_equity_tel,
+         house_resource_attribute, house_resource_type, house_resource_use, house_resource_equity, house_resource_equity_tel, ownership,
          decoration_condition, orientation, landing_head_flag, common_area_number, office_number,
          meeting_number, station_number, set_up, label_id, unit_price, rental_unit, plane_graph_url, hire_status)
         VALUES
             (#{id}, #{relationId}, #{two}, #{three}, #{four}, #{type}, #{projectId}, #{houseResourceUrl}, #{houseNumber}, #{houseArea},
-             #{houseResourceAttribute}, #{houseResourceType}, #{houseResourceUse}, #{houseResourceEquity}, #{houseResourceEquityTel},
+             #{houseResourceAttribute}, #{houseResourceType}, #{houseResourceUse}, #{houseResourceEquity}, #{houseResourceEquityTel}, #{ownership},
              #{decorationCondition}, #{orientation}, #{landingHeadFlag}, #{commonAreaNumber}, #{officeNumber},
              #{meetingNumber}, #{stationNumber}, #{setUp}, #{labelId}, #{unitPrice}, #{rentalUnit}, #{planeGraphUrl}, #{hireStatus})
     </insert>
@@ -65,6 +66,7 @@
             house_resource_use = #{houseResourceUse},
             house_resource_equity = #{houseResourceEquity},
             house_resource_equity_tel = #{houseResourceEquityTel},
+            ownership = #{ownership},
             decoration_condition = #{decorationCondition},
             orientation = #{orientation},
             landing_head_flag = #{landingHeadFlag},
@@ -88,14 +90,14 @@
     <insert id="batchInsertHouseResources" parameterType="java.util.List">
         INSERT INTO house_resource
         (id, relation_id, two, three, four, type, project_id, house_resource_url, house_number, house_area,
-        house_resource_attribute, house_resource_type, house_resource_use, house_resource_equity, house_resource_equity_tel,
+        house_resource_attribute, house_resource_type, house_resource_use, house_resource_equity, house_resource_equity_tel, ownership,
         decoration_condition, orientation, landing_head_flag, common_area_number, office_number,
         meeting_number, station_number, set_up, label_id, unit_price, rental_unit, plane_graph_url, hire_status)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (#{item.id}, #{item.relationId},  #{two}, #{three}, #{four}, #{item.type}, #{item.projectId}, #{item.houseResourceUrl},
             #{item.houseNumber}, #{item.houseArea}, #{item.houseResourceAttribute}, #{item.houseResourceType},
-            #{item.houseResourceUse}, #{item.houseResourceEquity}, #{item.houseResourceEquityTel}, #{item.decorationCondition},
+            #{item.houseResourceUse}, #{item.houseResourceEquity}, #{item.houseResourceEquityTel}, #{ownership}, #{item.decorationCondition},
             #{item.orientation}, #{item.landingHeadFlag}, #{item.commonAreaNumber}, #{item.officeNumber},
             #{item.meetingNumber}, #{item.stationNumber}, #{item.setUp}, #{item.labelId}, #{item.unitPrice}, #{item.rentalUnit},
             #{item.planeGraphUrl}, #{item.hireStatus})
@@ -103,7 +105,7 @@
     </insert>
 
     <select id="selectPage" resultType="com.ruoyi.system.domain.house.vo.HouseResourcePage">
-        select * from house_resource
+        SELECT t1.*, t2.wg_name AS wgName FROM house_resource t1 LEFT JOIN grid_region t2 ON t1.four = t2.id
         <where>
             <if test="query.two != null and query.two != ''">
                 and two like concat('%', #{query.two}, '%')