From a6ab7d32e3f28062c666faf18b2db870cd61ebbf Mon Sep 17 00:00:00 2001 From: wujiawei <1207537021@qq.com> Date: Tue, 17 Sep 2024 21:32:32 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=B8=97=E9=80=8F=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=AB=AF=20=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=A3=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ntPermeateServerMappingApplicationImpl.java | 13 +++++++++++++ ...entPermeateServerMappingRepositoryImpl.java | 18 +++++++++--------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyInternalNetworkClientPermeateServerMappingApplicationImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyInternalNetworkClientPermeateServerMappingApplicationImpl.java index 2b0e136..f0140cc 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyInternalNetworkClientPermeateServerMappingApplicationImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyInternalNetworkClientPermeateServerMappingApplicationImpl.java @@ -1,5 +1,6 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application.impl; +import org.framework.lazy.cloud.network.heartbeat.server.properties.ServerNodeProperties; import org.wu.framework.database.lazy.web.plus.stereotype.LazyApplication; import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.LazyInternalNetworkClientPermeateServerMappingApplication; import org.springframework.web.bind.annotation.*; @@ -31,6 +32,10 @@ public class LazyInternalNetworkClientPermeateServerMappingApplicationImpl imple @Resource LazyInternalNetworkClientPermeateServerMappingRepository lazyInternalNetworkClientPermeateServerMappingRepository; + + @Resource + ServerNodeProperties serverNodeProperties; + /** * describe 新增客户端渗透服务端映射 * @@ -44,6 +49,8 @@ public class LazyInternalNetworkClientPermeateServerMappingApplicationImpl imple @Override public Result story(LazyInternalNetworkClientPermeateServerMappingStoryCommand lazyInternalNetworkClientPermeateServerMappingStoryCommand) { LazyInternalNetworkClientPermeateServerMapping lazyInternalNetworkClientPermeateServerMapping = LazyInternalNetworkClientPermeateServerMappingDTOAssembler.INSTANCE.toLazyInternalNetworkClientPermeateServerMapping(lazyInternalNetworkClientPermeateServerMappingStoryCommand); + String serverId = serverNodeProperties.getNodeId(); + lazyInternalNetworkClientPermeateServerMapping.setServerId(serverId); return lazyInternalNetworkClientPermeateServerMappingRepository.story(lazyInternalNetworkClientPermeateServerMapping); } /** @@ -59,6 +66,10 @@ public class LazyInternalNetworkClientPermeateServerMappingApplicationImpl imple @Override public Result> batchStory(List lazyInternalNetworkClientPermeateServerMappingStoryCommandList) { List lazyInternalNetworkClientPermeateServerMappingList = lazyInternalNetworkClientPermeateServerMappingStoryCommandList.stream().map( LazyInternalNetworkClientPermeateServerMappingDTOAssembler.INSTANCE::toLazyInternalNetworkClientPermeateServerMapping).collect(Collectors.toList()); + for (LazyInternalNetworkClientPermeateServerMapping lazyInternalNetworkClientPermeateServerMapping : lazyInternalNetworkClientPermeateServerMappingList) { + String serverId = serverNodeProperties.getNodeId(); + lazyInternalNetworkClientPermeateServerMapping.setServerId(serverId); + } return lazyInternalNetworkClientPermeateServerMappingRepository.batchStory(lazyInternalNetworkClientPermeateServerMappingList); } /** @@ -74,6 +85,8 @@ public class LazyInternalNetworkClientPermeateServerMappingApplicationImpl imple @Override public Result updateOne(LazyInternalNetworkClientPermeateServerMappingUpdateCommand lazyInternalNetworkClientPermeateServerMappingUpdateCommand) { LazyInternalNetworkClientPermeateServerMapping lazyInternalNetworkClientPermeateServerMapping = LazyInternalNetworkClientPermeateServerMappingDTOAssembler.INSTANCE.toLazyInternalNetworkClientPermeateServerMapping(lazyInternalNetworkClientPermeateServerMappingUpdateCommand); + String serverId = serverNodeProperties.getNodeId(); + lazyInternalNetworkClientPermeateServerMapping.setServerId(serverId); return lazyInternalNetworkClientPermeateServerMappingRepository.story(lazyInternalNetworkClientPermeateServerMapping); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyInternalNetworkClientPermeateServerMappingRepositoryImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyInternalNetworkClientPermeateServerMappingRepositoryImpl.java index ccf7898..a4c5534 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyInternalNetworkClientPermeateServerMappingRepositoryImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyInternalNetworkClientPermeateServerMappingRepositoryImpl.java @@ -1,19 +1,19 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructure.persistence; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructure.entity.LazyInternalNetworkClientPermeateServerMappingDO; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructure.converter.LazyInternalNetworkClientPermeateServerMappingConverter; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructure.mapper.LazyInternalNetworkClientPermeateServerMappingMapper; +import jakarta.annotation.Resource; +import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.internal.network.client.permeate.server.mapping.LazyInternalNetworkClientPermeateServerMapping; import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.internal.network.client.permeate.server.mapping.LazyInternalNetworkClientPermeateServerMappingRepository; +import org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructure.converter.LazyInternalNetworkClientPermeateServerMappingConverter; +import org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructure.entity.LazyInternalNetworkClientPermeateServerMappingDO; import org.springframework.stereotype.Repository; -import java.util.stream.Collectors; +import org.wu.framework.lazy.orm.database.lambda.domain.LazyPage; +import org.wu.framework.lazy.orm.database.lambda.stream.lambda.LazyLambdaStream; import org.wu.framework.lazy.orm.database.lambda.stream.wrapper.LazyWrappers; import org.wu.framework.web.response.Result; import org.wu.framework.web.response.ResultFactory; -import jakarta.annotation.Resource; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.internal.network.client.permeate.server.mapping.LazyInternalNetworkClientPermeateServerMapping; -import org.wu.framework.lazy.orm.database.lambda.stream.lambda.LazyLambdaStream; + import java.util.List; -import org.wu.framework.lazy.orm.database.lambda.domain.LazyPage; +import java.util.stream.Collectors; /** * describe 客户端渗透服务端映射 * @@ -128,7 +128,7 @@ public class LazyInternalNetworkClientPermeateServerMappingRepositoryImpl imple @Override public Result remove(LazyInternalNetworkClientPermeateServerMapping lazyInternalNetworkClientPermeateServerMapping) { LazyInternalNetworkClientPermeateServerMappingDO lazyInternalNetworkClientPermeateServerMappingDO = LazyInternalNetworkClientPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateServerMapping(lazyInternalNetworkClientPermeateServerMapping); - // lazyLambdaStream.delete(LazyWrappers.lambdaWrapperBean(lazyInternalNetworkClientPermeateServerMappingDO)); + lazyLambdaStream.delete(LazyWrappers.lambdaWrapperBean(lazyInternalNetworkClientPermeateServerMappingDO)); return ResultFactory.successOf(); }