test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-12-03 04:18:21 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix 降低分发日志更新锁范围

Browse Source
This commit is contained in:
bwcx_jzy 2022-11-25 12:34:57 +08:00
parent 5768ec6570
commit d40b91954c
No known key found for this signature in database
GPG Key ID: 5E48E9372088B9E5
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
modules/server/src/main/java/io/jpom/outgiving/OutGivingItemRun.java
View File

@ -156,13 +156,14 @@ public class OutGivingItemRun implements Callable<OutGivingNodeProject.Status> {
OutGivingNodeProject.Status status, OutGivingNodeProject.Status status,
String msg, String msg,
String userId) { String userId) {
OutGivingNodeProject finOutGivingNodeProject = null;
OutGivingModel outGivingModel;
OutGivingServer outGivingServer = SpringUtil.getBean(OutGivingServer.class);
synchronized (outGivingId.intern()) { synchronized (outGivingId.intern()) {
OutGivingServer outGivingServer = SpringUtil.getBean(OutGivingServer.class); outGivingModel = outGivingServer.getByKey(outGivingId);
OutGivingModel outGivingModel = outGivingServer.getByKey(outGivingId);
List<OutGivingNodeProject> outGivingNodeProjects = outGivingModel.outGivingNodeProjectList(); List<OutGivingNodeProject> outGivingNodeProjects = outGivingModel.outGivingNodeProjectList();
Assert.notEmpty(outGivingNodeProjects, "没有分发项目"); Assert.notEmpty(outGivingNodeProjects, "没有分发项目");
OutGivingNodeProject finOutGivingNodeProject = null;
// //
for (OutGivingNodeProject outGivingNodeProject : outGivingNodeProjects) { for (OutGivingNodeProject outGivingNodeProject : outGivingNodeProjects) {
if (!outGivingNodeProject.getProjectId().equalsIgnoreCase(outGivingNodeProjectItem.getProjectId()) || if (!outGivingNodeProject.getProjectId().equalsIgnoreCase(outGivingNodeProjectItem.getProjectId()) ||
@ -189,32 +190,32 @@ public class OutGivingItemRun implements Callable<OutGivingNodeProject.Status> {
outGivingModel1.outGivingNodeProjectList(outGivingNodeProjects); outGivingModel1.outGivingNodeProjectList(outGivingNodeProjects);
outGivingServer.update(outGivingModel1); outGivingServer.update(outGivingModel1);
} }
// 更新日志数据 }
OutGivingLog outGivingLog = new OutGivingLog(); // 更新日志数据
outGivingLog.setWorkspaceId(outGivingModel.getWorkspaceId()); OutGivingLog outGivingLog = new OutGivingLog();
outGivingLog.setId(StrUtil.emptyToDefault(logId, IdUtil.fastSimpleUUID())); outGivingLog.setWorkspaceId(outGivingModel.getWorkspaceId());
outGivingLog.setId(StrUtil.emptyToDefault(logId, IdUtil.fastSimpleUUID()));
if (finOutGivingNodeProject != null) { if (finOutGivingNodeProject != null) {
outGivingLog.setNodeId(finOutGivingNodeProject.getNodeId()); outGivingLog.setNodeId(finOutGivingNodeProject.getNodeId());
outGivingLog.setProjectId(finOutGivingNodeProject.getProjectId()); outGivingLog.setProjectId(finOutGivingNodeProject.getProjectId());
} }
outGivingLog.setModifyUser(userId); outGivingLog.setModifyUser(userId);
outGivingLog.setOutGivingId(outGivingId); outGivingLog.setOutGivingId(outGivingId);
outGivingLog.setResult(msg); outGivingLog.setResult(msg);
outGivingLog.setStatus(status.getCode()); outGivingLog.setStatus(status.getCode());
try { try {
BaseServerController.resetInfo(UserModel.EMPTY); BaseServerController.resetInfo(UserModel.EMPTY);
DbOutGivingLogService dbOutGivingLogService = SpringUtil.getBean(DbOutGivingLogService.class); DbOutGivingLogService dbOutGivingLogService = SpringUtil.getBean(DbOutGivingLogService.class);
if (status == OutGivingNodeProject.Status.Ing || status == OutGivingNodeProject.Status.Cancel) { if (status == OutGivingNodeProject.Status.Ing || status == OutGivingNodeProject.Status.Cancel) {
// 开始或者 取消都还没有记录 // 开始或者 取消都还没有记录
dbOutGivingLogService.insert(outGivingLog); dbOutGivingLogService.insert(outGivingLog);
} else { } else {
outGivingLog.setEndTime(SystemClock.now()); outGivingLog.setEndTime(SystemClock.now());
dbOutGivingLogService.update(outGivingLog); dbOutGivingLogService.update(outGivingLog);
}
} finally {
BaseServerController.removeEmpty();
} }
} finally {
BaseServerController.removeEmpty();
} }
} }
} }