From 6c056cecffc178af839a3ec582467dd0d186e703 Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Thu, 16 Nov 2023 22:24:24 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E8=BD=AC=E6=8D=A2=E9=80=BB=E8=BE=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/orion-server-module-service-impl.java.vm | 5 ++++- .../module/asset/service/impl/HostIdentityServiceImpl.java | 4 +++- .../ops/module/asset/service/impl/HostKeyServiceImpl.java | 5 ++++- .../orion/ops/module/asset/service/impl/HostServiceImpl.java | 4 +++- .../ops/module/infra/service/impl/SystemUserServiceImpl.java | 4 +++- .../orion/ops/module/infra/service/impl/TagServiceImpl.java | 5 ++++- 6 files changed, 21 insertions(+), 6 deletions(-) diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm index 5e51fada..9339f141 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm @@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.List; +import java.util.stream.Collectors; /** * $!{table.comment} 服务实现类 @@ -145,7 +146,9 @@ public class ${table.serviceImplName} implements ${table.serviceName} { // 删除屏障 RedisMaps.removeBarrier(list); // 转换 - return Lists.map(list, ${type}Convert.MAPPER::to); + return list.stream() + .map(${type}Convert.MAPPER::to) + .collect(Collectors.toList()); } #end 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 ae61a788..134263ef 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 @@ -126,7 +126,9 @@ public class HostIdentityServiceImpl implements HostIdentityService { // 删除屏障 RedisMaps.removeBarrier(list); // 转换 - return Lists.map(list, HostIdentityConvert.MAPPER::to); + return list.stream() + .map(HostIdentityConvert.MAPPER::to) + .collect(Collectors.toList()); } @Override 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 a6a84c79..9cd41145 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 @@ -29,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; +import java.util.stream.Collectors; /** * 主机秘钥 服务实现类 @@ -139,7 +140,9 @@ public class HostKeyServiceImpl implements HostKeyService { // 删除屏障 RedisMaps.removeBarrier(list); // 转换 - return Lists.map(list, HostKeyConvert.MAPPER::to); + return list.stream() + .map(HostKeyConvert.MAPPER::to) + .collect(Collectors.toList()); } @Override diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostServiceImpl.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostServiceImpl.java index 22157472..7066a76a 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostServiceImpl.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostServiceImpl.java @@ -163,7 +163,9 @@ public class HostServiceImpl implements HostService { // 删除屏障 RedisMaps.removeBarrier(list); // 转换 - return Lists.map(list, HostConvert.MAPPER::to); + return list.stream() + .map(HostConvert.MAPPER::to) + .collect(Collectors.toList()); } @Override diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemUserServiceImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemUserServiceImpl.java index d5fe03da..b27081c8 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemUserServiceImpl.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemUserServiceImpl.java @@ -172,7 +172,9 @@ public class SystemUserServiceImpl implements SystemUserService { // 删除屏障 RedisMaps.removeBarrier(list); // 转换 - return Lists.map(list, SystemUserConvert.MAPPER::to); + return list.stream() + .map(SystemUserConvert.MAPPER::to) + .collect(Collectors.toList()); } @Override diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/TagServiceImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/TagServiceImpl.java index f1c86fa5..68e90984 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/TagServiceImpl.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/TagServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; +import java.util.stream.Collectors; /** * 标签枚举 服务实现类 @@ -76,7 +77,9 @@ public class TagServiceImpl implements TagService { // 删除屏障 RedisLists.removeBarrier(list); // 转换 - return Lists.map(list, TagConvert.MAPPER::to); + return list.stream() + .map(TagConvert.MAPPER::to) + .collect(Collectors.toList()); } @Override