From fba14d2cf2580a46ab6e1b291364c94214e775f5 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 25 Sep 2025 08:48:03 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B0=86=E6=B6=89?= =?UTF-8?q?=E5=8F=8Ascence=5Fipobject=5Fdetail=E8=A7=86=E5=9B=BE=E7=9A=84S?= =?UTF-8?q?QL=E8=AF=AD=E5=8F=A5=E6=94=B9=E6=88=90=E5=8A=A8=E6=80=81sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1469827334504448]将涉及scence_ipobject_detail视图的SQL语句改成动态sql http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1469827334504448 --- .../appconfig/env/GetDeployAppConfigEnvInfoApi.java | 6 +++--- .../appconfig/env/GetDeployAppEnvAutoConfigApi.java | 12 ++++++------ .../env/SearchDeployAppConfigEnvDatabaseApi.java | 8 ++++---- .../module/deploy/service/DeployJobServiceImpl.java | 5 +++-- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/env/GetDeployAppConfigEnvInfoApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/env/GetDeployAppConfigEnvInfoApi.java index 0ed0eb49..a3f10da0 100644 --- a/src/main/java/neatlogic/module/deploy/api/appconfig/env/GetDeployAppConfigEnvInfoApi.java +++ b/src/main/java/neatlogic/module/deploy/api/appconfig/env/GetDeployAppConfigEnvInfoApi.java @@ -21,7 +21,7 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.nacos.common.utils.CollectionUtils; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.cmdb.crossover.ICiEntityCrossoverMapper; -import neatlogic.framework.cmdb.crossover.IResourceCrossoverMapper; +import neatlogic.framework.cmdb.crossover.IResourceCenterResourceCrossoverService; import neatlogic.framework.cmdb.dto.cientity.CiEntityVo; import neatlogic.framework.cmdb.dto.resourcecenter.ResourceVo; import neatlogic.framework.common.constvalue.ApiParamType; @@ -109,8 +109,8 @@ public class GetDeployAppConfigEnvInfoApi extends PrivateApiComponentBase { //获取实例autoConfig if (CollectionUtils.isNotEmpty(instanceIdList)) { List instanceList = deployResourceMapper.getAppInstanceResourceListByIdList(instanceIdList); - IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); - List resourceList = resourceCrossoverMapper.getResourceListByIdList(instanceIdList); + IResourceCenterResourceCrossoverService resourceCenterResourceCrossoverService = CrossoverServiceFactory.getApi(IResourceCenterResourceCrossoverService.class); + List resourceList = resourceCenterResourceCrossoverService.getResourceListByIdList(instanceIdList); Map resourceMap = resourceList.stream().filter(Objects::nonNull).collect(Collectors.toMap(ResourceVo::getId, e -> e)); for (ResourceVo instanceVo : instanceList) { ResourceVo resourceVo = resourceMap.get(instanceVo.getId()); diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/env/GetDeployAppEnvAutoConfigApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/env/GetDeployAppEnvAutoConfigApi.java index b75da498..59793840 100644 --- a/src/main/java/neatlogic/module/deploy/api/appconfig/env/GetDeployAppEnvAutoConfigApi.java +++ b/src/main/java/neatlogic/module/deploy/api/appconfig/env/GetDeployAppEnvAutoConfigApi.java @@ -1,8 +1,10 @@ package neatlogic.module.deploy.api.appconfig.env; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.autoexec.constvalue.ParamType; -import neatlogic.framework.cmdb.crossover.IResourceCrossoverMapper; +import neatlogic.framework.cmdb.crossover.IResourceCenterResourceCrossoverService; import neatlogic.framework.cmdb.dto.resourcecenter.ResourceVo; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.crossover.CrossoverServiceFactory; @@ -16,8 +18,6 @@ import neatlogic.framework.restful.annotation.Param; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.module.deploy.dao.mapper.DeployAppConfigMapper; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -80,10 +80,10 @@ public class GetDeployAppEnvAutoConfigApi extends PrivateApiComponentBase { } } // 实例配置 - IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); - List instanceIdList = resourceCrossoverMapper.getResourceIdListByAppSystemIdAndModuleIdAndEnvId(new ResourceVo(sysId, moduleId, envId)); + IResourceCenterResourceCrossoverService resourceCenterResourceCrossoverService = CrossoverServiceFactory.getApi(IResourceCenterResourceCrossoverService.class); + List instanceIdList = resourceCenterResourceCrossoverService.getResourceIdListByAppSystemIdAndModuleIdAndEnvId(new ResourceVo(sysId, moduleId, envId)); if (CollectionUtils.isNotEmpty(instanceIdList)) { - List instanceList = resourceCrossoverMapper.getResourceListByIdList(instanceIdList); + List instanceList = resourceCenterResourceCrossoverService.getResourceListByIdList(instanceIdList); Map> configMap = configVoList.stream().filter(o -> !Objects.equals(o.getInstanceId(), 0L)) .collect(Collectors.toMap(DeployAppEnvAutoConfigVo::getInstanceId, o -> o.getKeyValueList().stream().collect(Collectors.toMap(DeployAppEnvAutoConfigKeyValueVo::getKey, DeployAppEnvAutoConfigKeyValueVo::getValue)))); for (ResourceVo vo : instanceList) { diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/env/SearchDeployAppConfigEnvDatabaseApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/env/SearchDeployAppConfigEnvDatabaseApi.java index 61a53fca..02bc3dbf 100644 --- a/src/main/java/neatlogic/module/deploy/api/appconfig/env/SearchDeployAppConfigEnvDatabaseApi.java +++ b/src/main/java/neatlogic/module/deploy/api/appconfig/env/SearchDeployAppConfigEnvDatabaseApi.java @@ -1,7 +1,8 @@ package neatlogic.module.deploy.api.appconfig.env; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; -import neatlogic.framework.cmdb.crossover.IResourceCrossoverMapper; +import neatlogic.framework.cmdb.crossover.IResourceCenterResourceCrossoverService; import neatlogic.framework.cmdb.dto.resourcecenter.ResourceVo; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.BasePageVo; @@ -13,7 +14,6 @@ import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.framework.util.TableResultUtil; import neatlogic.module.deploy.dao.mapper.DeployAppConfigMapper; -import com.alibaba.fastjson.JSONObject; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -69,8 +69,8 @@ public class SearchDeployAppConfigEnvDatabaseApi extends PrivateApiComponentBase if (count > 0) { searchVo.setRowNum(count); List databaseIdList = deployAppConfigMapper.getAppConfigEnvDatabaseResourceIdList(searchVo); - IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); - deployDBResourceVoList = resourceCrossoverMapper.getResourceListByIdList(databaseIdList); + IResourceCenterResourceCrossoverService resourceCenterResourceCrossoverService = CrossoverServiceFactory.getApi(IResourceCenterResourceCrossoverService.class); + deployDBResourceVoList = resourceCenterResourceCrossoverService.getResourceListByIdList(databaseIdList); } return TableResultUtil.getResult(deployDBResourceVoList, searchVo); } diff --git a/src/main/java/neatlogic/module/deploy/service/DeployJobServiceImpl.java b/src/main/java/neatlogic/module/deploy/service/DeployJobServiceImpl.java index 30995473..887e2054 100644 --- a/src/main/java/neatlogic/module/deploy/service/DeployJobServiceImpl.java +++ b/src/main/java/neatlogic/module/deploy/service/DeployJobServiceImpl.java @@ -37,6 +37,7 @@ import neatlogic.framework.autoexec.source.AutoexecJobSourceFactory; import neatlogic.framework.autoexec.source.IAutoexecJobSource; import neatlogic.framework.cmdb.crossover.IAppSystemMapper; import neatlogic.framework.cmdb.crossover.ICiEntityCrossoverMapper; +import neatlogic.framework.cmdb.crossover.IResourceCenterResourceCrossoverService; import neatlogic.framework.cmdb.crossover.IResourceCrossoverMapper; import neatlogic.framework.cmdb.dto.resourcecenter.ResourceVo; import neatlogic.framework.cmdb.dto.resourcecenter.entity.AppModuleVo; @@ -319,13 +320,13 @@ public class DeployJobServiceImpl implements DeployJobService { deployJobParam.setVersionId(versionVo.getId()); deployJobParam.setVersion(versionVo.getVersion()); } - IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); + IResourceCenterResourceCrossoverService resourceCenterResourceCrossoverService = CrossoverServiceFactory.getApi(IResourceCenterResourceCrossoverService.class); AutoexecCombopExecuteNodeConfigVo executeNodeConfig = new AutoexecCombopExecuteNodeConfigVo(); if (CollectionUtils.isNotEmpty(moduleVo.getSelectNodeList())) { //如果不存在resourceId则需要补充 resourceId for (AutoexecNodeVo autoexecNodeVo : moduleVo.getSelectNodeList()) { if (autoexecNodeVo.getId() == null) { - ResourceVo resourceVo = resourceCrossoverMapper.getResourceByIpAndPort(autoexecNodeVo.getIp(), autoexecNodeVo.getPort()); + ResourceVo resourceVo = resourceCenterResourceCrossoverService.getResourceByIpAndPort(autoexecNodeVo.getIp(), autoexecNodeVo.getPort()); if (resourceVo != null) { autoexecNodeVo.setId(resourceVo.getId()); autoexecNodeVo.setName(resourceVo.getName()); -- Gitee