diff --git a/src/main/java/neatlogic/module/autoexec/dependency/AutoexecScript2ProfileDependencyHandler.java b/src/main/java/neatlogic/module/autoexec/dependency/AutoexecScript2ProfileDependencyHandler.java index 09df21fcdaeff4bbf5ad1428eadb2f43bb9345b1..42f87be53490ad930fdf09403201bc525c806c96 100644 --- a/src/main/java/neatlogic/module/autoexec/dependency/AutoexecScript2ProfileDependencyHandler.java +++ b/src/main/java/neatlogic/module/autoexec/dependency/AutoexecScript2ProfileDependencyHandler.java @@ -1,12 +1,19 @@ package neatlogic.module.autoexec.dependency; +import com.alibaba.fastjson.JSONObject; +import neatlogic.framework.asynchronization.threadlocal.TenantContext; import neatlogic.framework.autoexec.constvalue.AutoexecFromType; +import neatlogic.framework.autoexec.dto.profile.AutoexecProfileVo; import neatlogic.framework.dependency.core.CustomDependencyHandlerBase; import neatlogic.framework.dependency.core.IFromType; import neatlogic.framework.dependency.dto.DependencyInfoVo; +import neatlogic.module.autoexec.dao.mapper.AutoexecProfileMapper; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * @author longrf @@ -15,6 +22,10 @@ import java.util.List; */ @Service public class AutoexecScript2ProfileDependencyHandler extends CustomDependencyHandlerBase { + + @Resource + AutoexecProfileMapper autoexecProfileMapper; + @Override protected String getTableName() { return "autoexec_profile_operation"; @@ -37,6 +48,24 @@ public class AutoexecScript2ProfileDependencyHandler extends CustomDependencyHan @Override protected DependencyInfoVo parse(Object dependencyObj) { + if (dependencyObj == null) { + return null; + } + if (dependencyObj instanceof Map) { + Map map = (Map) dependencyObj; + Object profileId = map.get("profile_id"); + if (profileId != null) { + AutoexecProfileVo profileVo = autoexecProfileMapper.getProfileVoById(Long.valueOf(profileId.toString())); + if (profileVo != null) { + JSONObject dependencyInfoConfig = new JSONObject(); + dependencyInfoConfig.put("profileId", profileVo.getId()); + List pathList = new ArrayList<>(); + pathList.add("预置参数集"); + String urlFormat = "/" + TenantContext.get().getTenantUuid() + "/autoexec.html#/tool-profile-manage?id=${DATA.profileId}"; + return new DependencyInfoVo(profileVo.getId(), dependencyInfoConfig, profileVo.getName(), pathList, urlFormat, this.getGroupName()); + } + } + } return null; } diff --git a/src/main/java/neatlogic/module/autoexec/dependency/AutoexecTool2ProfileDependencyHandler.java b/src/main/java/neatlogic/module/autoexec/dependency/AutoexecTool2ProfileDependencyHandler.java index e91cf2163ae82a368561e7ebf0e884b012ed570d..aef0e00afa775cebe66b78b30b235b5360f7aeb8 100644 --- a/src/main/java/neatlogic/module/autoexec/dependency/AutoexecTool2ProfileDependencyHandler.java +++ b/src/main/java/neatlogic/module/autoexec/dependency/AutoexecTool2ProfileDependencyHandler.java @@ -3,11 +3,11 @@ package neatlogic.module.autoexec.dependency; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.asynchronization.threadlocal.TenantContext; import neatlogic.framework.autoexec.constvalue.AutoexecFromType; -import neatlogic.framework.autoexec.dao.mapper.AutoexecToolMapper; -import neatlogic.framework.autoexec.dto.AutoexecToolVo; +import neatlogic.framework.autoexec.dto.profile.AutoexecProfileVo; import neatlogic.framework.dependency.core.CustomDependencyHandlerBase; import neatlogic.framework.dependency.core.IFromType; import neatlogic.framework.dependency.dto.DependencyInfoVo; +import neatlogic.module.autoexec.dao.mapper.AutoexecProfileMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -24,7 +24,7 @@ import java.util.Map; public class AutoexecTool2ProfileDependencyHandler extends CustomDependencyHandlerBase { @Resource - AutoexecToolMapper autoexecToolMapper; + AutoexecProfileMapper autoexecProfileMapper; @Override protected String getTableName() { @@ -53,16 +53,16 @@ public class AutoexecTool2ProfileDependencyHandler extends CustomDependencyHandl } if (dependencyObj instanceof Map) { Map map = (Map) dependencyObj; - Object operationId = map.get("operation_id"); - if (operationId != null) { - AutoexecToolVo tool = autoexecToolMapper.getToolById(Long.valueOf(operationId.toString())); - if (tool != null) { + Object profileId = map.get("profile_id"); + if (profileId != null) { + AutoexecProfileVo profileVo = autoexecProfileMapper.getProfileVoById(Long.valueOf(profileId.toString())); + if (profileVo != null) { JSONObject dependencyInfoConfig = new JSONObject(); - dependencyInfoConfig.put("toolId", tool.getId()); + dependencyInfoConfig.put("profileId", profileVo.getId()); List pathList = new ArrayList<>(); - pathList.add("工具库"); - String urlFormat = "/" + TenantContext.get().getTenantUuid() + "/autoexec.html#/tool-detail?id=${DATA.toolId}"; - return new DependencyInfoVo(tool.getId(), dependencyInfoConfig, tool.getName(), pathList, urlFormat, this.getGroupName()); + pathList.add("预置参数集"); + String urlFormat = "/" + TenantContext.get().getTenantUuid() + "/autoexec.html#/tool-profile-manage?id=${DATA.profileId}"; + return new DependencyInfoVo(profileVo.getId(), dependencyInfoConfig, profileVo.getName(), pathList, urlFormat, this.getGroupName()); } } }