From d7b747eac4e47b41a2d35dc03a888fdebec813d3 Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Thu, 29 Aug 2024 00:33:13 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E4=B8=BB=E6=9C=BA?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/define/operator/HostOperatorType.java | 2 +- .../module/asset/service/impl/HostServiceImpl.java | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/HostOperatorType.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/HostOperatorType.java index 45cf88a4..17abbfec 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/HostOperatorType.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/HostOperatorType.java @@ -31,7 +31,7 @@ public class HostOperatorType extends InitializingOperatorTypes { return new OperatorType[]{ new OperatorType(L, CREATE, "创建主机 ${name}"), new OperatorType(L, UPDATE, "修改主机 ${name}"), - new OperatorType(H, DELETE, "删除主机 ${name}"), + new OperatorType(H, DELETE, "删除主机 ${count} 条"), new OperatorType(M, UPDATE_STATUS, "修改主机状态 ${name} - ${status}"), new OperatorType(M, UPDATE_CONFIG, "修改主机配置 ${name}"), }; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostServiceImpl.java index 3d826428..61a9e074 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostServiceImpl.java @@ -279,17 +279,10 @@ public class HostServiceImpl implements HostService { @Override public Integer deleteHostByIdList(List idList) { log.info("HostService-deleteHostByIdList idList: {}", idList); - // 查询 - List hosts = hostDAO.selectBaseByIdList(idList); - Valid.notEmpty(hosts, ErrorMessage.HOST_ABSENT); - // 添加日志参数 - String name = hosts.stream() - .map(HostDO::getName) - .collect(Collectors.joining(Const.COMMA)); - OperatorLogs.add(OperatorLogs.NAME, name); - OperatorLogs.add(OperatorLogs.COUNT, hosts.size()); // 删除 - int effect = hostDAO.deleteBatchIds(hosts); + int effect = hostDAO.deleteBatchIds(idList); + // 添加日志参数 + OperatorLogs.add(OperatorLogs.COUNT, idList.size()); log.info("HostService-deleteHostByIdList effect: {}", effect); // 删除缓存 this.clearCache();