From 1598147d3a82a633f3cd715030c3b6265b1f4c0c Mon Sep 17 00:00:00 2001 From: bayuzhen Date: Wed, 6 Nov 2024 16:46:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E8=BF=90=E7=BB=B4=E8=8E=B7=E5=8F=96ims=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E4=BA=91=E5=B9=B3=E5=8F=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bocloud/cop/service/TaskHostServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bocloud.cop.service/src/main/java/com/bocloud/cop/service/TaskHostServiceImpl.java b/bocloud.cop.service/src/main/java/com/bocloud/cop/service/TaskHostServiceImpl.java index 025ff20..0d0e207 100644 --- a/bocloud.cop.service/src/main/java/com/bocloud/cop/service/TaskHostServiceImpl.java +++ b/bocloud.cop.service/src/main/java/com/bocloud/cop/service/TaskHostServiceImpl.java @@ -588,6 +588,7 @@ public class TaskHostServiceImpl implements TaskHostService { } else { oldVendorList = taskHostRepository.listVendorId(category, TaskHostType.SourceType.IMS.name()); } + log.info("自动化运维获取ims云平台：" + JSONObject.toJSONString(oldVendorList)); // 同步获取的平台 List oldVendorIds = TaskHostDataUtil.getVendorIds(oldVendorList); // 对同步的平台数据进行处理 From e63fef0ba67c9d39e46e8549228cd247d2a8f084 Mon Sep 17 00:00:00 2001 From: bayuzhen Date: Wed, 6 Nov 2024 16:51:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E8=BF=90=E7=BB=B4=E8=B5=84=E6=BA=90=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=97=A0=E4=B8=BB=E6=9C=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bocloud/cop/enums/TaskHostType.java | 2 +- .../java/com/bocloud/cop/service/TaskHostServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bocloud.cop.entity/src/main/java/com/bocloud/cop/enums/TaskHostType.java b/bocloud.cop.entity/src/main/java/com/bocloud/cop/enums/TaskHostType.java index 87ff151..3e53797 100644 --- a/bocloud.cop.entity/src/main/java/com/bocloud/cop/enums/TaskHostType.java +++ b/bocloud.cop.entity/src/main/java/com/bocloud/cop/enums/TaskHostType.java @@ -7,7 +7,7 @@ public class TaskHostType { // IMPORT 批量导入 // CREATE 手动创建 // Salt 同步 - IMS, IMPORT, CREATE,SALT; + IMS, IMPORT, CREATE,SALT, CMP; } public static enum UpdateModel { diff --git a/bocloud.cop.service/src/main/java/com/bocloud/cop/service/TaskHostServiceImpl.java b/bocloud.cop.service/src/main/java/com/bocloud/cop/service/TaskHostServiceImpl.java index 0d0e207..c50c898 100644 --- a/bocloud.cop.service/src/main/java/com/bocloud/cop/service/TaskHostServiceImpl.java +++ b/bocloud.cop.service/src/main/java/com/bocloud/cop/service/TaskHostServiceImpl.java @@ -584,9 +584,9 @@ public class TaskHostServiceImpl implements TaskHostService { // 原有平台 List oldVendorList; if (StringUtils.isBlank(category) || TaskHostType.Category.ALL.name().equalsIgnoreCase(category)) { - oldVendorList = taskHostRepository.listVendorId(TaskHostType.SourceType.IMS.name()); + oldVendorList = taskHostRepository.listVendorId(TaskHostType.SourceType.CMP.name()); } else { - oldVendorList = taskHostRepository.listVendorId(category, TaskHostType.SourceType.IMS.name()); + oldVendorList = taskHostRepository.listVendorId(category, TaskHostType.SourceType.CMP.name()); } log.info("自动化运维获取ims云平台：" + JSONObject.toJSONString(oldVendorList)); // 同步获取的平台 From 3da66744c24fd24e69aebb0e6a0e3a0d16135a30 Mon Sep 17 00:00:00 2001 From: bayuzhen Date: Wed, 6 Nov 2024 17:00:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?Revert=20"fix=20=E4=BF=AE=E6=94=B9=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E8=BF=90=E7=BB=B4=E8=B5=84=E6=BA=90=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=97=A0=E4=B8=BB=E6=9C=BA=E4=BF=A1=E6=81=AF"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e63fef0ba67c9d39e46e8549228cd247d2a8f084. --- .../src/main/java/com/bocloud/cop/enums/TaskHostType.java | 2 +- .../java/com/bocloud/cop/service/TaskHostServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bocloud.cop.entity/src/main/java/com/bocloud/cop/enums/TaskHostType.java b/bocloud.cop.entity/src/main/java/com/bocloud/cop/enums/TaskHostType.java index 3e53797..87ff151 100644 --- a/bocloud.cop.entity/src/main/java/com/bocloud/cop/enums/TaskHostType.java +++ b/bocloud.cop.entity/src/main/java/com/bocloud/cop/enums/TaskHostType.java @@ -7,7 +7,7 @@ public class TaskHostType { // IMPORT 批量导入 // CREATE 手动创建 // Salt 同步 - IMS, IMPORT, CREATE,SALT, CMP; + IMS, IMPORT, CREATE,SALT; } public static enum UpdateModel { diff --git a/bocloud.cop.service/src/main/java/com/bocloud/cop/service/TaskHostServiceImpl.java b/bocloud.cop.service/src/main/java/com/bocloud/cop/service/TaskHostServiceImpl.java index c50c898..0d0e207 100644 --- a/bocloud.cop.service/src/main/java/com/bocloud/cop/service/TaskHostServiceImpl.java +++ b/bocloud.cop.service/src/main/java/com/bocloud/cop/service/TaskHostServiceImpl.java @@ -584,9 +584,9 @@ public class TaskHostServiceImpl implements TaskHostService { // 原有平台 List oldVendorList; if (StringUtils.isBlank(category) || TaskHostType.Category.ALL.name().equalsIgnoreCase(category)) { - oldVendorList = taskHostRepository.listVendorId(TaskHostType.SourceType.CMP.name()); + oldVendorList = taskHostRepository.listVendorId(TaskHostType.SourceType.IMS.name()); } else { - oldVendorList = taskHostRepository.listVendorId(category, TaskHostType.SourceType.CMP.name()); + oldVendorList = taskHostRepository.listVendorId(category, TaskHostType.SourceType.IMS.name()); } log.info("自动化运维获取ims云平台：" + JSONObject.toJSONString(oldVendorList)); // 同步获取的平台