From a0435cbef4ece936ddbb567725b8cc620c257eb3 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 27 May 2025 19:51:46 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=B7=A5=E5=85=B7-=E5=BC=95=E7=94=A8=E5=BA=93?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=B7=A5=E5=85=B7=E7=9A=84=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E8=A2=AB=E5=88=A0=E9=99=A4=E4=BA=86=EF=BC=8C=E4=BD=86=E6=98=AF?= =?UTF-8?q?=E5=BA=93=E6=96=87=E4=BB=B6=E5=B7=A5=E5=85=B7=E7=9A=84=E5=BC=95?= =?UTF-8?q?=E7=94=A8=E6=95=B0=E6=B2=A1=E6=9C=89=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1427531712921600]自定义工具-引用库文件工具的版本被删除了，但是库文件工具的引用数没有更新 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1427531712921600 --- .../module/autoexec/api/script/AutoexecScriptCopyApi.java | 5 +++++ .../module/autoexec/api/script/AutoexecScriptDeleteApi.java | 3 +++ .../module/autoexec/service/AutoexecScriptServiceImpl.java | 3 +++ 3 files changed, 11 insertions(+) diff --git a/src/main/java/neatlogic/module/autoexec/api/script/AutoexecScriptCopyApi.java b/src/main/java/neatlogic/module/autoexec/api/script/AutoexecScriptCopyApi.java index 75567cfc..34caeaee 100644 --- a/src/main/java/neatlogic/module/autoexec/api/script/AutoexecScriptCopyApi.java +++ b/src/main/java/neatlogic/module/autoexec/api/script/AutoexecScriptCopyApi.java @@ -24,10 +24,12 @@ import neatlogic.framework.autoexec.dao.mapper.AutoexecScriptMapper; import neatlogic.framework.autoexec.dto.script.*; import neatlogic.framework.autoexec.exception.AutoexecScriptNotFoundException; import neatlogic.framework.common.constvalue.ApiParamType; +import neatlogic.framework.dependency.core.DependencyManager; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.framework.util.RegexUtils; +import neatlogic.module.autoexec.dependency.AutoexecScript2ScriptDependencyHandler; import neatlogic.module.autoexec.service.AutoexecScriptService; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.BeanUtils; @@ -134,6 +136,9 @@ public class AutoexecScriptCopyApi extends PrivateApiComponentBase { } if (CollectionUtils.isNotEmpty(source.getUseLib())) { autoexecScriptMapper.insertScriptVersionUseLib(target.getId(), source.getUseLib()); + for (Long useLibId : source.getUseLib()) { + DependencyManager.insert(AutoexecScript2ScriptDependencyHandler.class, useLibId, target.getId()); + } } } if (paramList.size() > 0) { diff --git a/src/main/java/neatlogic/module/autoexec/api/script/AutoexecScriptDeleteApi.java b/src/main/java/neatlogic/module/autoexec/api/script/AutoexecScriptDeleteApi.java index 8f477a60..03d669da 100644 --- a/src/main/java/neatlogic/module/autoexec/api/script/AutoexecScriptDeleteApi.java +++ b/src/main/java/neatlogic/module/autoexec/api/script/AutoexecScriptDeleteApi.java @@ -27,11 +27,13 @@ import neatlogic.framework.autoexec.exception.AutoexecScriptVersionCannotDeleteE import neatlogic.framework.autoexec.exception.AutoexecScriptVersionHasBeenActivedException; import neatlogic.framework.autoexec.exception.AutoexecScriptVersionNotFoundException; import neatlogic.framework.common.constvalue.ApiParamType; +import neatlogic.framework.dependency.core.DependencyManager; import neatlogic.framework.dto.FieldValidResultVo; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.IValid; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; +import neatlogic.module.autoexec.dependency.AutoexecScript2ScriptDependencyHandler; import neatlogic.module.autoexec.service.AutoexecScriptService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -99,6 +101,7 @@ public class AutoexecScriptDeleteApi extends PrivateApiComponentBase { autoexecScriptMapper.deleteScriptLineByVersionId(versionId); autoexecScriptMapper.deleteVersionByVersionId(versionId); autoexecScriptMapper.deleteScriptVersionLibByScriptVersionId(versionId); + DependencyManager.delete(AutoexecScript2ScriptDependencyHandler.class, versionId); // 只剩一个版本时，直接删除整个脚本 if (hasOnlyOneVersion) { autoexecScriptMapper.deleteScriptById(version.getScriptId()); diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecScriptServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecScriptServiceImpl.java index 16b2a7a2..82fbdee7 100644 --- a/src/main/java/neatlogic/module/autoexec/service/AutoexecScriptServiceImpl.java +++ b/src/main/java/neatlogic/module/autoexec/service/AutoexecScriptServiceImpl.java @@ -620,6 +620,9 @@ public class AutoexecScriptServiceImpl implements AutoexecScriptService { if (CollectionUtils.isNotEmpty(versionIdList)) { autoexecScriptMapper.deleteParamByVersionIdList(versionIdList); autoexecScriptMapper.deleteArgumentByVersionIdList(versionIdList); + for (Long versionId : versionIdList) { + DependencyManager.delete(AutoexecScript2ScriptDependencyHandler.class, versionId); + } } //删除依赖工具关系 autoexecScriptMapper.deleteScriptVersionLibByLibScriptId(id); -- Gitee