层位管理 树状菜单

storeroom/src/main/java/com/storeroom/modules/device/controller/DeviceArchivesTagController.java

@@ -4,6 +4,7 @@ package com.storeroom.modules.device.controller;
 import com.storeroom.annotaion.rest.AnonymousGetMapping;
 import com.storeroom.exception.BaseException;
 import com.storeroom.modules.device.service.DeviceArchivesTagService;
+import com.storeroom.modules.device.service.DeviceService;
 import com.storeroom.utils.ApiResponse;
 import com.storeroom.utils.StringUtils;
 import io.swagger.annotations.Api;
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class DeviceArchivesTagController {
 
     private final DeviceArchivesTagService deviceArchivesTagService;
+    private final DeviceService deviceService;
 
 
     @ApiOperation("层架位标签列表")
@@ -32,4 +34,11 @@ public class DeviceArchivesTagController {
         return ApiResponse.success(deviceArchivesTagService.queryTagList(deviceInfoId, pageable));
     }
 
+
+    @ApiOperation("层架位标签列表")
+    @AnonymousGetMapping("menu")
+    public ApiResponse<Object> menu() {
+        return ApiResponse.success(deviceService.DeviceMenuTree());
+    }
+
 }

storeroom/src/main/java/com/storeroom/modules/device/repository/DeviceArchivesTagRepository.java

@@ -46,8 +46,8 @@ public interface DeviceArchivesTagRepository extends JpaRepository<DeviceArchive
 
     /**
      * 根据区号查询
-     * @param areaNo
-     * @return
+     * @param areaNo /
+     * @return /
      */
     List<DeviceArchivesTag> findByAreaNo(Integer areaNo);
 

storeroom/src/main/java/com/storeroom/modules/device/repository/DeviceInfoRepository.java

@@ -16,6 +16,7 @@ public interface DeviceInfoRepository extends JpaRepository<DeviceInfo, String>,
 
     /**
      * 根据库房查询
+     *
      * @param storeroomId /
      * @return
      */
@@ -64,9 +65,9 @@ public interface DeviceInfoRepository extends JpaRepository<DeviceInfo, String>,
     /**
      * 根据第三方设备id和设备类型查询
      *
-     * @param deviceId
-     * @param deviceTypeId
-     * @return
+     * @param deviceId     /
+     * @param deviceTypeId /
+     * @return /
      */
     List<DeviceInfo> findByDeviceIdAndDeviceTypeId(String deviceId, DeviceType deviceTypeId);
 
@@ -103,24 +104,25 @@ public interface DeviceInfoRepository extends JpaRepository<DeviceInfo, String>,
     /**
      * 根据库房id查询
      *
-     * @param storeroomId
-     * @param pageable
-     * @return
+     * @param storeroomId /
+     * @param pageable    /
+     * @return /
      */
     @Query(value = "select * from device_info where storeroom_id=?1", nativeQuery = true)
     Page<DeviceInfo> findStoreroomId(String storeroomId, Pageable pageable);
 
     /**
      * 通过设备类型查询
-     * @param deviceTypeId 、
-     * @param pageable 、
-     * @return 、
+     *
+     * @param deviceTypeId /
+     * @param pageable     /
+     * @return /
      */
     @Query(value = "select * from device_info where device_type_id=?1", nativeQuery = true)
     Page<DeviceInfo> findDeviceTypeList(String deviceTypeId, Pageable pageable);
 
     @Query(nativeQuery = true
-            ,value = "select * from device_info where id = (select device_info_id from device_archives_tag where id = (select shelf_id from archives_case where id = ?1))")
+            , value = "select * from device_info where id = (select device_info_id from device_archives_tag where id = (select shelf_id from archives_case where id = ?1))")
     DeviceInfo findDeviceByCaseId(String caseId);
 
     @Query(nativeQuery = true,
@@ -128,4 +130,13 @@ public interface DeviceInfoRepository extends JpaRepository<DeviceInfo, String>,
             value = "select * from device_info where device_type_id in (select id from device_type where name in ('密集架','回转柜')) order by create_time asc")
     Page<DeviceInfo> queryStorageDeviceAll(Pageable pageable);
 
+    /**
+     * 根据设备类型查询
+     *
+     * @param deviceType \
+     * @return
+     */
+    @Query(value = "select * from device_info where device_type_id=?1", nativeQuery = true)
+    List<DeviceInfo> findByDeviceTypeId(String deviceTypeId);
+
 }

storeroom/src/main/java/com/storeroom/modules/device/service/DeviceArchivesTagService.java

@@ -18,6 +18,7 @@ public interface DeviceArchivesTagService {
      * @param deviceInfoId 设备类型
      * @return /
      */
-    List<Object> queryTagList(String deviceInfoId,Pageable pageable);
+    List<DeviceArchivesTag> queryTagList(String deviceInfoId,Pageable pageable);
+
 
 }

storeroom/src/main/java/com/storeroom/modules/device/service/DeviceService.java

@@ -1,8 +1,8 @@
 package com.storeroom.modules.device.service;
 
 
+import com.storeroom.modules.device.domain.DeviceInfo;
 import com.storeroom.modules.device.service.dto.DeviceInfoDto;
-import com.storeroom.modules.device.service.dto.DeviceQueryCriteria;
 import com.storeroom.modules.device.service.dto.DeviceTypeDto;
 import org.springframework.data.domain.Pageable;
 
@@ -144,5 +144,10 @@ public interface DeviceService {
     void Delete(Set<String> deviceInfoId);
 
 
+    /**
+     * 层位管理 树形菜单
+     * @return
+     */
+    List<DeviceInfo> DeviceMenuTree();
 
 }

storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceArchivesTagImpl.java

@@ -44,10 +44,7 @@ public class DeviceArchivesTagImpl implements DeviceArchivesTagService {
     }
 
     @Override
-    public List<Object> queryTagList(String deviceInfoId, Pageable pageable) {
-        List<DeviceArchivesTag> deviceArchivesTagList = deviceArchivesTagRepository.findByDeviceInfoId(deviceInfoId, pageable);
-        List<Object> list = new ArrayList<>(deviceArchivesTagList);
-        list.add(deviceInfoRepository.findById(deviceInfoId));
-        return list;
+    public List<DeviceArchivesTag> queryTagList(String deviceInfoId, Pageable pageable) {
+        return deviceArchivesTagRepository.findByDeviceInfoId(deviceInfoId, pageable);
     }
 }

storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java

@@ -18,10 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-import java.util.Set;
+import java.util.*;
 
 
 @Service
@@ -389,6 +386,22 @@ public class DeviceImpl implements DeviceService {
     }
 
 
+    @Override
+    public List<DeviceInfo> DeviceMenuTree() {
+        //密集架
+        List<DeviceInfo> deviceInfoList = deviceInfoRepository.findByDeviceTypeId("5643ED11723BBA5A4C1856");
+        //回转柜
+        List<DeviceInfo> deviceInfoList1 = deviceInfoRepository.findByDeviceTypeId("DD656054BE3D1DF1E2F1FC");
+
+        List<DeviceInfo> deviceInfoList2 = new ArrayList<>();
+        deviceInfoList2.addAll(deviceInfoList);
+        deviceInfoList2.addAll(deviceInfoList1);
+
+
+        return deviceInfoList2;
+    }
+
+
     /**
      * 生成架位左右位置
      *