Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

1、RedisLockUtil加锁解锁修复sonar.LocksNotUnlockedCheck；2、api、文件导入生产单数据加解锁基于多租户问题修复；

Browse Source
This commit is contained in:
gaoqr
2025-05-22 15:47:01 +08:00
parent 59222bd1e7
commit e6e32790b3
3 changed files with 23 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-framework/cf-spring-boot-starter-redis/src/main/java/com/cf/imes/framework/redis/config/ChenfengCacheAutoConfiguration.java
+2 -3
View File
@@ -3,7 +3,6 @@ package com.cf.imes.framework.redis.config;
import cn.hutool.core.text.StrPool;
import com.cf.imes.framework.redis.core.TimeoutRedisCacheManager;
import com.cf.imes.framework.redis.util.RedisLockUtil;
import org.redisson.api.RedissonClient;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.cache.CacheProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -82,7 +81,7 @@ public class ChenfengCacheAutoConfiguration {
}
@Bean
public RedisLockUtil lockUtil(ChenfengCacheProperties chenfengCacheProperties, RedissonClient client, RedisTemplate redisTemplate) {
return new RedisLockUtil(chenfengCacheProperties, client, redisTemplate);
public RedisLockUtil lockUtil(RedisTemplate redisTemplate) {
return new RedisLockUtil(redisTemplate);
}
}
cf-framework/cf-spring-boot-starter-redis/src/main/java/com/cf/imes/framework/redis/util/RedisLockUtil.java
-60
View File
@@ -1,11 +1,8 @@
package com.cf.imes.framework.redis.util;
import cn.hutool.core.util.ObjectUtil;
import com.cf.imes.framework.redis.config.ChenfengCacheProperties;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.data.redis.core.RedisTemplate;
import java.util.concurrent.TimeUnit;
@@ -20,65 +17,8 @@ import java.util.concurrent.TimeUnit;
@Slf4j
public class RedisLockUtil {
private ChenfengCacheProperties chenfengCacheProperties;
private RedissonClient redissonClient;
private RedisTemplate redisTemplate;
/**
* 加锁
*
* @param key rediskey
* @return true拿到锁，反之没有做对应的业务提醒
*/
public boolean acquireLock(String key) {
boolean getLock = false;
try {
RLock rLock = redissonClient.getLock(key);
return rLock.tryLock(chenfengCacheProperties.getLockWaitTime(), chenfengCacheProperties.getLockTimeout(), TimeUnit.MILLISECONDS);
} catch (Exception e) {
log.error("[RedisLockUtil][lock]加锁失败", e);
return getLock;
}
}
/**
* 加锁
*
* @param key rediskey
* @param timeout 锁的超时时间，传空则按照默认配置
* @param waitTime 等待获取锁的时间，传空则按照默认配置
* @return true拿到锁，反之没有做对应的业务提醒
*/
public boolean acquireLock(String key, Integer waitTime, Integer timeout) {
boolean getLock = false;
try {
RLock rLock = redissonClient.getLock(key);
int wt = ObjectUtil.isNull(waitTime) ? chenfengCacheProperties.getLockWaitTime() : waitTime;
int to = ObjectUtil.isNull(timeout) ? chenfengCacheProperties.getLockTimeout() : timeout;
return rLock.tryLock(wt, to, TimeUnit.MILLISECONDS);
} catch (Exception e) {
log.error("[RedisLockUtil][lock]加锁失败", e);
return getLock;
}
}
/**
* 解锁
* 使用注意：配合以上两个redisson的lock只能在当前线程中unlock，否则失败！！！
*
* @param key rediskey
*/
public void releaseLock(String key) {
try {
RLock rLock = redissonClient.getLock(key);
rLock.unlock();
} catch (Exception e) {
log.error("[RedisLockUtil][unlock]解锁失败", e);
}
}
/**
* 手动set nx ex加锁
* 使用注意：可用于跨服务
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java
+21 -13
View File
@@ -10,6 +10,8 @@ import com.cf.imes.framework.common.pojo.PageResult;
import com.cf.imes.framework.common.util.object.BeanUtils;
import com.cf.imes.framework.mybatis.core.generator.SnowFlakeGenerator;
import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
import com.cf.imes.framework.redis.config.ChenfengCacheProperties;
import com.cf.imes.framework.redis.constants.RedisKeyConstants;
import com.cf.imes.framework.redis.util.RedisLockUtil;
import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils;
import com.cf.imes.module.executor.controller.admin.order.vo.order.*;
@@ -107,7 +109,9 @@ public class OrderController {
@Resource
private OrderInputProcessor orderInputProcessor;
private String lockKey = "order:1631:lock:";
@Resource
private ChenfengCacheProperties chenfengCacheProperties;
private String errKey = "生产数据导入异常,{}";
public static final String ORDER_PLATE_MODEL = "imes_order_plate_model";
@@ -229,13 +233,15 @@ public class OrderController {
@OperateLog(module="管理后台 - 生产单管理",name = "生产单api数据导入新增",type = IMPORT)
@Parameter(name = "orderNo", description = "原订单号", required = true, example = "20230809027818")
@PreAuthorize("@ss.hasPermission('production:manager-list:create')")
public CommonResult<String> getApiData(@RequestParam(value = "orderNo") String orderNo){
boolean isLocked = redisLockUtil.acquireLock(lockKey);
public CommonResult<String> getApiData(@RequestParam(value = "orderNo") String orderNo) throws InterruptedException {
// 加导入锁
String importLockValue = "syncApiImport";
String importLockKey = String.format(RedisKeyConstants.ORDER_IMPORT_LOCK_KEY, getUserOrganId());
boolean isLocked = redisLockUtil.acquireLock(importLockKey, importLockValue, chenfengCacheProperties.getLockTimeout());
if (!isLocked) {
log.error(errKey, LOCK_ERR);
return error(LOCK_ERR);
throw new ServiceException(ORDER_IMPORT_ORGAN_LOCK_ERROR);
}
Thread.sleep(20000);
Long orderId = null;
try {
orderId = (Long) identifierGenerator.nextId(null);
@@ -257,7 +263,8 @@ public class OrderController {
return error((ServiceException) cause);
} finally {
redisLockUtil.releaseLock(lockKey);
// 导入锁解锁
redisLockUtil.releaseLock(importLockKey, importLockValue);
}
}
@@ -285,11 +292,12 @@ public class OrderController {
Map<String, String> mapOrder = null;
Boolean flag = true;
boolean isLocked = redisLockUtil.acquireLock(lockKey);
// 加导入锁
String importLockValue = "syncFileImport";
String importLockKey = String.format(RedisKeyConstants.ORDER_IMPORT_LOCK_KEY, getUserOrganId());
boolean isLocked = redisLockUtil.acquireLock(importLockKey, importLockValue, chenfengCacheProperties.getLockTimeout());
if (!isLocked) {
log.error(errKey,LOCK_ERR);
throw new ServiceException(ORDER_IMPORT_ORGAN_LOCK_ERROR);
} else {
try {
if (type == 0) { //excel
@@ -404,8 +412,8 @@ public class OrderController {
}
} finally {
redisLockUtil.releaseLock(lockKey);
// 导入锁解锁
redisLockUtil.releaseLock(importLockKey, importLockValue);
}
}