From c5b4c8ad8ab5ea3f44a38ddc4d57177428f58505 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 9 Oct 2024 18:39:38 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=B7=BB=E5=8A=A0=E5=AE=9E=E4=BE=8B=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1263844234592256]应用配置添加实例失败 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1263844234592256 --- .../env/SaveDeployAppConfigEnvApi.java | 4 ++- .../module/ListDeployAppConfigAppEnvApi.java | 4 ++- .../service/DeployAppConfigServiceImpl.java | 27 ++++++++----------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/env/SaveDeployAppConfigEnvApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/env/SaveDeployAppConfigEnvApi.java index b2d296d6..1b747f3c 100644 --- a/src/main/java/neatlogic/module/deploy/api/appconfig/env/SaveDeployAppConfigEnvApi.java +++ b/src/main/java/neatlogic/module/deploy/api/appconfig/env/SaveDeployAppConfigEnvApi.java @@ -109,7 +109,9 @@ public class SaveDeployAppConfigEnvApi extends PrivateApiComponentBase { List globalAttrList = globalAttrCrossoverMapper.searchGlobalAttr(globalAttrVo); if (CollectionUtils.isNotEmpty(globalAttrList)) { globalAttrVo = globalAttrList.get(0); - globalAttrItemList = globalAttrVo.getItemList(); + GlobalAttrItemVo globalAttrItemVo = new GlobalAttrItemVo(); + globalAttrItemVo.setAttrId(globalAttrVo.getId()); + globalAttrItemList = globalAttrCrossoverMapper.searchGlobalAttrItem(globalAttrItemVo); } List globalAttrItemIdList = globalAttrItemList.stream().map(GlobalAttrItemVo::getId).collect(Collectors.toList()); List notExistIdList = ListUtils.removeAll(envIdList, globalAttrItemIdList); diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/module/ListDeployAppConfigAppEnvApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/module/ListDeployAppConfigAppEnvApi.java index 93017823..b62cae56 100644 --- a/src/main/java/neatlogic/module/deploy/api/appconfig/module/ListDeployAppConfigAppEnvApi.java +++ b/src/main/java/neatlogic/module/deploy/api/appconfig/module/ListDeployAppConfigAppEnvApi.java @@ -98,7 +98,9 @@ public class ListDeployAppConfigAppEnvApi extends PrivateApiComponentBase { List globalAttrList = globalAttrCrossoverMapper.searchGlobalAttr(globalAttrVo); if (CollectionUtils.isNotEmpty(globalAttrList)) { globalAttrVo = globalAttrList.get(0); - globalAttrItemList = globalAttrVo.getItemList(); + GlobalAttrItemVo globalAttrItemVo = new GlobalAttrItemVo(); + globalAttrItemVo.setAttrId(globalAttrVo.getId()); + globalAttrItemList = globalAttrCrossoverMapper.searchGlobalAttrItem(globalAttrItemVo); } for (GlobalAttrItemVo globalAttrItemVo : globalAttrItemList) { Long id = globalAttrItemVo.getId(); diff --git a/src/main/java/neatlogic/module/deploy/service/DeployAppConfigServiceImpl.java b/src/main/java/neatlogic/module/deploy/service/DeployAppConfigServiceImpl.java index 765f40c9..506047fb 100644 --- a/src/main/java/neatlogic/module/deploy/service/DeployAppConfigServiceImpl.java +++ b/src/main/java/neatlogic/module/deploy/service/DeployAppConfigServiceImpl.java @@ -1,5 +1,7 @@ package neatlogic.module.deploy.service; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.cmdb.crossover.*; import neatlogic.framework.cmdb.dto.ci.AttrVo; import neatlogic.framework.cmdb.dto.ci.CiVo; @@ -22,8 +24,6 @@ import neatlogic.framework.dto.runner.RunnerMapVo; import neatlogic.framework.exception.runner.RunnerGroupRunnerNotFoundException; import neatlogic.framework.exception.type.ParamIrregularException; 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.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; @@ -330,21 +330,16 @@ public class DeployAppConfigServiceImpl implements DeployAppConfigService { if (envId == null) { continue; } - boolean flag = false; JSONArray valueList = new JSONArray(); - List itemList = globalAttrVo.getItemList(); - for (GlobalAttrItemVo item : itemList) { - if (Objects.equals(item.getId(), envId)) { - JSONObject jsonObj = new JSONObject(); - jsonObj.put("id", item.getId()); - jsonObj.put("value", item.getValue()); - jsonObj.put("sort", item.getSort()); - jsonObj.put("attrId", globalAttrVo.getId()); - valueList.add(jsonObj); - flag = true; - } - } - if (!flag) { + GlobalAttrItemVo globalAttrItemVo = globalAttrCrossoverMapper.getGlobalAttrItemById(envId); + if (globalAttrItemVo != null) { + JSONObject jsonObj = new JSONObject(); + jsonObj.put("id", globalAttrItemVo.getId()); + jsonObj.put("value", globalAttrItemVo.getValue()); + jsonObj.put("sort", globalAttrItemVo.getSort()); + jsonObj.put("attrId", globalAttrVo.getId()); + valueList.add(jsonObj); + } else { throw new GlobalAttrValueIrregularException(globalAttrVo, envId.toString()); } JSONObject globalAttrEntity = new JSONObject(); -- Gitee