提取获取位置的递归函数为一个公共方法

ruoyi-admin/src/main/java/com/ruoyi/asset/service/impl/TbAssetInformationServiceImpl.java

@@ -13,6 +13,7 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanValidators;
+import com.ruoyi.utils.RecursionUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
@@ -71,42 +72,11 @@ public class TbAssetInformationServiceImpl implements ITbAssetInformationService
     public List<TbAssetInformation> selectTbAssetInformationList(TbAssetInformation tbAssetInformation)
     {
         String locationNumber = tbAssetInformation.getLocationNumber();
-        List<String> childrens = getNumberWithChildren(locationNumber);
+        List<String> childrens = new RecursionUtil().getNumberWithChildren(locationMapper, locationNumber);
         tbAssetInformation.setNlist(childrens);
-//        StringBuilder stringBuilder = new StringBuilder();
-//        for (int i = 0; i < childrens.size(); i++) {
-//            if (i > 0) {
-//                stringBuilder.append(",");
-//                stringBuilder.append(childrens.get(i));
-//                continue;
-//            }
-//            stringBuilder.append(childrens.get(i));
-//        }
-//        tbAssetInformation.setLocationNumber(stringBuilder.toString());
         return tbAssetInformationMapper.selectTbAssetInformationList(tbAssetInformation);
     }
 
-    public List<String> getNumberWithChildren(String number) {
-        Set<String> result = new HashSet<>();
-        Set<String> visited = new HashSet<>(); // 用于跟踪已访问过的节点
-
-        processNumberWithChildren(number, result, visited); // 调用辅助方法处理节点及其子节点
-
-        return new ArrayList<>(result);
-    }
-
-    private void processNumberWithChildren(String number, Set<String> result, Set<String> visited) {
-        if (!visited.contains(number)) { // 避免重复处理节点
-            visited.add(number);
-            List<String> children = locationMapper.selectNumberByFather(number); // 调用mapper接口方法查询直接子节点
-
-            // 递归处理每个子节点
-            for (String child : children) {
-                result.add(child);
-                processNumberWithChildren(child, result, visited);
-            }
-        }
-    }
 
     /**
      * 新增资产信息

ruoyi-admin/src/main/java/com/ruoyi/inventory/service/impl/TbAssetInventoryServiceImpl.java

@@ -14,6 +14,7 @@ import com.ruoyi.inventory.domain.dto.TakeStockDTO;
 import com.ruoyi.inventory.domain.dto.TbAssetInventoryDTO;
 import com.ruoyi.inventory.mapper.TbInventoryDetailMapper;
 import com.ruoyi.utils.IDUtil;
+import com.ruoyi.utils.RecursionUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.inventory.mapper.TbAssetInventoryMapper;
@@ -91,7 +92,7 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
             epcList.add(tagInfo.getEpc());
         }
         //根据位置获取包含自身及子位置,递归
-        List<String> locations = getNumberWithChildren(location);
+        List<String> locations = new RecursionUtil().getNumberWithChildren(locationMapper, location);
         //获取所在位置内的资产
         List<String> rfidList = informationMapper.selectNumberByLocations(locations);
         //对比盘点
@@ -165,30 +166,6 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
     }
 
 
-    /**
-     * 递归函数
-     */
-    public List<String> getNumberWithChildren(String number) {
-        Set<String> result = new HashSet<>();
-        Set<String> visited = new HashSet<>(); // 用于跟踪已访问过的节点
-
-        processNumberWithChildren(number, result, visited); // 调用辅助方法处理节点及其子节点
-
-        return new ArrayList<>(result);
-    }
-
-    private void processNumberWithChildren(String number, Set<String> result, Set<String> visited) {
-        if (!visited.contains(number)) { // 避免重复处理节点
-            visited.add(number);
-            List<String> children = locationMapper.selectNumberByFather(number); // 调用mapper接口方法查询直接子节点
-
-            // 递归处理每个子节点
-            for (String child : children) {
-                result.add(child);
-                processNumberWithChildren(child, result, visited);
-            }
-        }
-    }
 
     private int takeStock(String orderNumber, List<String> list, Long result){
         TbAssetInventory inventory = tbAssetInventoryMapper.selectTbAssetInventoryByNumber(orderNumber);

ruoyi-admin/src/main/java/com/ruoyi/utils/RecursionUtil.java

@@ -0,0 +1,32 @@
+package com.ruoyi.utils;
+
+import com.ruoyi.asset.mapper.TbLocationMapper;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class RecursionUtil {
+    public List<String> getNumberWithChildren(TbLocationMapper locationMapper, String number) {
+        Set<String> result = new HashSet<>();
+        Set<String> visited = new HashSet<>(); // 用于跟踪已访问过的节点
+
+        processNumberWithChildren(locationMapper, number, result, visited); // 调用辅助方法处理节点及其子节点
+
+        return new ArrayList<>(result);
+    }
+
+    private void processNumberWithChildren(TbLocationMapper locationMapper, String number, Set<String> result, Set<String> visited) {
+        if (!visited.contains(number)) { // 避免重复处理节点
+            visited.add(number);
+            List<String> children = locationMapper.selectNumberByFather(number); // 调用mapper接口方法查询直接子节点
+
+            // 递归处理每个子节点
+            for (String child : children) {
+                result.add(child);
+                processNumberWithChildren(locationMapper, child, result, visited);
+            }
+        }
+    }
+}

ruoyi-admin/src/main/resources/mapper/inventory/TbInventoryDetailMapper.xml

@@ -10,8 +10,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="inventoryMetadata"    column="inventory_metadata"    />
         <result property="isUpdateData"    column="is_update_data"    />
         <result property="remark"    column="remark"    />
-        <result property="createdTime"    column="created_time"    />
-        <result property="createdBy"    column="created_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
     </resultMap>
 
     <sql id="selectTbInventoryDetailVo">

ruoyi-ui/src/views/inventory/detail/index.vue

@@ -77,7 +77,7 @@
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="资产名称" align="center" prop="assetInfo.name" />
       <el-table-column label="资产编号" align="center" prop="assetInfo.number" />
-      <el-table-column label="创建时间" align="center" prop="assetInfo.createTime"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
       <el-table-column label="盘点元数据" align="center" prop="inventoryMetadata" >
         <template slot-scope="props">
           <el-button