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

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

@@ -37,4 +37,9 @@ public class HouseResourceAssociationObjectController {
         houseResourceAssociationObjectService.deleteHouseResourceAssociationObjectById(id);
         return AjaxResult.success();
     }
+
+    @GetMapping("/log")
+    public AjaxResult getHouseResourceAssociationObjectLog(@RequestParam String houseResourceId, @RequestParam int type) {
+        return AjaxResult.success(houseResourceAssociationObjectService.queryHouseResourceAssociationObjectLog(houseResourceId, type));
+    }
 }

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

@@ -12,4 +12,6 @@ public class HouseResourceAssociationObject {
     private String houseResourceId;
 
     private String businessId;
+
+    private int operateType;
 }

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

+package com.ruoyi.system.domain.house.vo;
+
+import com.ruoyi.system.domain.grid.GridCompany;
+import com.ruoyi.system.domain.grid.GridShop;
+import lombok.Data;
+
+@Data
+public class HouseResourceAssociationObjectVo {
+
+    private String id;
+
+    private int type;
+
+    private String houseResourceId;
+
+    private String businessId;
+
+    private GridCompany gridCompany;
+
+    private GridShop gridShop;
+}

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

@@ -3,6 +3,8 @@ 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 {
 
     void insertHouseResourceObjectAssociation(HouseResourceAssociationObject houseResourceAssociationObject);
@@ -14,4 +16,6 @@ public interface HouseResourceAssociationObjectMapper {
     void deleteHouseResourceObjectAssociationById(String id);
 
     HouseResourceAssociationObject selectHouseResourceObjectAssociationByHouseResourceIdType(@Param("houseResourceId") String houseResourceId, @Param("type") int type);
+
+    List<HouseResourceAssociationObject> selectHouseResourceObjectAssociationLog(@Param("houseResourceId") String houseResourceId, @Param("type") int type, @Param("operateType") int operateType);
 }

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

 package com.ruoyi.system.service.house;
 
 import com.ruoyi.system.domain.house.HouseResourceAssociationObject;
+import com.ruoyi.system.domain.house.vo.HouseResourceAssociationObjectVo;
+
+import java.util.List;
 
 public interface HouseResourceAssociationObjectService {
 
@@ -10,5 +13,7 @@ public interface HouseResourceAssociationObjectService {
 
     void deleteHouseResourceAssociationObjectById(String id);
 
-    HouseResourceAssociationObject queryHouseResourceAssociationObjectByHouseResourceIdType(String houseResourceId, int type);
+    HouseResourceAssociationObjectVo queryHouseResourceAssociationObjectByHouseResourceIdType(String houseResourceId, int type);
+
+    List<HouseResourceAssociationObjectVo> queryHouseResourceAssociationObjectLog(String houseResourceId, int type);
 }

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

 package com.ruoyi.system.service.house.impl;
 
+import com.ruoyi.system.domain.grid.GridCompany;
+import com.ruoyi.system.domain.grid.GridShop;
 import com.ruoyi.system.domain.house.HouseResourceAssociationObject;
+import com.ruoyi.system.domain.house.vo.HouseResourceAssociationObjectVo;
+import com.ruoyi.system.mapper.grid.GridCompanyMapper;
+import com.ruoyi.system.mapper.grid.GridShopMapper;
 import com.ruoyi.system.mapper.house.HouseResourceAssociationObjectMapper;
 import com.ruoyi.system.service.house.HouseResourceAssociationObjectService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.UUID;
+import java.util.*;
 
 @Service
 public class HouseResourceAssociationObjectServiceImpl implements HouseResourceAssociationObjectService {
 
     private final HouseResourceAssociationObjectMapper houseResourceAssociationObjectMapper;
 
-    public HouseResourceAssociationObjectServiceImpl(HouseResourceAssociationObjectMapper houseResourceAssociationObjectMapper) {
+    private final GridCompanyMapper gridCompanyMapper;
+
+    private final GridShopMapper gridShopMapper;
+
+    public HouseResourceAssociationObjectServiceImpl(HouseResourceAssociationObjectMapper houseResourceAssociationObjectMapper, GridCompanyMapper gridCompanyMapper, GridShopMapper gridShopMapper) {
         this.houseResourceAssociationObjectMapper = houseResourceAssociationObjectMapper;
+        this.gridCompanyMapper = gridCompanyMapper;
+        this.gridShopMapper = gridShopMapper;
     }
 
     @Override
@@ -37,7 +49,43 @@ public class HouseResourceAssociationObjectServiceImpl implements HouseResourceA
     }
 
     @Override
-    public HouseResourceAssociationObject queryHouseResourceAssociationObjectByHouseResourceIdType(String houseResourceId, int type) {
-        return houseResourceAssociationObjectMapper.selectHouseResourceObjectAssociationByHouseResourceIdType(houseResourceId, type);
+    public HouseResourceAssociationObjectVo queryHouseResourceAssociationObjectByHouseResourceIdType(String houseResourceId, int type) {
+        HouseResourceAssociationObject houseResourceAssociationObject = houseResourceAssociationObjectMapper.selectHouseResourceObjectAssociationByHouseResourceIdType(houseResourceId, type);
+        if (Objects.isNull(houseResourceAssociationObject)) {
+            return null;
+        }
+        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);
+        }
+        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,18 +6,19 @@
         <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"/>
     </resultMap>
 
     <insert id="insertHouseResourceObjectAssociation" parameterType="com.ruoyi.system.domain.house.HouseResourceAssociationObject">
         INSERT INTO house_resource_association_object
-            (id, type, house_resource_id, business_id)
+            (id, type, house_resource_id, business_id, operate_type)
         VALUES
             (#{id,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER},
-             #{houseResourceId,jdbcType=VARCHAR}, #{businessId,jdbcType=VARCHAR})
+             #{houseResourceId,jdbcType=VARCHAR}, #{businessId,jdbcType=VARCHAR}, #{operateType,jdbcType=INTEGER})
     </insert>
 
     <select id="selectHouseResourceObjectAssociationById" parameterType="String" resultType="com.ruoyi.system.domain.house.HouseResourceAssociationObject">
-        SELECT id, type, house_resource_id, business_id
+        SELECT id, type, house_resource_id, business_id, operate_type
         FROM house_resource_association_object
         WHERE id = #{id}
     </select>
@@ -26,7 +27,8 @@
         UPDATE house_resource_association_object
         SET type = #{type,jdbcType=INTEGER},
             house_resource_id = #{houseResourceId,jdbcType=VARCHAR},
-            business_id = #{businessId,jdbcType=VARCHAR}
+            business_id = #{businessId,jdbcType=VARCHAR},
+            operate_type = #{operateType,jdbcType=INTEGER}
         WHERE id = #{id,jdbcType=VARCHAR}
     </update>
 
@@ -37,7 +39,12 @@
 
     <select id="selectHouseResourceObjectAssociationByHouseResourceIdType"
             resultType="com.ruoyi.system.domain.house.HouseResourceAssociationObject">
-        SELECT id, type, house_resource_id, business_id
-        FROM house_resource_association_object where house_resource_id = #{houseResourceId} and type = #{type}
+        SELECT id, type, house_resource_id, business_id, operate_type
+        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
+        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