修改位置树接口及资产信息列表接口

ruoyi-admin/src/main/java/com/ruoyi/asset/controller/TbLocationController.java

@@ -52,7 +52,7 @@ public class TbLocationController extends BaseController
         return getDataTable(list);
     }
 
-    @PreAuthorize("@ss.hasPermi('asset:location:list')")
+    //@PreAuthorize("@ss.hasPermi('asset:location:list')")
     @PostMapping("/tree")
     public TableDataInfo tree(@RequestBody(required = false) TbLocation tbLocation) {
         startPage();

ruoyi-admin/src/main/java/com/ruoyi/asset/domain/TbAssetInformation.java

@@ -1,6 +1,8 @@
 package com.ruoyi.asset.domain;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -23,6 +25,8 @@ public class TbAssetInformation extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    private List<String> nlist;
+
     /** 编号 */
     private Long id;
 

ruoyi-admin/src/main/java/com/ruoyi/asset/mapper/TbAssetInformationMapper.java

@@ -35,7 +35,7 @@ public interface TbAssetInformationMapper
      * @param tbAssetInformation 资产信息
      * @return 资产信息集合
      */
-    public List<TbAssetInformation> selectTbAssetInformationList(TbAssetInformation tbAssetInformation);
+    public List<TbAssetInformation> selectTbAssetInformationList( TbAssetInformation tbAssetInformation);
 
     /**
      * 新增资产信息

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

@@ -1,9 +1,13 @@
 package com.ruoyi.asset.service.impl;
 
+import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.json.JSONUtil;
+import com.ruoyi.asset.mapper.TbLocationMapper;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -31,6 +35,9 @@ public class TbAssetInformationServiceImpl implements ITbAssetInformationService
     @Autowired
     private TbAssetInformationMapper tbAssetInformationMapper;
 
+    @Autowired
+    private TbLocationMapper locationMapper;
+
     @Resource
     private StringRedisTemplate stringRedisTemplate;
 
@@ -63,9 +70,44 @@ public class TbAssetInformationServiceImpl implements ITbAssetInformationService
     @Override
     public List<TbAssetInformation> selectTbAssetInformationList(TbAssetInformation tbAssetInformation)
     {
+        String locationNumber = tbAssetInformation.getLocationNumber();
+        List<String> childrens = getNumberWithChildren(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

@@ -1,6 +1,8 @@
 package com.ruoyi.inventory.service.impl;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.logging.SimpleFormatter;
 
 import cn.hutool.json.JSONUtil;
 import com.ruoyi.asset.mapper.TbAssetInformationMapper;
@@ -213,14 +215,15 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
         inventory.setRecordStatus(1L);
         inventory.setInventoryLocation(location);
         inventory.setInventoryDate(new Date());
-        inventory.setName("线下自测");
+        SimpleDateFormat formatter = new SimpleDateFormat("yyMMdd HH:mm:ss");
+        String format = formatter.format(new Date());
+        inventory.setName("线下自测"+format);
         int i = insertTbAssetInventory(inventory);
         if(i < 1){
             throw new ServiceException("生成盘点记录失败");
         }
         String orderNumber = inventory.getOrderNumber();
         //插入盘点明细
-
         TbInventoryDetail detail = new TbInventoryDetail();
         for (String number : list) {
             detail.setOrderNumber(orderNumber);

ruoyi-admin/src/main/java/com/ruoyi/visitor/controller/VController.java

@@ -0,0 +1,29 @@
+package com.ruoyi.visitor.controller;
+
+import com.ruoyi.asset.domain.TbAssetInformation;
+import com.ruoyi.asset.service.ITbAssetInformationService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/visitor")
+public class VController extends BaseController {
+    @Autowired
+    private ITbAssetInformationService tbAssetInformationService;
+
+    @GetMapping("/list/{number}")
+    public TableDataInfo list(@PathVariable("number") String number)
+    {
+        TbAssetInformation tbAssetInformation = new TbAssetInformation();
+        tbAssetInformation.setLocationNumber(number);
+        List<TbAssetInformation> list = tbAssetInformationService.selectTbAssetInformationList(tbAssetInformation);
+        return getDataTable(list);
+    }
+}

ruoyi-admin/src/main/resources/mapper/asset/TbAssetInformationMapper.xml

@@ -59,6 +59,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, code, name, number, image_url, category_number, specifications_model, abc_category, manage_status, user_department, department, responsible_person, location_number, property, purchase_date, commissioning_date, original_value, durable_years, net_value, residual_value, accumulated_depreciation, last_depreciation_date, depreciation_method, contract_number, factory_number, manufacturer, supplier, purpose, maintenance_date, maintenance_tel, maintenance_user, corporation, record_status, remark, create_by, create_time, update_by, update_time, is_whitelist, reserved_column_b, reserved_column_c, reserved_column_d, reserved_column_e, reserved_column_f, reserved_column_g, reserved_column_h, reserved_column_i, reserved_column_j from tb_asset_information
     </sql>
 
+<!--
+    0
+
+     number in （0， 1, 2, 3）
+-->
+
     <select id="selectTbAssetInformationList" parameterType="TbAssetInformation" resultMap="TbAssetInformationResult">
         <include refid="selectTbAssetInformationVo"/>
         <where>  
@@ -73,7 +79,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userDepartment != null  and userDepartment != ''"> and user_department = #{userDepartment}</if>
             <if test="department != null  and department != ''"> and department = #{department}</if>
             <if test="responsiblePerson != null  and responsiblePerson != ''"> and responsible_person = #{responsiblePerson}</if>
-            <if test="locationNumber != null  and locationNumber != ''"> and location_number = #{locationNumber}</if>
+            <if test="locationNumber != null  and locationNumber != ''"> and location_number in
+             <foreach collection="nlist" item="item" open="(" separator="," close=")">
+                 #{item}
+             </foreach> </if>
             <if test="property != null  and property != ''"> and property = #{property}</if>
             <if test="purchaseDate != null "> and purchase_date = #{purchaseDate}</if>
             <if test="commissioningDate != null "> and commissioning_date = #{commissioningDate}</if>

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

@@ -10,12 +10,12 @@ 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="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="createdTime"    column="created_time"    />
+        <result property="createdBy"    column="created_by"    />
     </resultMap>
 
     <sql id="selectTbInventoryDetailVo">
-        select id, order_number, inventory_metadata, is_update_data, remark, create_by, create_time from tb_inventory_detail
+        select id, order_number, inventory_metadata, is_update_data, remark, create_time, create_by from tb_inventory_detail
     </sql>
 
     <select id="selectTbInventoryDetailList" parameterType="TbInventoryDetail" resultMap="TbInventoryDetailResult">

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -111,9 +111,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage","/inventory/inventory/takeStock").permitAll()
+                .antMatchers("/login", "/register", "/captchaImage","/inventory/inventory/takeStock", "/asset/location/tree").permitAll()
                 // 静态资源，可匿名访问
-                .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**", "/asset/location/tree", "/asset/location/code/**").permitAll()
+                .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**", "/asset/location/code/**","/visitor/list/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()

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

@@ -77,6 +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="inventoryMetadata" >
         <template slot-scope="props">
           <el-button
@@ -116,7 +117,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"