fix:1.调整后台上架的限制，解除分布式事物锁

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java

@@ -21,8 +21,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
-
-import com.logpm.warehouse.config.RedissonConfig;
 import com.logpm.warehouse.dto.*;
 import com.logpm.warehouse.entity.WarehouseGoodsAllocationEntity;
 import com.logpm.warehouse.excel.WarehouseGoodsAllocationExcel;
@@ -37,7 +35,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
-import org.redisson.api.RLock;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
@@ -58,7 +55,6 @@ import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**
@@ -223,12 +219,16 @@ public class WarehouseGoodsAllocationController extends BladeController {
 		Long allocationId = updownTypeDTO.getAllocationId();
 	//设置lockey
 		String lockKey ="lock:upPackage:" + allocationId;
-		RLock lock = new RedissonConfig().redisson().getLock(lockKey);
+
-		if(lock.isLocked()){
+
+//		RLock lock = new RedissonConfig().redisson().getLock(lockKey);
+
+		if(bladeRedis.exists(lockKey)){
 			return R.fail("该货位还在上架中！！！");
 		}
-		lock.lock(5, TimeUnit.SECONDS);
+		bladeRedis.setEx(lockKey,allocationId,5L);
-		if (upShelfOrderList.size() == 0 || Objects.isNull(allocationId)) {
+
+		if (upShelfOrderList.isEmpty() || Objects.isNull(allocationId)) {
 			return R.fail("参数不全");
 		}
 		//查询是否为备货区
@@ -262,11 +262,11 @@ public class WarehouseGoodsAllocationController extends BladeController {
 		Long allocationId = updownTypeDTO.getAllocationId();
 	//设置lockey
 		String lockKey ="lock:upPackage:" + allocationId;
-		RLock lock = new RedissonConfig().redisson().getLock(lockKey);
+		if(bladeRedis.exists(lockKey)){
-		if(lock.isLocked()){
 			return R.fail("该货位还在上架中！！！");
 		}
-		lock.lock(5, TimeUnit.SECONDS);
+		bladeRedis.setEx(lockKey,allocationId,5L);
+
 		Boolean b = warehouseGoodsAllocationService.selectIsStocking(allocationId);
 		if (b){
 			return R.fail("备货区不可上架");
@@ -304,11 +304,11 @@ public class WarehouseGoodsAllocationController extends BladeController {
 		Long allocationId = updownTypeDTO.getAllocationId();
 		//设置lockey
 		String lockKey ="lock:upPackage:" + allocationId;
-		RLock lock = new RedissonConfig().redisson().getLock(lockKey);
+		if(bladeRedis.exists(lockKey)){
-		if(lock.isLocked()){
 			return R.fail("该货位还在上架中！！！");
 		}
-		lock.lock(3, TimeUnit.SECONDS);
+		bladeRedis.setEx(lockKey,allocationId,3L);
+
 		if (upShelfPackageList.size() == 0 || Objects.isNull(allocationId)) {
 			return R.fail("参数不全");
 		}
@@ -340,11 +340,11 @@ public class WarehouseGoodsAllocationController extends BladeController {
 		Long allocationId = updownTypeDTO.getAllocationId();
 	//设置lockey
 		String lockKey ="lock:upPackage:" + allocationId;
-		RLock lock = new RedissonConfig().redisson().getLock(lockKey);
+		if(bladeRedis.exists(lockKey)){
-		if(lock.isLocked()){
 			return R.fail("该货位还在上架中！！！");
 		}
-		lock.lock(5, TimeUnit.SECONDS);
+		bladeRedis.setEx(lockKey,allocationId,5L);
+
 		if (null == allocationId || StringUtil.isBlank(trayCode)) {
 			return R.fail("参数不全");
 		}
@@ -375,12 +375,12 @@ public class WarehouseGoodsAllocationController extends BladeController {
 		List<UpShelfStockDTO> upShelfStockList = updownTypeDTO.getUpShelfStockList();
 	//设置lockey
 		String lockKey ="lock:upPackage:" + allocationId;
-		RLock lock = new RedissonConfig().redisson().getLock(lockKey);
+		if(bladeRedis.exists(lockKey)){
-		if(lock.isLocked()){
 			return R.fail("该货位还在上架中！！！");
 		}
-		lock.lock(5, TimeUnit.SECONDS);
+		bladeRedis.setEx(lockKey,allocationId,5L);
-		if (null == allocationId || upShelfStockList.size() == 0) {
+
+		if (null == allocationId || upShelfStockList.isEmpty()) {
 			return R.fail("参数不全");
 		}
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
@@ -412,11 +412,11 @@ public class WarehouseGoodsAllocationController extends BladeController {
 		List<UpShelfZeroOrderDTO> upShelfZeroOrderList = updownTypeDTO.getUpShelfZeroOrderList();
 	//设置lockey
 		String lockKey ="lock:upPackage:" + allocationId;
-		RLock lock = new RedissonConfig().redisson().getLock(lockKey);
+		if(bladeRedis.exists(lockKey)){
-		if(lock.isLocked()){
 			return R.fail("该货位还在上架中！！！");
 		}
-		lock.lock(5, TimeUnit.SECONDS);
+		bladeRedis.setEx(lockKey,allocationId,5L);
+
 		if (null == allocationId || upShelfZeroOrderList.size() == 0) {
 			return R.fail("参数不全");
 		}
@@ -553,7 +553,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	@ApiOperation(value = "货位 下架包件", notes = "传入warehouseGoodsAllocation")
 	public R downPackage(@RequestBody UpdownTypeDTO updownTypeDTO) {
 		List<UpShelfPackageDTO> upShelfPackageList = updownTypeDTO.getUpShelfPackageList();
-		if (upShelfPackageList.size() == 0) {
+		if (upShelfPackageList.isEmpty()) {
 			return R.fail("参数不全");
 		}
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
@@ -616,7 +616,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	@ApiOperation(value = "货位 下架库存品", notes = "传入warehouseGoodsAllocation")
 	public R downStock(@RequestBody UpdownTypeDTO updownTypeDTO) {
 		List<UpShelfStockDTO> upShelfStockList = updownTypeDTO.getUpShelfStockList();
-		if (upShelfStockList.size() == 0) {
+		if (upShelfStockList.isEmpty()) {
 			return R.fail("参数不全");
 		}
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();