优化

warehouse-overseas-service/src/main/java/com/baiyue/warehouse/repository/WarehouseResourceLockRepository.java

@@ -7,11 +7,13 @@ import com.baiyue.warehouse.entity.WarehouseResourceLockEntity;
 import com.baiyue.warehouse.mapper.WarehouseLocationMapper;
 import com.baiyue.warehouse.mapper.WarehousePalletMapper;
 import com.baiyue.warehouse.mapper.WarehouseResourceLockMapper;
+import com.baiyue.warehouse.service.WarehouseResourceService;
 import org.springframework.stereotype.Repository;
 import jakarta.annotation.Resource;
 
 @Repository
 public class WarehouseResourceLockRepository {
+    private static final long PUBLIC_RESOURCE_SCOPE = WarehouseResourceService.PUBLIC_RESOURCE_SCOPE;
     @Resource private WarehouseResourceLockMapper locks;
     @Resource private WarehousePalletMapper pallets;
     @Resource private WarehouseLocationMapper locations;
@@ -32,58 +34,58 @@ public class WarehouseResourceLockRepository {
 
     public WarehousePalletEntity findPallet(long customerId, long palletId) {
         return pallets.selectOne(new LambdaQueryWrapper<WarehousePalletEntity>()
-            .eq(WarehousePalletEntity::getCustomerId, customerId)
+            .eq(WarehousePalletEntity::getCustomerId, PUBLIC_RESOURCE_SCOPE)
             .eq(WarehousePalletEntity::getId, palletId));
     }
 
     public WarehousePalletEntity findPallet(long customerId, long warehouseId, long palletId) {
         return pallets.selectOne(new LambdaQueryWrapper<WarehousePalletEntity>()
-            .eq(WarehousePalletEntity::getCustomerId, customerId)
+            .eq(WarehousePalletEntity::getCustomerId, PUBLIC_RESOURCE_SCOPE)
             .eq(WarehousePalletEntity::getWarehouseId, warehouseId)
             .eq(WarehousePalletEntity::getId, palletId));
     }
 
     public WarehouseLocationEntity findLocation(long customerId, long warehouseId, long locationId) {
         return locations.selectOne(new LambdaQueryWrapper<WarehouseLocationEntity>()
-            .eq(WarehouseLocationEntity::getCustomerId, customerId)
+            .eq(WarehouseLocationEntity::getCustomerId, PUBLIC_RESOURCE_SCOPE)
             .eq(WarehouseLocationEntity::getWarehouseId, warehouseId)
             .eq(WarehouseLocationEntity::getId, locationId));
     }
 
     public int occupyPallet(long customerId, long warehouseId, long palletId, long locationId) {
-        return locks.occupyPallet(customerId, warehouseId, palletId, locationId);
+        return locks.occupyPallet(PUBLIC_RESOURCE_SCOPE, warehouseId, palletId, locationId);
     }
 
     public int occupyLocation(long customerId, long warehouseId, long locationId) {
-        return locks.occupyLocation(customerId, warehouseId, locationId);
+        return locks.occupyLocation(PUBLIC_RESOURCE_SCOPE, warehouseId, locationId);
     }
 
     public void insert(WarehouseResourceLockEntity lock) { locks.insert(lock); }
 
     public int releasePallet(WarehouseResourceLockEntity lock) {
-        return locks.releasePallet(lock.getCustomerId(), lock.getWarehouseId(), lock.getPalletId(), lock.getLocationId());
+        return locks.releasePallet(PUBLIC_RESOURCE_SCOPE, lock.getWarehouseId(), lock.getPalletId(), lock.getLocationId());
     }
 
     public int releasePalletAtVirtualLocation(WarehouseResourceLockEntity lock) {
-        return locks.releasePalletAtVirtualLocation(lock.getCustomerId(), lock.getWarehouseId(),
+        return locks.releasePalletAtVirtualLocation(PUBLIC_RESOURCE_SCOPE, lock.getWarehouseId(),
             lock.getPalletId(), lock.getLocationId());
     }
 
     public int scrapPallet(WarehouseResourceLockEntity lock) {
-        return locks.scrapPallet(lock.getCustomerId(), lock.getWarehouseId(), lock.getPalletId(), lock.getLocationId());
+        return locks.scrapPallet(PUBLIC_RESOURCE_SCOPE, lock.getWarehouseId(), lock.getPalletId(), lock.getLocationId());
     }
 
     public int scrapPalletWithoutLock(long customerId, long palletId) {
-        return locks.scrapPalletWithoutLock(customerId, palletId);
+        return locks.scrapPalletWithoutLock(PUBLIC_RESOURCE_SCOPE, palletId);
     }
 
     public int scrapPalletAtVirtualLocation(WarehouseResourceLockEntity lock) {
-        return locks.scrapPalletAtVirtualLocation(lock.getCustomerId(), lock.getWarehouseId(),
+        return locks.scrapPalletAtVirtualLocation(PUBLIC_RESOURCE_SCOPE, lock.getWarehouseId(),
             lock.getPalletId(), lock.getLocationId());
     }
 
     public int releaseLocation(WarehouseResourceLockEntity lock) {
-        return locks.releaseLocation(lock.getCustomerId(), lock.getWarehouseId(), lock.getLocationId());
+        return locks.releaseLocation(PUBLIC_RESOURCE_SCOPE, lock.getWarehouseId(), lock.getLocationId());
     }
 
     public int close(WarehouseResourceLockEntity lock, String status) { return locks.closeLock(lock.getId(), status); }

warehouse-overseas-service/src/main/java/com/baiyue/warehouse/repository/WarehouseResourceRepository.java

@@ -45,6 +45,10 @@ public class WarehouseResourceRepository {
             .eq(WarehouseEntity::getId, warehouseId));
     }
 
+    public WarehouseEntity findWarehouseById(long warehouseId) {
+        return warehouses.selectById(warehouseId);
+    }
+
     public WarehouseLocationEntity findDefaultVirtualLocation(long customerId, long warehouseId) {
         return locations.selectOne(new LambdaQueryWrapper<WarehouseLocationEntity>()
             .eq(WarehouseLocationEntity::getCustomerId, customerId)