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

RedisLockUtil加锁解锁方法名修复sonar.LocksNotUnlockedCheck

Browse Source
This commit is contained in:
gaoqr
2025-05-22 09:32:00 +08:00
parent e0bfeb6567
commit 2f78e41313
9 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java
+4 -4
View File
@@ -231,7 +231,7 @@ public class OrderController {
@PreAuthorize("@ss.hasPermission('production:manager-list:create')")
public CommonResult<String> getApiData(@RequestParam(value = "orderNo") String orderNo){
boolean isLocked = redisLockUtil.lock(lockKey);
boolean isLocked = redisLockUtil.acquireLock(lockKey);
if (!isLocked) {
log.error(errKey, LOCK_ERR);
return error(LOCK_ERR);
@@ -257,7 +257,7 @@ public class OrderController {
return error((ServiceException) cause);
} finally {
redisLockUtil.unlock(lockKey);
redisLockUtil.releaseLock(lockKey);
}
}
@@ -286,7 +286,7 @@ public class OrderController {
Boolean flag = true;
boolean isLocked = redisLockUtil.lock(lockKey);
boolean isLocked = redisLockUtil.acquireLock(lockKey);
if (!isLocked) {
log.error(errKey,LOCK_ERR);
@@ -405,7 +405,7 @@ public class OrderController {
} finally {
redisLockUtil.unlock(lockKey);
redisLockUtil.releaseLock(lockKey);
}
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/excel/DefaultExcelOrderImportHandler.java
+3 -3
View File
@@ -83,7 +83,7 @@ public class DefaultExcelOrderImportHandler implements AbstractExcelOrderImportH
Long taskId = createImportTask(file.getOriginalFilename());
String importLockKey = String.format(RedisKeyConstants.ORDER_IMPORT_LOCK_KEY, getUserOrganId());
// 检查机构导入锁
boolean lockResult = redisLockUtil.lock(importLockKey, String.valueOf(taskId), chenfengCacheProperties.getLockTimeout());
boolean lockResult = redisLockUtil.acquireLock(importLockKey, String.valueOf(taskId), chenfengCacheProperties.getLockTimeout());
if (!lockResult) {
throw new ServiceException(ORDER_IMPORT_ORGAN_LOCK_ERROR);
}
@@ -95,12 +95,12 @@ public class DefaultExcelOrderImportHandler implements AbstractExcelOrderImportH
EasyExcelFactory.read(inputStream, excelListener).headRowNumber(-1).sheet().doRead();
} catch (ServiceException sev) {
// 导入锁解锁
redisLockUtil.unlock(importLockKey, taskId.toString());
redisLockUtil.releaseLock(importLockKey, taskId.toString());
throw sev;
} catch (Exception e) {
log.error(ORDER_IMPORT_FILE_ANALYZE_ERROR.getMsg(), e);
// 导入锁解锁
redisLockUtil.unlock(importLockKey, taskId.toString());
redisLockUtil.releaseLock(importLockKey, taskId.toString());
throw new ServiceException(ORDER_IMPORT_FILE_ANALYZE_ERROR);
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderImport/handler/xml/DefaultXmlOrderImportHandler.java
+3 -3
View File
@@ -73,7 +73,7 @@ public class DefaultXmlOrderImportHandler implements AbstractXmlOrderImportHandl
Long taskId = createImportTask(file.getOriginalFilename());
String importLockKey = String.format(RedisKeyConstants.ORDER_IMPORT_LOCK_KEY, getUserOrganId());
// 检查机构导入锁
boolean lockResult = redisLockUtil.lock(importLockKey, String.valueOf(taskId), chenfengCacheProperties.getLockTimeout());
boolean lockResult = redisLockUtil.acquireLock(importLockKey, String.valueOf(taskId), chenfengCacheProperties.getLockTimeout());
if (!lockResult) {
throw new ServiceException(ORDER_IMPORT_ORGAN_LOCK_ERROR);
}
@@ -82,12 +82,12 @@ public class DefaultXmlOrderImportHandler implements AbstractXmlOrderImportHandl
defaultOrderImportXmlParserHandler.analyzeFile(file);
} catch (ServiceException sev) {
// 导入锁解锁
redisLockUtil.unlock(importLockKey, taskId.toString());
redisLockUtil.releaseLock(importLockKey, taskId.toString());
throw sev;
} catch (Exception e) {
log.error(ORDER_IMPORT_FILE_ANALYZE_ERROR.getMsg(), e);
// 导入锁解锁
redisLockUtil.unlock(importLockKey, taskId.toString());
redisLockUtil.releaseLock(importLockKey, taskId.toString());
throw new ServiceException(ORDER_IMPORT_FILE_ANALYZE_ERROR);
}