调接口释放库位状态并且释放redis锁

ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java

@@ -26,6 +26,11 @@ public class RedisCache {
     @Autowired
     public RedisTemplate redisTemplate;
 
+    /**
+     * 默认过期时长，单位：秒
+     */
+    public final static long DEFAULT_EXPIRE = 60 * 60 * 24;
+
     /**
      * 缓存基本的对象，Integer、String、实体类等
      *
@@ -40,6 +45,8 @@ public class RedisCache {
         boolean isOK = redisTemplate.opsForValue().setIfAbsent(key, value);
         if (isOK) {
             redisTemplate.opsForList().rightPush(RedisKey.LOCK_LIST + token, key);
+            expire(key, DEFAULT_EXPIRE);
+            expire(RedisKey.LOCK_LIST + token, DEFAULT_EXPIRE);
         }
         return isOK;
     }
@@ -55,11 +62,15 @@ public class RedisCache {
         }
     }
 
-    public void unlockCacheObject(Long token,final String key) {
+    public void unlockCacheObject(Long token, final String key) {
         redisTemplate.opsForList().remove(RedisKey.LOCK_LIST + token, 1, RedisKey.LOCK_LOCATION + key);
         redisTemplate.delete(RedisKey.LOCK_LOCATION + key);
     }
 
+    public void unlockCacheLocation(final String key) {
+        redisTemplate.delete(RedisKey.LOCK_LOCATION + key);
+    }
+
     public boolean checkIsLock(String key) {
         boolean isLock = false;
         Object obj = redisTemplate.opsForValue().get(key);

warewms-ams/src/main/java/com/ruoyi/ams/inv/service/impl/InvLotLocIdServiceImpl.java

@@ -21,6 +21,7 @@ import com.ruoyi.base.domain.BaseLocationInfo;
 import com.ruoyi.base.service.IBaseLocationInfoService;
 import com.ruoyi.base.utils.IdSequenceUtils;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -59,6 +60,8 @@ public class InvLotLocIdServiceImpl implements IInvLotLocIdService {
     private IInvLotLocIdService invLotLocIdService;
     @Autowired
     private IBusinessService iBusinessService;
+    @Autowired
+    private RedisCache redisCache;
 
     /**
      * 查询库位库存信息
@@ -372,7 +375,8 @@ public class InvLotLocIdServiceImpl implements IInvLotLocIdService {
 
         log.error("【修改库位任务占用状态】:" + baseLocationInfo.getLocationNo() + ","
                 + (isIdle ? Constant.STOCK_STATUS.STOCK10.getValue() : Constant.STOCK_STATUS.STOCK00.getValue()));
-
+        // 释放redis锁
+        redisCache.unlockCacheLocation(baseLocationInfo.getId().toString());
         return AjaxResult.success("操作成功！");
     }