From 6d1ffd43b484ab6aafaed196440cb5289333206c Mon Sep 17 00:00:00 2001 From: lijiahang Date: Wed, 27 Dec 2023 15:20:14 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E6=8E=92=E5=BA=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/orion-server-provider-api-impl.java.vm | 5 +++-- .../module/asset/service/impl/HostIdentityServiceImpl.java | 2 ++ .../ops/module/asset/service/impl/HostKeyServiceImpl.java | 2 ++ .../orion/ops/module/asset/service/impl/HostServiceImpl.java | 2 ++ .../ops/module/infra/service/impl/SystemUserServiceImpl.java | 2 ++ 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm index df894d72..aff13a6d 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm @@ -18,7 +18,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; @@ -88,7 +88,7 @@ public class ${type}ApiImpl implements ${type}Api { public List<${type}DTO> get${type}ByIdList(List idList) { log.info("${type}Api.get${type}ByIdList idList: {}", idList); if (Lists.isEmpty(idList)) { - return new ArrayList<>(); + return Lists.empty(); } // 查询 List<${type}DO> rows = ${typeLower}DAO.selectBatchIds(idList); @@ -112,6 +112,7 @@ public class ${type}ApiImpl implements ${type}Api { return ${typeLower}Service.get${type}ListByCache() .stream() .map(${type}ProviderConvert.MAPPER::to) + .sorted(Comparator.comparing(${type}DTO::getId)) .collect(Collectors.toList()); } 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 1c8ab06b..1fda1fa6 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 @@ -30,6 +30,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.Objects; @@ -131,6 +132,7 @@ public class HostIdentityServiceImpl implements HostIdentityService { // 转换 return list.stream() .map(HostIdentityConvert.MAPPER::to) + .sorted(Comparator.comparing(HostIdentityVO::getId)) .collect(Collectors.toList()); } 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 482148d0..f340059f 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.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; @@ -145,6 +146,7 @@ public class HostKeyServiceImpl implements HostKeyService { // 转换 return list.stream() .map(HostKeyConvert.MAPPER::to) + .sorted(Comparator.comparing(HostKeyVO::getId)) .collect(Collectors.toList()); } 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 67f9db59..ed67f257 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 @@ -39,6 +39,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Comparator; import java.util.List; import java.util.Set; import java.util.concurrent.Future; @@ -170,6 +171,7 @@ public class HostServiceImpl implements HostService { // 转换 return list.stream() .map(HostConvert.MAPPER::to) + .sorted(Comparator.comparing(HostVO::getId)) .collect(Collectors.toList()); } 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 c6d04c72..bbd537ce 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 @@ -34,6 +34,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; @@ -180,6 +181,7 @@ public class SystemUserServiceImpl implements SystemUserService { // 转换 return list.stream() .map(SystemUserConvert.MAPPER::to) + .sorted(Comparator.comparing(SystemUserVO::getId)) .collect(Collectors.toList()); }