diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostExtraServiceImpl.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostExtraServiceImpl.java index bb7fa659..d3640719 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostExtraServiceImpl.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostExtraServiceImpl.java @@ -122,7 +122,6 @@ public class HostExtraServiceImpl implements HostExtraService { return dataExtraApi.updateExtraValue(beforeExtraItem.getId(), newExtra.serial()); } - @Override public void deleteHostKeyCallback(Long id) { diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostIdentityServiceImpl.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostIdentityServiceImpl.java index 2b139c4d..b313b130 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostIdentityServiceImpl.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostIdentityServiceImpl.java @@ -24,6 +24,7 @@ import com.orion.ops.module.asset.entity.request.host.HostIdentityCreateRequest; import com.orion.ops.module.asset.entity.request.host.HostIdentityQueryRequest; import com.orion.ops.module.asset.entity.request.host.HostIdentityUpdateRequest; import com.orion.ops.module.asset.entity.vo.HostIdentityVO; +import com.orion.ops.module.asset.service.HostExtraService; import com.orion.ops.module.asset.service.HostIdentityService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -54,6 +55,9 @@ public class HostIdentityServiceImpl implements HostIdentityService { @Resource private HostConfigDAO hostConfigDAO; + @Resource + private HostExtraService hostExtraService; + @Override public Long createHostIdentity(HostIdentityCreateRequest request) { log.info("HostIdentityService-createHostIdentity request: {}", JSON.toJSONString(request)); @@ -174,6 +178,8 @@ public class HostIdentityServiceImpl implements HostIdentityService { int effect = hostIdentityDAO.deleteById(id); // 删除主机配置 hostConfigDAO.setIdentityIdWithNull(id); + // 删除主机额外配置 + hostExtraService.deleteHostIdentityCallback(id); // 删除缓存 RedisMaps.delete(HostCacheKeyDefine.HOST_IDENTITY.getKey(), record.getId()); log.info("HostIdentityService-deleteHostIdentityById effect: {}", effect); diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostKeyServiceImpl.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostKeyServiceImpl.java index 2f4b3c80..fffe7192 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostKeyServiceImpl.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostKeyServiceImpl.java @@ -22,6 +22,7 @@ import com.orion.ops.module.asset.entity.request.host.HostKeyCreateRequest; import com.orion.ops.module.asset.entity.request.host.HostKeyQueryRequest; import com.orion.ops.module.asset.entity.request.host.HostKeyUpdateRequest; import com.orion.ops.module.asset.entity.vo.HostKeyVO; +import com.orion.ops.module.asset.service.HostExtraService; import com.orion.ops.module.asset.service.HostKeyService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -51,6 +52,9 @@ public class HostKeyServiceImpl implements HostKeyService { @Resource private HostConfigDAO hostConfigDAO; + @Resource + private HostExtraService hostExtraService; + @Override public Long createHostKey(HostKeyCreateRequest request) { log.info("HostKeyService-createHostKey request: {}", JSON.toJSONString(request)); @@ -171,6 +175,8 @@ public class HostKeyServiceImpl implements HostKeyService { hostIdentityDAO.setKeyWithNull(id); // 删除主机配置 hostConfigDAO.setKeyIdWithNull(id); + // 删除主机额外配置 + hostExtraService.deleteHostKeyCallback(id); // 删除缓存 RedisMaps.delete(HostCacheKeyDefine.HOST_KEY.getKey(), record.getId()); log.info("HostKeyService-deleteHostKeyById effect: {}", effect);