diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/VisitorFlowApplication.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/VisitorFlowApplication.java deleted file mode 100644 index 245ba53..0000000 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/VisitorFlowApplication.java +++ /dev/null @@ -1,109 +0,0 @@ -package wu.framework.lazy.cloud.heartbeat.server.application; - -import com.wu.framework.response.Result; -import com.wu.framework.response.ResultFactory; -import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorFlow; -import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorFlowRemoveCommand; -import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorFlowStoryCommand; -import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorFlowUpdateCommand; -import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorFlowQueryListCommand; -import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorFlowQueryOneCommand; -import wu.framework.lazy.cloud.heartbeat.server.application.dto.VisitorFlowDTO; -import java.util.List; -import com.wu.framework.inner.lazy.database.expand.database.persistence.domain.LazyPage; -/** - * describe 访客端流量 - * - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - * @see com.wu.framework.inner.lazy.persistence.reverse.lazy.ddd.DefaultDDDLazyApplication - **/ - -public interface VisitorFlowApplication { - - - /** - * describe 新增访客端流量 - * - * @param visitorFlowStoryCommand 新增访客端流量 - * @return {@link Result} 访客端流量新增后领域对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - Result story(VisitorFlowStoryCommand visitorFlowStoryCommand); - - /** - * describe 批量新增访客端流量 - * - * @param visitorFlowStoryCommandList 批量新增访客端流量 - * @return {@link Result>} 访客端流量新增后领域对象集合 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - Result> batchStory(List visitorFlowStoryCommandList); - - /** - * describe 更新访客端流量 - * - * @param visitorFlowUpdateCommand 更新访客端流量 - * @return {@link Result} 访客端流量领域对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - Result updateOne(VisitorFlowUpdateCommand visitorFlowUpdateCommand); - - /** - * describe 查询单个访客端流量 - * - * @param visitorFlowQueryOneCommand 查询单个访客端流量 - * @return {@link Result} 访客端流量DTO对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - Result findOne(VisitorFlowQueryOneCommand visitorFlowQueryOneCommand); - - /** - * describe 查询多个访客端流量 - * - * @param visitorFlowQueryListCommand 查询多个访客端流量 - * @return {@link Result >} 访客端流量DTO对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - Result > findList(VisitorFlowQueryListCommand visitorFlowQueryListCommand); - - /** - * describe 分页查询多个访客端流量 - * - * @param visitorFlowQueryListCommand 分页查询多个访客端流量 - * @return {@link Result >} 分页访客端流量DTO对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - Result > findPage(int size,int current,VisitorFlowQueryListCommand visitorFlowQueryListCommand); - - /** - * describe 删除访客端流量 - * - * @param visitorFlowRemoveCommand 删除访客端流量 - * @return {@link Result} 访客端流量 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - Result remove(VisitorFlowRemoveCommand visitorFlowRemoveCommand); - -} \ No newline at end of file diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/VisitorPortFlowApplication.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/VisitorPortFlowApplication.java new file mode 100644 index 0000000..c38c6ac --- /dev/null +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/VisitorPortFlowApplication.java @@ -0,0 +1,114 @@ +package wu.framework.lazy.cloud.heartbeat.server.application; + +import com.wu.framework.response.Result; +import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.*; +import wu.framework.lazy.cloud.heartbeat.server.application.dto.VisitorFlowDTO; +import wu.framework.lazy.cloud.heartbeat.server.application.dto.VisitorPortFlowDTO; +import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorPortFlow; +import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorPortFlowStoryCommand; + +import java.util.List; +import com.wu.framework.inner.lazy.database.expand.database.persistence.domain.LazyPage; + +/** + * describe 访客端流量 + * + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + * @see com.wu.framework.inner.lazy.persistence.reverse.lazy.ddd.DefaultDDDLazyApplication + **/ + +public interface VisitorPortFlowApplication { + + + /** + * describe 新增访客端流量 + * + * @param visitorPortFlowStoryCommand 新增访客端流量 + * @return {@link Result< VisitorPortFlow >} 访客端流量新增后领域对象 + + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + Result story(VisitorPortFlowStoryCommand visitorPortFlowStoryCommand); + + /** + * describe 批量新增访客端流量 + * + * @param visitorPortFlowStoryCommandList 批量新增访客端流量 + * @return {@link Result>} 访客端流量新增后领域对象集合 + + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + Result> batchStory(List visitorPortFlowStoryCommandList); + + /** + * describe 更新访客端流量 + * + * @param visitorPortFlowUpdateCommand 更新访客端流量 + * @return {@link Result< VisitorPortFlow >} 访客端流量领域对象 + + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + Result updateOne(VisitorPortFlowUpdateCommand visitorPortFlowUpdateCommand); + + /** + * describe 查询单个访客端流量 + * + * @param visitorPortFlowQueryOneCommand 查询单个访客端流量 + * @return {@link Result< VisitorPortFlowDTO >} 访客端流量DTO对象 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + Result findOne(VisitorPortFlowQueryOneCommand visitorPortFlowQueryOneCommand); + + /** + * describe 查询多个访客端流量 + * + * @param visitorPortFlowQueryListCommand 查询多个访客端流量 + * @return {@link Result >} 访客端流量DTO对象 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + Result > findList(VisitorPortFlowQueryListCommand visitorPortFlowQueryListCommand); + + /** + * describe 分页查询多个访客端流量 + * + * @param visitorPortFlowQueryListCommand 分页查询多个访客端流量 + * @return {@link Result >} 分页访客端流量DTO对象 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + Result > findPage(int size, int current, VisitorPortFlowQueryListCommand visitorPortFlowQueryListCommand); + + /** + * describe 删除访客端流量 + * + * @param visitorPortFlowRemoveCommand 删除访客端流量 + * @return {@link Result< VisitorPortFlow >} 访客端流量 + + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + Result remove(VisitorPortFlowRemoveCommand visitorPortFlowRemoveCommand); + + + /** + * 根据客户端查询流量 + * @param size 分页大小 + * @param current 分页 + * @param visitorPortFlowQueryListCommand 查询条件 + * @return {@link Result>} 分页访客端流量DTO对象 + */ + Result> findClientFlowPage(int size, int current, VisitorPortFlowQueryListCommand visitorPortFlowQueryListCommand); +} \ No newline at end of file diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/assembler/VisitorFlowDTOAssembler.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/assembler/VisitorFlowDTOAssembler.java deleted file mode 100644 index 20868b4..0000000 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/assembler/VisitorFlowDTOAssembler.java +++ /dev/null @@ -1,93 +0,0 @@ -package wu.framework.lazy.cloud.heartbeat.server.application.assembler; - -import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorFlow; -import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorFlowRemoveCommand; -import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorFlowStoryCommand; -import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorFlowUpdateCommand; -import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorFlowQueryListCommand; -import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorFlowQueryOneCommand; -import wu.framework.lazy.cloud.heartbeat.server.application.dto.VisitorFlowDTO; -import org.mapstruct.factory.Mappers; -import org.mapstruct.Mapper; -/** - * describe 访客端流量 - * - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - * @see com.wu.framework.inner.lazy.persistence.reverse.lazy.ddd.DefaultDDDLazyAssembler - **/ -@Mapper -public interface VisitorFlowDTOAssembler { - - - /** - * describe MapStruct 创建的代理对象 - * - - - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - VisitorFlowDTOAssembler INSTANCE = Mappers.getMapper(VisitorFlowDTOAssembler.class); - /** - * describe 应用层存储入参转换成 领域对象 - * - * @param visitorFlowStoryCommand 保存访客端流量对象 - * @return {@link VisitorFlow} 访客端流量领域对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - VisitorFlow toVisitorFlow(VisitorFlowStoryCommand visitorFlowStoryCommand); - /** - * describe 应用层更新入参转换成 领域对象 - * - * @param visitorFlowUpdateCommand 更新访客端流量对象 - * @return {@link VisitorFlow} 访客端流量领域对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - VisitorFlow toVisitorFlow(VisitorFlowUpdateCommand visitorFlowUpdateCommand); - /** - * describe 应用层查询入参转换成 领域对象 - * - * @param visitorFlowQueryOneCommand 查询单个访客端流量对象参数 - * @return {@link VisitorFlow} 访客端流量领域对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - VisitorFlow toVisitorFlow(VisitorFlowQueryOneCommand visitorFlowQueryOneCommand); - /** - * describe 应用层查询入参转换成 领域对象 - * - * @param visitorFlowQueryListCommand 查询集合访客端流量对象参数 - * @return {@link VisitorFlow} 访客端流量领域对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - VisitorFlow toVisitorFlow(VisitorFlowQueryListCommand visitorFlowQueryListCommand); - /** - * describe 应用层删除入参转换成 领域对象 - * - * @param visitorFlowRemoveCommand 删除访客端流量对象参数 - * @return {@link VisitorFlow} 访客端流量领域对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - VisitorFlow toVisitorFlow(VisitorFlowRemoveCommand visitorFlowRemoveCommand); - /** - * describe 持久层领域对象转换成DTO对象 - * - * @param visitorFlow 访客端流量领域对象 - * @return {@link VisitorFlowDTO} 访客端流量DTO对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - VisitorFlowDTO fromVisitorFlow(VisitorFlow visitorFlow); -} \ No newline at end of file diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/assembler/VisitorPortFlowDTOAssembler.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/assembler/VisitorPortFlowDTOAssembler.java new file mode 100644 index 0000000..432c896 --- /dev/null +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/assembler/VisitorPortFlowDTOAssembler.java @@ -0,0 +1,87 @@ +package wu.framework.lazy.cloud.heartbeat.server.application.assembler; + +import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.*; +import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorPortFlow; +import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorPortFlowQueryListCommand; +import wu.framework.lazy.cloud.heartbeat.server.application.dto.VisitorPortFlowDTO; +import org.mapstruct.factory.Mappers; +import org.mapstruct.Mapper; + +/** + * describe 访客端流量 + * + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + * @see com.wu.framework.inner.lazy.persistence.reverse.lazy.ddd.DefaultDDDLazyAssembler + **/ +@Mapper +public interface VisitorPortFlowDTOAssembler { + + + /** + * describe MapStruct 创建的代理对象 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + VisitorPortFlowDTOAssembler INSTANCE = Mappers.getMapper(VisitorPortFlowDTOAssembler.class); + /** + * describe 应用层存储入参转换成 领域对象 + * + * @param visitorPortFlowStoryCommand 保存访客端流量对象 + * @return {@link VisitorPortFlow} 访客端流量领域对象 + + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + VisitorPortFlow toVisitorFlow(VisitorPortFlowStoryCommand visitorPortFlowStoryCommand); + /** + * describe 应用层更新入参转换成 领域对象 + * + * @param visitorPortFlowUpdateCommand 更新访客端流量对象 + * @return {@link VisitorPortFlow} 访客端流量领域对象 + + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + VisitorPortFlow toVisitorFlow(VisitorPortFlowUpdateCommand visitorPortFlowUpdateCommand); + /** + * describe 应用层查询入参转换成 领域对象 + * + * @param visitorPortFlowQueryOneCommand 查询单个访客端流量对象参数 + * @return {@link VisitorPortFlow} 访客端流量领域对象 + + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + VisitorPortFlow toVisitorFlow(VisitorPortFlowQueryOneCommand visitorPortFlowQueryOneCommand); + /** + * describe 应用层查询入参转换成 领域对象 + * + * @param visitorPortFlowQueryListCommand 查询集合访客端流量对象参数 + * @return {@link VisitorPortFlow} 访客端流量领域对象 + + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + VisitorPortFlow toVisitorFlow(VisitorPortFlowQueryListCommand visitorPortFlowQueryListCommand); + /** + * describe 应用层删除入参转换成 领域对象 + * + * @param visitorPortFlowRemoveCommand 删除访客端流量对象参数 + * @return {@link VisitorPortFlow} 访客端流量领域对象 + + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + VisitorPortFlow toVisitorFlow(VisitorPortFlowRemoveCommand visitorPortFlowRemoveCommand); + /** + * describe 持久层领域对象转换成DTO对象 + * + * @param visitorPortFlow 访客端流量领域对象 + * @return {@link VisitorPortFlowDTO} 访客端流量DTO对象 + + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + VisitorPortFlowDTO fromVisitorFlow(VisitorPortFlow visitorPortFlow); +} \ No newline at end of file diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorFlowQueryListCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorPortFlowQueryListCommand.java similarity index 92% rename from wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorFlowQueryListCommand.java rename to wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorPortFlowQueryListCommand.java index ecc0d84..e1f4062 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorFlowQueryListCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorPortFlowQueryListCommand.java @@ -17,8 +17,8 @@ import java.lang.Boolean; **/ @Data @Accessors(chain = true) -@Schema(title = "visitor_flow_query_List_command",description = "访客端流量") -public class VisitorFlowQueryListCommand { +@Schema(title = "visitor_port_flow_query_List_command",description = "访客端流量") +public class VisitorPortFlowQueryListCommand { /** diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorFlowQueryOneCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorPortFlowQueryOneCommand.java similarity index 93% rename from wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorFlowQueryOneCommand.java rename to wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorPortFlowQueryOneCommand.java index 600a5f2..ea50528 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorFlowQueryOneCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorPortFlowQueryOneCommand.java @@ -17,8 +17,8 @@ import java.lang.Boolean; **/ @Data @Accessors(chain = true) -@Schema(title = "visitor_flow_query_one_command",description = "访客端流量") -public class VisitorFlowQueryOneCommand { +@Schema(title = "visitor_port_flow_query_one_command",description = "访客端流量") +public class VisitorPortFlowQueryOneCommand { /** diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorFlowRemoveCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorPortFlowRemoveCommand.java similarity index 93% rename from wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorFlowRemoveCommand.java rename to wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorPortFlowRemoveCommand.java index b169f2e..82cd7b9 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorFlowRemoveCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorPortFlowRemoveCommand.java @@ -17,8 +17,8 @@ import java.lang.Boolean; **/ @Data @Accessors(chain = true) -@Schema(title = "visitor_flow_remove_command",description = "访客端流量") -public class VisitorFlowRemoveCommand { +@Schema(title = "visitor_port_flow_remove_command",description = "访客端流量") +public class VisitorPortFlowRemoveCommand { /** diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorFlowStoryCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorPortFlowStoryCommand.java similarity index 93% rename from wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorFlowStoryCommand.java rename to wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorPortFlowStoryCommand.java index 2643781..1c7f74b 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorFlowStoryCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorPortFlowStoryCommand.java @@ -17,8 +17,8 @@ import java.lang.Boolean; **/ @Data @Accessors(chain = true) -@Schema(title = "visitor_flow_story_command",description = "访客端流量") -public class VisitorFlowStoryCommand { +@Schema(title = "visitor_port_flow_story_command",description = "访客端流量") +public class VisitorPortFlowStoryCommand { /** diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorFlowUpdateCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorPortFlowUpdateCommand.java similarity index 93% rename from wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorFlowUpdateCommand.java rename to wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorPortFlowUpdateCommand.java index 5d265ff..45dc357 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorFlowUpdateCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/command/visitor/flow/VisitorPortFlowUpdateCommand.java @@ -17,8 +17,8 @@ import java.lang.Boolean; **/ @Data @Accessors(chain = true) -@Schema(title = "visitor_flow_update_command",description = "访客端流量") -public class VisitorFlowUpdateCommand { +@Schema(title = "visitor_port_flow_update_command",description = "访客端流量") +public class VisitorPortFlowUpdateCommand { /** diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/dto/VisitorFlowDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/dto/VisitorFlowDTO.java index a2e7480..2341103 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/dto/VisitorFlowDTO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/dto/VisitorFlowDTO.java @@ -1,80 +1,66 @@ package wu.framework.lazy.cloud.heartbeat.server.application.dto; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; -import io.swagger.v3.oas.annotations.media.Schema; -import java.lang.String; + import java.time.LocalDateTime; -import java.lang.Long; -import java.lang.Integer; -import java.lang.Boolean; +import java.util.List; + /** - * describe 访客端流量 + * describe 访客端流量 * * @author Jia wei Wu * @date 2024/01/24 05:19 下午 - * @see com.wu.framework.inner.lazy.persistence.reverse.lazy.ddd.DefaultDDDLazyDTO + * @see com.wu.framework.inner.lazy.persistence.reverse.lazy.ddd.DefaultDDDLazyDTO **/ @Data @Accessors(chain = true) -@Schema(title = "visitor_flow_command_dto",description = "访客端流量") +@Schema(title = "visitor_port_flow_command_dto", description = "访客端流量") public class VisitorFlowDTO { /** - * * 客户端ID */ - @Schema(description ="客户端ID",name ="clientId",example = "") + @Schema(description = "客户端ID", name = "clientId", example = "") private String clientId; /** - * * 创建时间 */ - @Schema(description ="创建时间",name ="createTime",example = "") + @Schema(description = "创建时间", name = "createTime", example = "") private LocalDateTime createTime; /** - * * 主键 */ - @Schema(description ="主键",name ="id",example = "") + @Schema(description = "主键", name = "id", example = "") private Long id; /** - * * 当前访客当前进口流量 */ - @Schema(description ="当前访客当前进口流量",name ="inFlow",example = "") + @Schema(description = "当前访客当前进口流量", name = "inFlow", example = "") private Integer inFlow; - /** - * - * 是否删除 - */ - @Schema(description ="是否删除",name ="isDeleted",example = "") - private Boolean isDeleted; /** - * * 当前访客出口流量 */ - @Schema(description ="当前访客出口流量",name ="outFlow",example = "") + @Schema(description = "当前访客出口流量", name = "outFlow", example = "") private Integer outFlow; /** - * * 修改时间 */ - @Schema(description ="修改时间",name ="updateTime",example = "") + @Schema(description = "修改时间", name = "updateTime", example = "") private LocalDateTime updateTime; /** - * - * 访客端口 + * 当前访客下所有端口的流量 */ - @Schema(description ="访客端口",name ="visitorPort",example = "") - private Integer visitorPort; + @Schema(description = "当前访客下所有端口的流量") + private List visitorPortFlowDTOList; } \ No newline at end of file diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/dto/VisitorPortFlowDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/dto/VisitorPortFlowDTO.java new file mode 100644 index 0000000..c0b1903 --- /dev/null +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/dto/VisitorPortFlowDTO.java @@ -0,0 +1,80 @@ +package wu.framework.lazy.cloud.heartbeat.server.application.dto; + +import lombok.Data; +import lombok.experimental.Accessors; +import io.swagger.v3.oas.annotations.media.Schema; +import java.lang.String; +import java.time.LocalDateTime; +import java.lang.Long; +import java.lang.Integer; +import java.lang.Boolean; +/** + * describe 访客端流量 + * + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + * @see com.wu.framework.inner.lazy.persistence.reverse.lazy.ddd.DefaultDDDLazyDTO + **/ +@Data +@Accessors(chain = true) +@Schema(title = "visitor_port_flow_command_dto",description = "访客端流量") +public class VisitorPortFlowDTO { + + + /** + * + * 客户端ID + */ + @Schema(description ="客户端ID",name ="clientId",example = "") + private String clientId; + + /** + * + * 创建时间 + */ + @Schema(description ="创建时间",name ="createTime",example = "") + private LocalDateTime createTime; + + /** + * + * 主键 + */ + @Schema(description ="主键",name ="id",example = "") + private Long id; + + /** + * + * 当前访客当前进口流量 + */ + @Schema(description ="当前访客当前进口流量",name ="inFlow",example = "") + private Integer inFlow; + + /** + * + * 是否删除 + */ + @Schema(description ="是否删除",name ="isDeleted",example = "") + private Boolean isDeleted; + + /** + * + * 当前访客出口流量 + */ + @Schema(description ="当前访客出口流量",name ="outFlow",example = "") + private Integer outFlow; + + /** + * + * 修改时间 + */ + @Schema(description ="修改时间",name ="updateTime",example = "") + private LocalDateTime updateTime; + + /** + * + * 访客端口 + */ + @Schema(description ="访客端口",name ="visitorPort",example = "") + private Integer visitorPort; + +} \ No newline at end of file diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/impl/VisitorFlowApplicationImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/impl/VisitorFlowApplicationImpl.java deleted file mode 100644 index e21601f..0000000 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/impl/VisitorFlowApplicationImpl.java +++ /dev/null @@ -1,144 +0,0 @@ -package wu.framework.lazy.cloud.heartbeat.server.application.impl; - -import com.wu.framework.database.lazy.web.plus.stereotype.LazyApplication; -import wu.framework.lazy.cloud.heartbeat.server.application.VisitorFlowApplication; -import org.springframework.web.bind.annotation.*; -import com.wu.framework.response.Result; -import com.wu.framework.response.ResultFactory; -import org.springframework.beans.factory.annotation.Autowired; -import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorFlow; -import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorFlowRemoveCommand; -import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorFlowStoryCommand; -import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorFlowUpdateCommand; -import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorFlowQueryListCommand; -import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorFlowQueryOneCommand; -import wu.framework.lazy.cloud.heartbeat.server.application.assembler.VisitorFlowDTOAssembler; -import wu.framework.lazy.cloud.heartbeat.server.application.dto.VisitorFlowDTO; -import java.util.stream.Collectors; -import jakarta.annotation.Resource; -import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorFlowRepository; -import java.util.List; -import com.wu.framework.inner.lazy.database.expand.database.persistence.domain.LazyPage; -/** - * describe 访客端流量 - * - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - * @see com.wu.framework.inner.lazy.persistence.reverse.lazy.ddd.DefaultDDDLazyApplicationImpl - **/ -@LazyApplication -public class VisitorFlowApplicationImpl implements VisitorFlowApplication { - - @Resource - VisitorFlowRepository visitorFlowRepository; - /** - * describe 新增访客端流量 - * - * @param visitorFlowStoryCommand 新增访客端流量 - * @return {@link Result} 访客端流量新增后领域对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - @Override - public Result story(VisitorFlowStoryCommand visitorFlowStoryCommand) { - VisitorFlow visitorFlow = VisitorFlowDTOAssembler.INSTANCE.toVisitorFlow(visitorFlowStoryCommand); - return visitorFlowRepository.story(visitorFlow); - } - /** - * describe 批量新增访客端流量 - * - * @param visitorFlowStoryCommandList 批量新增访客端流量 - * @return {@link Result>} 访客端流量新增后领域对象集合 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - @Override - public Result> batchStory(List visitorFlowStoryCommandList) { - List visitorFlowList = visitorFlowStoryCommandList.stream().map( VisitorFlowDTOAssembler.INSTANCE::toVisitorFlow).collect(Collectors.toList()); - return visitorFlowRepository.batchStory(visitorFlowList); - } - /** - * describe 更新访客端流量 - * - * @param visitorFlowUpdateCommand 更新访客端流量 - * @return {@link Result} 访客端流量领域对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - @Override - public Result updateOne(VisitorFlowUpdateCommand visitorFlowUpdateCommand) { - VisitorFlow visitorFlow = VisitorFlowDTOAssembler.INSTANCE.toVisitorFlow(visitorFlowUpdateCommand); - return visitorFlowRepository.story(visitorFlow); - } - - /** - * describe 查询单个访客端流量 - * - * @param visitorFlowQueryOneCommand 查询单个访客端流量 - * @return {@link Result} 访客端流量DTO对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - @Override - public Result findOne(VisitorFlowQueryOneCommand visitorFlowQueryOneCommand) { - VisitorFlow visitorFlow = VisitorFlowDTOAssembler.INSTANCE.toVisitorFlow(visitorFlowQueryOneCommand); - return visitorFlowRepository.findOne(visitorFlow).convert(VisitorFlowDTOAssembler.INSTANCE::fromVisitorFlow); - } - - /** - * describe 查询多个访客端流量 - * - * @param visitorFlowQueryListCommand 查询多个访客端流量 - * @return {@link Result>} 访客端流量DTO对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - @Override - public Result> findList(VisitorFlowQueryListCommand visitorFlowQueryListCommand) { - VisitorFlow visitorFlow = VisitorFlowDTOAssembler.INSTANCE.toVisitorFlow(visitorFlowQueryListCommand); - return visitorFlowRepository.findList(visitorFlow) .convert(visitorFlows -> visitorFlows.stream().map(VisitorFlowDTOAssembler.INSTANCE::fromVisitorFlow).collect(Collectors.toList())) ; - } - - /** - * describe 分页查询多个访客端流量 - * - * @param visitorFlowQueryListCommand 分页查询多个访客端流量 - * @return {@link Result>} 分页访客端流量DTO对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - @Override - public Result> findPage(int size,int current,VisitorFlowQueryListCommand visitorFlowQueryListCommand) { - VisitorFlow visitorFlow = VisitorFlowDTOAssembler.INSTANCE.toVisitorFlow(visitorFlowQueryListCommand); - return visitorFlowRepository.findPage(size,current,visitorFlow) .convert(page -> page.convert(VisitorFlowDTOAssembler.INSTANCE::fromVisitorFlow)) ; - } - - /** - * describe 删除访客端流量 - * - * @param visitorFlowRemoveCommand 删除访客端流量 - * @return {@link Result} 访客端流量 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - @Override - public Result remove(VisitorFlowRemoveCommand visitorFlowRemoveCommand) { - VisitorFlow visitorFlow = VisitorFlowDTOAssembler.INSTANCE.toVisitorFlow(visitorFlowRemoveCommand); - return visitorFlowRepository.remove(visitorFlow); - } - -} \ No newline at end of file diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/impl/VisitorPortFlowApplicationImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/impl/VisitorPortFlowApplicationImpl.java new file mode 100644 index 0000000..ce0a2ad --- /dev/null +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/application/impl/VisitorPortFlowApplicationImpl.java @@ -0,0 +1,186 @@ +package wu.framework.lazy.cloud.heartbeat.server.application.impl; + +import com.wu.framework.database.lazy.web.plus.stereotype.LazyApplication; +import wu.framework.lazy.cloud.heartbeat.server.application.VisitorPortFlowApplication; +import com.wu.framework.response.Result; +import wu.framework.lazy.cloud.heartbeat.server.application.assembler.VisitorPortFlowDTOAssembler; +import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.*; +import wu.framework.lazy.cloud.heartbeat.server.application.dto.VisitorFlowDTO; +import wu.framework.lazy.cloud.heartbeat.server.application.dto.VisitorPortFlowDTO; +import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorPortFlow; +import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorPortFlowQueryListCommand; + +import java.util.ArrayList; +import java.util.Map; +import java.util.stream.Collectors; + +import jakarta.annotation.Resource; +import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorPortFlowRepository; + +import java.util.List; + +import com.wu.framework.inner.lazy.database.expand.database.persistence.domain.LazyPage; + +/** + * describe 访客端流量 + * + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + * @see com.wu.framework.inner.lazy.persistence.reverse.lazy.ddd.DefaultDDDLazyApplicationImpl + **/ +@LazyApplication +public class VisitorPortFlowApplicationImpl implements VisitorPortFlowApplication { + + @Resource + VisitorPortFlowRepository visitorPortFlowRepository; + + /** + * describe 新增访客端流量 + * + * @param visitorPortFlowStoryCommand 新增访客端流量 + * @return {@link Result< VisitorPortFlow >} 访客端流量新增后领域对象 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + @Override + public Result story(VisitorPortFlowStoryCommand visitorPortFlowStoryCommand) { + VisitorPortFlow visitorPortFlow = VisitorPortFlowDTOAssembler.INSTANCE.toVisitorFlow(visitorPortFlowStoryCommand); + return visitorPortFlowRepository.story(visitorPortFlow); + } + + /** + * describe 批量新增访客端流量 + * + * @param visitorPortFlowStoryCommandList 批量新增访客端流量 + * @return {@link Result>} 访客端流量新增后领域对象集合 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + @Override + public Result> batchStory(List visitorPortFlowStoryCommandList) { + List visitorPortFlowList = visitorPortFlowStoryCommandList.stream().map(VisitorPortFlowDTOAssembler.INSTANCE::toVisitorFlow).collect(Collectors.toList()); + return visitorPortFlowRepository.batchStory(visitorPortFlowList); + } + + /** + * describe 更新访客端流量 + * + * @param visitorPortFlowUpdateCommand 更新访客端流量 + * @return {@link Result< VisitorPortFlow >} 访客端流量领域对象 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + @Override + public Result updateOne(VisitorPortFlowUpdateCommand visitorPortFlowUpdateCommand) { + VisitorPortFlow visitorPortFlow = VisitorPortFlowDTOAssembler.INSTANCE.toVisitorFlow(visitorPortFlowUpdateCommand); + return visitorPortFlowRepository.story(visitorPortFlow); + } + + /** + * describe 查询单个访客端流量 + * + * @param visitorPortFlowQueryOneCommand 查询单个访客端流量 + * @return {@link Result< VisitorFlowDTO >} 访客端流量DTO对象 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + @Override + public Result findOne(VisitorPortFlowQueryOneCommand visitorPortFlowQueryOneCommand) { + VisitorPortFlow visitorPortFlow = VisitorPortFlowDTOAssembler.INSTANCE.toVisitorFlow(visitorPortFlowQueryOneCommand); + return visitorPortFlowRepository.findOne(visitorPortFlow).convert(VisitorPortFlowDTOAssembler.INSTANCE::fromVisitorFlow); + } + + /** + * describe 查询多个访客端流量 + * + * @param visitorFlowQueryListCommand 查询多个访客端流量 + * @return {@link Result>} 访客端流量DTO对象 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + @Override + public Result> findList(VisitorPortFlowQueryListCommand visitorFlowQueryListCommand) { + VisitorPortFlow visitorPortFlow = VisitorPortFlowDTOAssembler.INSTANCE.toVisitorFlow(visitorFlowQueryListCommand); + return visitorPortFlowRepository.findList(visitorPortFlow).convert(visitorFlows -> visitorFlows.stream().map(VisitorPortFlowDTOAssembler.INSTANCE::fromVisitorFlow).collect(Collectors.toList())); + } + + /** + * describe 分页查询多个访客端流量 + * + * @param visitorPortFlowQueryListCommand 分页查询多个访客端流量 + * @return {@link Result>} 分页访客端流量DTO对象 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + @Override + public Result> findPage(int size, int current, VisitorPortFlowQueryListCommand visitorPortFlowQueryListCommand) { + VisitorPortFlow visitorPortFlow = VisitorPortFlowDTOAssembler.INSTANCE.toVisitorFlow(visitorPortFlowQueryListCommand); + return visitorPortFlowRepository.findPage(size, current, visitorPortFlow).convert(page -> page.convert(VisitorPortFlowDTOAssembler.INSTANCE::fromVisitorFlow)); + } + + /** + * describe 删除访客端流量 + * + * @param visitorPortFlowRemoveCommand 删除访客端流量 + * @return {@link Result< VisitorPortFlow >} 访客端流量 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + @Override + public Result remove(VisitorPortFlowRemoveCommand visitorPortFlowRemoveCommand) { + VisitorPortFlow visitorPortFlow = VisitorPortFlowDTOAssembler.INSTANCE.toVisitorFlow(visitorPortFlowRemoveCommand); + return visitorPortFlowRepository.remove(visitorPortFlow); + } + + /** + * 根据客户端查询流量 + * + * @param size 分页大小 + * @param current 分页 + * @param visitorPortFlowQueryListCommand 查询条件 + * @return {@link Result>} 分页访客端流量DTO对象 + */ + @Override + public Result> findClientFlowPage(int size, int current, VisitorPortFlowQueryListCommand visitorPortFlowQueryListCommand) { + VisitorPortFlow visitorPortFlow = VisitorPortFlowDTOAssembler.INSTANCE.toVisitorFlow(visitorPortFlowQueryListCommand); + return visitorPortFlowRepository.findPageGroupByClientId(size, current, visitorPortFlow).convert(visitorPortFlowLazyPage -> { + List clientIdList = visitorPortFlowLazyPage.getRecord().stream().map(VisitorPortFlow::getClientId).toList(); + List visitorPortFlowList = visitorPortFlowRepository.findListByClientIds(clientIdList); + + + // 根据客户端进行分组 + + List visitorPortFlowDTOList = visitorPortFlowList.stream().map(VisitorPortFlowDTOAssembler.INSTANCE::fromVisitorFlow).toList(); + + + Map> client_port_flow_map = visitorPortFlowDTOList.stream().collect(Collectors.groupingBy(visitorPortFlowDTO -> visitorPortFlowDTO.getClientId())); + + Map client_in_flow = visitorPortFlowDTOList.stream() + .collect( + Collectors.groupingBy(VisitorPortFlowDTO::getClientId, + Collectors.summingInt(VisitorPortFlowDTO::getInFlow))); + + Map client_out_flow = visitorPortFlowDTOList.stream() + .collect( + Collectors.groupingBy(VisitorPortFlowDTO::getClientId, + Collectors.summingInt(VisitorPortFlowDTO::getOutFlow))); + + return visitorPortFlowLazyPage.convert(visitorPortFlow1 -> { + String clientId = visitorPortFlow1.getClientId(); + VisitorFlowDTO visitorFlowDTO = new VisitorFlowDTO(); + visitorFlowDTO.setClientId(clientId); + visitorFlowDTO.setInFlow(client_in_flow.getOrDefault(clientId, 0)); + visitorFlowDTO.setOutFlow(client_out_flow.getOrDefault(clientId, 0)); + visitorFlowDTO.setVisitorPortFlowDTOList(client_port_flow_map.getOrDefault(clientId, new ArrayList<>())); + return visitorFlowDTO; + }); + }); + } +} \ No newline at end of file diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/controller/VisitorFlowProvider.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/controller/VisitorFlowProvider.java deleted file mode 100644 index bc19b1f..0000000 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/controller/VisitorFlowProvider.java +++ /dev/null @@ -1,142 +0,0 @@ -package wu.framework.lazy.cloud.heartbeat.server.controller; - -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import com.wu.framework.inner.layer.web.EasyController; -import org.springframework.web.bind.annotation.*; -import com.wu.framework.response.Result; -import com.wu.framework.response.ResultFactory; -import org.springframework.beans.factory.annotation.Autowired; -import jakarta.annotation.Resource; -import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorFlow; -import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorFlowRemoveCommand; -import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorFlowStoryCommand; -import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorFlowUpdateCommand; -import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorFlowQueryListCommand; -import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.VisitorFlowQueryOneCommand; -import wu.framework.lazy.cloud.heartbeat.server.application.VisitorFlowApplication; -import wu.framework.lazy.cloud.heartbeat.server.application.dto.VisitorFlowDTO; -import java.util.List; -import com.wu.framework.inner.lazy.database.expand.database.persistence.domain.LazyPage; -/** - * describe 访客端流量 - * - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - * @see com.wu.framework.inner.lazy.persistence.reverse.lazy.ddd.DefaultDDDLazyController - **/ -@Tag(name = "访客端流量提供者") -@EasyController("/visitor/flow") -public class VisitorFlowProvider { - - @Resource - private VisitorFlowApplication visitorFlowApplication; - - /** - * describe 新增访客端流量 - * - * @param visitorFlowStoryCommand 新增访客端流量 - * @return {@link Result} 访客端流量新增后领域对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - @Operation(summary = "新增访客端流量") - @PostMapping("/story") - public Result story(@RequestBody VisitorFlowStoryCommand visitorFlowStoryCommand){ - return visitorFlowApplication.story(visitorFlowStoryCommand); - } - /** - * describe 批量新增访客端流量 - * - * @param visitorFlowStoryCommandList 批量新增访客端流量 - * @return {@link Result>} 访客端流量新增后领域对象集合 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - @Operation(summary = "批量新增访客端流量") - @PostMapping("/batchStory") - public Result> batchStory(@RequestBody List visitorFlowStoryCommandList){ - return visitorFlowApplication.batchStory(visitorFlowStoryCommandList); - } - /** - * describe 更新访客端流量 - * - * @param visitorFlowUpdateCommand 更新访客端流量 - * @return {@link Result} 访客端流量领域对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - @Operation(summary = "更新访客端流量") - @PutMapping("/updateOne") - public Result updateOne(@RequestBody VisitorFlowUpdateCommand visitorFlowUpdateCommand){ - return visitorFlowApplication.updateOne(visitorFlowUpdateCommand); - } - /** - * describe 查询单个访客端流量 - * - * @param visitorFlowQueryOneCommand 查询单个访客端流量 - * @return {@link Result} 访客端流量DTO对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - @Operation(summary = "查询单个访客端流量") - @GetMapping("/findOne") - public Result findOne(@ModelAttribute VisitorFlowQueryOneCommand visitorFlowQueryOneCommand){ - return visitorFlowApplication.findOne(visitorFlowQueryOneCommand); - } - /** - * describe 查询多个访客端流量 - * - * @param visitorFlowQueryListCommand 查询多个访客端流量 - * @return {@link Result>} 访客端流量DTO对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - @Operation(summary = "查询多个访客端流量") - @GetMapping("/findList") - public Result> findList(@ModelAttribute VisitorFlowQueryListCommand visitorFlowQueryListCommand){ - return visitorFlowApplication.findList(visitorFlowQueryListCommand); - } - /** - * describe 分页查询多个访客端流量 - * - * @param visitorFlowQueryListCommand 分页查询多个访客端流量 - * @return {@link Result>} 分页访客端流量DTO对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - @Operation(summary = "分页查询多个访客端流量") - @GetMapping("/findPage") - public Result> findPage(@Parameter(description ="分页大小") @RequestParam(defaultValue = "10", value = "size") int size, - @Parameter(description ="当前页数") @RequestParam(defaultValue = "1", value = "current") int current,@ModelAttribute VisitorFlowQueryListCommand visitorFlowQueryListCommand){ - return visitorFlowApplication.findPage(size,current,visitorFlowQueryListCommand); - } - /** - * describe 删除访客端流量 - * - * @param visitorFlowRemoveCommand 删除访客端流量 - * @return {@link Result} 访客端流量 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - @Operation(summary = "删除访客端流量") - @DeleteMapping("/remove") - public Result remove(@ModelAttribute VisitorFlowRemoveCommand visitorFlowRemoveCommand){ - return visitorFlowApplication.remove(visitorFlowRemoveCommand); - } -} \ No newline at end of file diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/controller/VisitorPortFlowProvider.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/controller/VisitorPortFlowProvider.java new file mode 100644 index 0000000..46c42fe --- /dev/null +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/controller/VisitorPortFlowProvider.java @@ -0,0 +1,154 @@ +package wu.framework.lazy.cloud.heartbeat.server.controller; + +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import com.wu.framework.inner.layer.web.EasyController; +import org.springframework.web.bind.annotation.*; +import com.wu.framework.response.Result; +import jakarta.annotation.Resource; + +import wu.framework.lazy.cloud.heartbeat.server.application.VisitorPortFlowApplication; + +import java.util.List; +import com.wu.framework.inner.lazy.database.expand.database.persistence.domain.LazyPage; +import wu.framework.lazy.cloud.heartbeat.server.application.command.visitor.flow.*; +import wu.framework.lazy.cloud.heartbeat.server.application.dto.VisitorFlowDTO; +import wu.framework.lazy.cloud.heartbeat.server.application.dto.VisitorPortFlowDTO; +import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorPortFlow; + +/** + * describe 访客端流量 + * + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + * @see com.wu.framework.inner.lazy.persistence.reverse.lazy.ddd.DefaultDDDLazyController + **/ +@Tag(name = "访客端流量提供者") +@EasyController("/visitor/port/flow") +public class VisitorPortFlowProvider { + + @Resource + private VisitorPortFlowApplication visitorPortFlowApplication; + + /** + * describe 新增访客端流量 + * + * @param visitorPortFlowStoryCommand 新增访客端流量 + * @return {@link Result< VisitorPortFlow >} 访客端流量新增后领域对象 + + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + @Operation(summary = "新增访客端流量") + @PostMapping("/story") + public Result story(@RequestBody VisitorPortFlowStoryCommand visitorPortFlowStoryCommand){ + return visitorPortFlowApplication.story(visitorPortFlowStoryCommand); + } + /** + * describe 批量新增访客端流量 + * + * @param visitorPortFlowStoryCommandList 批量新增访客端流量 + * @return {@link Result>} 访客端流量新增后领域对象集合 + + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + @Operation(summary = "批量新增访客端流量") + @PostMapping("/batchStory") + public Result> batchStory(@RequestBody List visitorPortFlowStoryCommandList){ + return visitorPortFlowApplication.batchStory(visitorPortFlowStoryCommandList); + } + /** + * describe 更新访客端流量 + * + * @param visitorPortFlowUpdateCommand 更新访客端流量 + * @return {@link Result< VisitorPortFlow >} 访客端流量领域对象 + + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + @Operation(summary = "更新访客端流量") + @PutMapping("/updateOne") + public Result updateOne(@RequestBody VisitorPortFlowUpdateCommand visitorPortFlowUpdateCommand){ + return visitorPortFlowApplication.updateOne(visitorPortFlowUpdateCommand); + } + /** + * describe 查询单个访客端流量 + * + * @param visitorPortFlowQueryOneCommand 查询单个访客端流量 + * @return {@link Result< VisitorPortFlowDTO >} 访客端流量DTO对象 + + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + @Operation(summary = "查询单个访客端流量") + @GetMapping("/findOne") + public Result findOne(@ModelAttribute VisitorPortFlowQueryOneCommand visitorPortFlowQueryOneCommand){ + return visitorPortFlowApplication.findOne(visitorPortFlowQueryOneCommand); + } + /** + * describe 查询多个访客端流量 + * + * @param visitorPortFlowQueryListCommand 查询多个访客端流量 + * @return {@link Result>} 访客端流量DTO对象 + + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + @Operation(summary = "查询多个访客端流量") + @GetMapping("/findList") + public Result> findList(@ModelAttribute VisitorPortFlowQueryListCommand visitorPortFlowQueryListCommand){ + return visitorPortFlowApplication.findList(visitorPortFlowQueryListCommand); + } + /** + * describe 分页查询多个访客端流量 + * + * @param visitorPortFlowQueryListCommand 分页查询多个访客端流量 + * @return {@link Result>} 分页访客端流量DTO对象 + + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + @Operation(summary = "分页查询多个访客端流量") + @GetMapping("/findPage") + public Result> findPage(@Parameter(description ="分页大小") @RequestParam(defaultValue = "10", value = "size") int size, + @Parameter(description ="当前页数") @RequestParam(defaultValue = "1", value = "current") int current, @ModelAttribute VisitorPortFlowQueryListCommand visitorPortFlowQueryListCommand){ + return visitorPortFlowApplication.findPage(size,current, visitorPortFlowQueryListCommand); + } + + /** + * 根据客户端查询流量 + * @param size 分页大小 + * @param current 分页 + * @param visitorPortFlowQueryListCommand 查询条件 + * @return {@link Result>} 分页访客端流量DTO对象 + */ + @Operation(summary = "分页查询多个访客端流量") + @GetMapping("/findClientFlowPage") + public Result> findClientFlowPage(@Parameter(description ="分页大小") @RequestParam(defaultValue = "10", value = "size") int size, + @Parameter(description ="当前页数") @RequestParam(defaultValue = "1", value = "current") int current, @ModelAttribute VisitorPortFlowQueryListCommand visitorPortFlowQueryListCommand){ + return visitorPortFlowApplication.findClientFlowPage(size,current, visitorPortFlowQueryListCommand); + } + /** + * describe 删除访客端流量 + * + * @param visitorPortFlowRemoveCommand 删除访客端流量 + * @return {@link Result< VisitorPortFlow >} 访客端流量 + + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + @Operation(summary = "删除访客端流量") + @DeleteMapping("/remove") + public Result remove(@ModelAttribute VisitorPortFlowRemoveCommand visitorPortFlowRemoveCommand){ + return visitorPortFlowApplication.remove(visitorPortFlowRemoveCommand); + } +} \ No newline at end of file diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/domain/model/visitor/flow/VisitorFlowRepository.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/domain/model/visitor/flow/VisitorFlowRepository.java deleted file mode 100644 index fbb90d7..0000000 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/domain/model/visitor/flow/VisitorFlowRepository.java +++ /dev/null @@ -1,106 +0,0 @@ -package wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow; - -import com.wu.framework.response.Result; -import com.wu.framework.response.ResultFactory; -import org.springframework.beans.factory.annotation.Autowired; -import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorFlow; -import java.util.List; -import com.wu.framework.inner.lazy.database.expand.database.persistence.domain.LazyPage; -/** - * describe 访客端流量 - * - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - * @see com.wu.framework.inner.lazy.persistence.reverse.lazy.ddd.DefaultDDDLazyDomainRepository - **/ - -public interface VisitorFlowRepository { - - - /** - * describe 新增访客端流量 - * - * @param visitorFlow 新增访客端流量 - * @return {@link Result} 访客端流量新增后领域对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - Result story(VisitorFlow visitorFlow); - - /** - * describe 批量新增访客端流量 - * - * @param visitorFlowList 批量新增访客端流量 - * @return {@link Result>} 访客端流量新增后领域对象集合 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - Result> batchStory(List visitorFlowList); - - /** - * describe 查询单个访客端流量 - * - * @param visitorFlow 查询单个访客端流量 - * @return {@link Result} 访客端流量DTO对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - Result findOne(VisitorFlow visitorFlow); - - /** - * describe 查询多个访客端流量 - * - * @param visitorFlow 查询多个访客端流量 - * @return {@link Result>} 访客端流量DTO对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - Result> findList(VisitorFlow visitorFlow); - - /** - * describe 分页查询多个访客端流量 - * - * @param size 当前页数 - * @param current 当前页 - * @param visitorFlow 分页查询多个访客端流量 - * @return {@link Result>} 分页访客端流量领域对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - Result> findPage(int size,int current,VisitorFlow visitorFlow); - - /** - * describe 删除访客端流量 - * - * @param visitorFlow 删除访客端流量 - * @return {@link Result} 访客端流量 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - Result remove(VisitorFlow visitorFlow); - - /** - * describe 是否存在访客端流量 - * - * @param visitorFlow 是否存在访客端流量 - * @return {@link Result} 访客端流量是否存在 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - Result exists(VisitorFlow visitorFlow); - -} \ No newline at end of file diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/domain/model/visitor/flow/VisitorFlow.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/domain/model/visitor/flow/VisitorPortFlow.java similarity index 94% rename from wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/domain/model/visitor/flow/VisitorFlow.java rename to wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/domain/model/visitor/flow/VisitorPortFlow.java index 25983ce..382189b 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/domain/model/visitor/flow/VisitorFlow.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/domain/model/visitor/flow/VisitorPortFlow.java @@ -17,8 +17,8 @@ import java.lang.Boolean; **/ @Data @Accessors(chain = true) -@Schema(title = "visitor_flow",description = "访客端流量") -public class VisitorFlow { +@Schema(title = "visitor_port_flow",description = "访客端流量") +public class VisitorPortFlow { /** diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/domain/model/visitor/flow/VisitorPortFlowRepository.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/domain/model/visitor/flow/VisitorPortFlowRepository.java new file mode 100644 index 0000000..7c1c0ae --- /dev/null +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/domain/model/visitor/flow/VisitorPortFlowRepository.java @@ -0,0 +1,117 @@ +package wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow; + +import ch.qos.logback.classic.util.LevelToSyslogSeverity; +import com.wu.framework.response.Result; + +import java.util.List; + +import com.wu.framework.inner.lazy.database.expand.database.persistence.domain.LazyPage; +import wu.framework.lazy.cloud.heartbeat.server.application.dto.VisitorFlowDTO; + +/** + * describe 访客端流量 + * + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + * @see com.wu.framework.inner.lazy.persistence.reverse.lazy.ddd.DefaultDDDLazyDomainRepository + **/ + +public interface VisitorPortFlowRepository { + + + /** + * describe 新增访客端流量 + * + * @param visitorPortFlow 新增访客端流量 + * @return {@link Result< VisitorPortFlow >} 访客端流量新增后领域对象 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + Result story(VisitorPortFlow visitorPortFlow); + + /** + * describe 批量新增访客端流量 + * + * @param visitorPortFlowList 批量新增访客端流量 + * @return {@link Result>} 访客端流量新增后领域对象集合 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + Result> batchStory(List visitorPortFlowList); + + /** + * describe 查询单个访客端流量 + * + * @param visitorPortFlow 查询单个访客端流量 + * @return {@link Result< VisitorPortFlow >} 访客端流量DTO对象 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + Result findOne(VisitorPortFlow visitorPortFlow); + + /** + * describe 查询多个访客端流量 + * + * @param visitorPortFlow 查询多个访客端流量 + * @return {@link Result>} 访客端流量DTO对象 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + Result> findList(VisitorPortFlow visitorPortFlow); + + /** + * describe 分页查询多个访客端流量 + * + * @param size 当前页数 + * @param current 当前页 + * @param visitorPortFlow 分页查询多个访客端流量 + * @return {@link Result>} 分页访客端流量领域对象 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + Result> findPage(int size, int current, VisitorPortFlow visitorPortFlow); + + /** + * describe 删除访客端流量 + * + * @param visitorPortFlow 删除访客端流量 + * @return {@link Result< VisitorPortFlow >} 访客端流量 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + Result remove(VisitorPortFlow visitorPortFlow); + + /** + * describe 是否存在访客端流量 + * + * @param visitorPortFlow 是否存在访客端流量 + * @return {@link Result} 访客端流量是否存在 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + Result exists(VisitorPortFlow visitorPortFlow); + + /** + * 根据客户端查询流量 + * + * @param size 分页大小 + * @param current 分页 + * @param visitorPortFlow 查询条件 + * @return {@link Result>} 分页访客端流量DTO对象 + */ + Result> findPageGroupByClientId(int size, int current, VisitorPortFlow visitorPortFlow); + + /** + * 根据客户端ID查询出 客户端所有的进出口流量 + * @param clientIdList 客户端ID + * @return 客户端所有的进出口流量 + */ + List findListByClientIds(List clientIdList); +} \ No newline at end of file diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/converter/VisitorFlowConverter.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/converter/VisitorPortFlowConverter.java similarity index 61% rename from wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/converter/VisitorFlowConverter.java rename to wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/converter/VisitorPortFlowConverter.java index 49c2bbd..bfdec2a 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/converter/VisitorFlowConverter.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/converter/VisitorPortFlowConverter.java @@ -1,9 +1,10 @@ package wu.framework.lazy.cloud.heartbeat.server.infrastructure.converter; -import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorFlow; -import wu.framework.lazy.cloud.heartbeat.server.infrastructure.entity.VisitorFlowDO; +import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorPortFlow; +import wu.framework.lazy.cloud.heartbeat.server.infrastructure.entity.VisitorPortFlowDO; import org.mapstruct.factory.Mappers; import org.mapstruct.Mapper; + /** * describe 访客端流量 * @@ -12,7 +13,7 @@ import org.mapstruct.Mapper; * @see com.wu.framework.inner.lazy.persistence.reverse.lazy.ddd.DefaultDDDLazyInfrastructureConverter **/ @Mapper -public interface VisitorFlowConverter { +public interface VisitorPortFlowConverter { /** @@ -24,25 +25,25 @@ public interface VisitorFlowConverter { * @author Jia wei Wu * @date 2024/01/24 05:19 下午 **/ - VisitorFlowConverter INSTANCE = Mappers.getMapper(VisitorFlowConverter.class); + VisitorPortFlowConverter INSTANCE = Mappers.getMapper(VisitorPortFlowConverter.class); /** * describe 实体对象 转换成领域对象 * - * @param visitorFlowDO 访客端流量实体对象 - * @return {@link VisitorFlow} 访客端流量领域对象 + * @param visitorPortFlowDO 访客端流量实体对象 + * @return {@link VisitorPortFlow} 访客端流量领域对象 * @author Jia wei Wu * @date 2024/01/24 05:19 下午 **/ - VisitorFlow toVisitorFlow(VisitorFlowDO visitorFlowDO); + VisitorPortFlow toVisitorFlow(VisitorPortFlowDO visitorPortFlowDO); /** * describe 领域对象 转换成实体对象 * - * @param visitorFlow 访客端流量领域对象 - * @return {@link VisitorFlowDO} 访客端流量实体对象 + * @param visitorPortFlow 访客端流量领域对象 + * @return {@link VisitorPortFlowDO} 访客端流量实体对象 * @author Jia wei Wu * @date 2024/01/24 05:19 下午 **/ - VisitorFlowDO fromVisitorFlow(VisitorFlow visitorFlow); + VisitorPortFlowDO fromVisitorFlow(VisitorPortFlow visitorPortFlow); } \ No newline at end of file diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/VisitorFlowDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/VisitorPortFlowDO.java similarity index 85% rename from wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/VisitorFlowDO.java rename to wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/VisitorPortFlowDO.java index 659ef02..d6154c0 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/VisitorFlowDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/VisitorPortFlowDO.java @@ -2,14 +2,11 @@ package wu.framework.lazy.cloud.heartbeat.server.infrastructure.entity; import lombok.Data; import lombok.experimental.Accessors; -import com.wu.framework.inner.lazy.stereotype.LazyTableIndex; -import com.wu.framework.inner.layer.stereotype.LayerField; -import com.wu.framework.inner.layer.stereotype.LayerField.LayerFieldType; import com.wu.framework.inner.lazy.stereotype.LazyTable; import com.wu.framework.inner.lazy.stereotype.LazyTableField; import com.wu.framework.inner.lazy.stereotype.*; import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; + import java.lang.String; import java.time.LocalDateTime; import java.lang.Long; @@ -24,9 +21,9 @@ import java.lang.Boolean; **/ @Data @Accessors(chain = true) -@LazyTable(tableName = "visitor_flow",schema = "wu_lazy_cloud_netty_server",comment = "访客端流量") -@Schema(title = "visitor_flow",description = "访客端流量") -public class VisitorFlowDO { +@LazyTable(tableName = "visitor_port_flow",comment = "访客端流量") +@Schema(title = "visitor_port_flow",description = "访客端流量") +public class VisitorPortFlowDO { /** diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/mapper/VisitorFlowMapper.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/mapper/VisitorPortFlowMapper.java similarity index 87% rename from wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/mapper/VisitorFlowMapper.java rename to wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/mapper/VisitorPortFlowMapper.java index c0412c8..4cf9976 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/mapper/VisitorFlowMapper.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/mapper/VisitorPortFlowMapper.java @@ -8,7 +8,7 @@ package wu.framework.lazy.cloud.heartbeat.server.infrastructure.mapper; * @see com.wu.framework.inner.lazy.persistence.reverse.lazy.ddd.DefaultDDDLazyInfrastructureMapper **/ -public interface VisitorFlowMapper { +public interface VisitorPortFlowMapper { diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/persistence/VisitorFlowRepositoryImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/persistence/VisitorFlowRepositoryImpl.java deleted file mode 100644 index 7569b43..0000000 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/persistence/VisitorFlowRepositoryImpl.java +++ /dev/null @@ -1,152 +0,0 @@ -package wu.framework.lazy.cloud.heartbeat.server.infrastructure.persistence; - -import wu.framework.lazy.cloud.heartbeat.server.infrastructure.entity.VisitorFlowDO; -import wu.framework.lazy.cloud.heartbeat.server.infrastructure.converter.VisitorFlowConverter; -import wu.framework.lazy.cloud.heartbeat.server.infrastructure.mapper.VisitorFlowMapper; -import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorFlowRepository; -import org.springframework.stereotype.Repository; -import java.util.stream.Collectors; -import com.wu.framework.inner.lazy.database.expand.database.persistence.stream.wrapper.LazyWrappers; -import com.wu.framework.response.Result; -import com.wu.framework.response.ResultFactory; -import jakarta.annotation.Resource; -import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorFlow; -import com.wu.framework.inner.lazy.database.expand.database.persistence.stream.lambda.LazyLambdaStream; -import java.util.List; -import com.wu.framework.inner.lazy.database.expand.database.persistence.domain.LazyPage; -/** - * describe 访客端流量 - * - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - * @see com.wu.framework.inner.lazy.persistence.reverse.lazy.ddd.DefaultDDDLazyInfrastructurePersistence - **/ -@Repository -public class VisitorFlowRepositoryImpl implements VisitorFlowRepository { - - @Resource - LazyLambdaStream lazyLambdaStream; - - /** - * describe 新增访客端流量 - * - * @param visitorFlow 新增访客端流量 - * @return {@link Result} 访客端流量新增后领域对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - @Override - public Result story(VisitorFlow visitorFlow) { - VisitorFlowDO visitorFlowDO = VisitorFlowConverter.INSTANCE.fromVisitorFlow(visitorFlow); - lazyLambdaStream.upsertRemoveNull(visitorFlowDO); - return ResultFactory.successOf(); - } - - /** - * describe 批量新增访客端流量 - * - * @param visitorFlowList 批量新增访客端流量 - * @return {@link Result>} 访客端流量新增后领域对象集合 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - @Override - public Result> batchStory(List visitorFlowList) { - List visitorFlowDOList = visitorFlowList.stream().map(VisitorFlowConverter.INSTANCE::fromVisitorFlow).collect(Collectors.toList()); - lazyLambdaStream.upsert(visitorFlowDOList); - return ResultFactory.successOf(); - } - - /** - * describe 查询单个访客端流量 - * - * @param visitorFlow 查询单个访客端流量 - * @return {@link Result} 访客端流量领域对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - @Override - public Result findOne(VisitorFlow visitorFlow) { - VisitorFlowDO visitorFlowDO = VisitorFlowConverter.INSTANCE.fromVisitorFlow(visitorFlow); - VisitorFlow visitorFlowOne = lazyLambdaStream.selectOne(LazyWrappers.lambdaWrapperBean(visitorFlowDO), VisitorFlow.class); - return ResultFactory.successOf(visitorFlowOne); - } - - /** - * describe 查询多个访客端流量 - * - * @param visitorFlow 查询多个访客端流量 - * @return {@link Result>} 访客端流量领域对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - @Override - public Result> findList(VisitorFlow visitorFlow) { - VisitorFlowDO visitorFlowDO = VisitorFlowConverter.INSTANCE.fromVisitorFlow(visitorFlow); - List visitorFlowList = lazyLambdaStream.selectList(LazyWrappers.lambdaWrapperBean(visitorFlowDO), VisitorFlow.class); - return ResultFactory.successOf(visitorFlowList); - } - - /** - * describe 分页查询多个访客端流量 - * - * @param size 当前页数 - * @param current 当前页 - * @param visitorFlow 分页查询多个访客端流量 - * @return {@link Result>} 分页访客端流量领域对象 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - @Override - public Result> findPage(int size,int current,VisitorFlow visitorFlow) { - VisitorFlowDO visitorFlowDO = VisitorFlowConverter.INSTANCE.fromVisitorFlow(visitorFlow); - LazyPage lazyPage = new LazyPage<>(current,size); - LazyPage visitorFlowLazyPage = lazyLambdaStream.selectPage(LazyWrappers.lambdaWrapperBean(visitorFlowDO),lazyPage, VisitorFlow.class); - return ResultFactory.successOf(visitorFlowLazyPage); - } - - /** - * describe 删除访客端流量 - * - * @param visitorFlow 删除访客端流量 - * @return {@link Result} 访客端流量 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - @Override - public Result remove(VisitorFlow visitorFlow) { - VisitorFlowDO visitorFlowDO = VisitorFlowConverter.INSTANCE.fromVisitorFlow(visitorFlow); - // lazyLambdaStream.delete(LazyWrappers.lambdaWrapperBean(visitorFlowDO)); - return ResultFactory.successOf(); - } - - /** - * describe 是否存在访客端流量 - * - * @param visitorFlow 访客端流量领域对象 - * @return {@link Result} 是否存在 true 存在，false 不存在 - - * @author Jia wei Wu - * @date 2024/01/24 05:19 下午 - **/ - - @Override - public Result exists(VisitorFlow visitorFlow) { - VisitorFlowDO visitorFlowDO = VisitorFlowConverter.INSTANCE.fromVisitorFlow(visitorFlow); - Boolean exists=lazyLambdaStream.exists(LazyWrappers.lambdaWrapperBean(visitorFlowDO)); - return ResultFactory.successOf(exists); - } - -} \ No newline at end of file diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/persistence/VisitorPortFlowRepositoryImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/persistence/VisitorPortFlowRepositoryImpl.java new file mode 100644 index 0000000..ccf6b80 --- /dev/null +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/persistence/VisitorPortFlowRepositoryImpl.java @@ -0,0 +1,182 @@ +package wu.framework.lazy.cloud.heartbeat.server.infrastructure.persistence; + + +import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorPortFlow; +import wu.framework.lazy.cloud.heartbeat.server.infrastructure.converter.VisitorPortFlowConverter; +import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorPortFlowRepository; +import org.springframework.stereotype.Repository; + +import java.util.stream.Collectors; + +import com.wu.framework.inner.lazy.database.expand.database.persistence.stream.wrapper.LazyWrappers; +import com.wu.framework.response.Result; +import com.wu.framework.response.ResultFactory; +import jakarta.annotation.Resource; +import com.wu.framework.inner.lazy.database.expand.database.persistence.stream.lambda.LazyLambdaStream; + +import java.util.List; + +import com.wu.framework.inner.lazy.database.expand.database.persistence.domain.LazyPage; +import wu.framework.lazy.cloud.heartbeat.server.infrastructure.entity.VisitorPortFlowDO; + +/** + * describe 访客端流量 + * + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + * @see com.wu.framework.inner.lazy.persistence.reverse.lazy.ddd.DefaultDDDLazyInfrastructurePersistence + **/ +@Repository +public class VisitorPortFlowRepositoryImpl implements VisitorPortFlowRepository { + + @Resource + LazyLambdaStream lazyLambdaStream; + + /** + * describe 新增访客端流量 + * + * @param visitorPortFlow 新增访客端流量 + * @return {@link Result< VisitorPortFlow >} 访客端流量新增后领域对象 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + @Override + public Result story(VisitorPortFlow visitorPortFlow) { + VisitorPortFlowDO visitorPortFlowDO = VisitorPortFlowConverter.INSTANCE.fromVisitorFlow(visitorPortFlow); + lazyLambdaStream.upsertRemoveNull(visitorPortFlowDO); + return ResultFactory.successOf(); + } + + /** + * describe 批量新增访客端流量 + * + * @param visitorPortFlowList 批量新增访客端流量 + * @return {@link Result>} 访客端流量新增后领域对象集合 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + @Override + public Result> batchStory(List visitorPortFlowList) { + List visitorPortFlowDOList = visitorPortFlowList.stream().map(VisitorPortFlowConverter.INSTANCE::fromVisitorFlow).collect(Collectors.toList()); + lazyLambdaStream.upsert(visitorPortFlowDOList); + return ResultFactory.successOf(); + } + + /** + * describe 查询单个访客端流量 + * + * @param visitorPortFlow 查询单个访客端流量 + * @return {@link Result< VisitorPortFlow >} 访客端流量领域对象 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + @Override + public Result findOne(VisitorPortFlow visitorPortFlow) { + VisitorPortFlowDO visitorPortFlowDO = VisitorPortFlowConverter.INSTANCE.fromVisitorFlow(visitorPortFlow); + VisitorPortFlow visitorPortFlowOne = lazyLambdaStream.selectOne(LazyWrappers.lambdaWrapperBean(visitorPortFlowDO), VisitorPortFlow.class); + return ResultFactory.successOf(visitorPortFlowOne); + } + + /** + * describe 查询多个访客端流量 + * + * @param visitorPortFlow 查询多个访客端流量 + * @return {@link Result>} 访客端流量领域对象 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + @Override + public Result> findList(VisitorPortFlow visitorPortFlow) { + VisitorPortFlowDO visitorPortFlowDO = VisitorPortFlowConverter.INSTANCE.fromVisitorFlow(visitorPortFlow); + List visitorPortFlowList = lazyLambdaStream.selectList(LazyWrappers.lambdaWrapperBean(visitorPortFlowDO), VisitorPortFlow.class); + return ResultFactory.successOf(visitorPortFlowList); + } + + /** + * describe 分页查询多个访客端流量 + * + * @param size 当前页数 + * @param current 当前页 + * @param visitorPortFlow 分页查询多个访客端流量 + * @return {@link Result>} 分页访客端流量领域对象 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + @Override + public Result> findPage(int size, int current, VisitorPortFlow visitorPortFlow) { + VisitorPortFlowDO visitorPortFlowDO = VisitorPortFlowConverter.INSTANCE.fromVisitorFlow(visitorPortFlow); + LazyPage lazyPage = new LazyPage<>(current, size); + LazyPage visitorFlowLazyPage = lazyLambdaStream.selectPage(LazyWrappers.lambdaWrapperBean(visitorPortFlowDO), lazyPage, VisitorPortFlow.class); + return ResultFactory.successOf(visitorFlowLazyPage); + } + + /** + * describe 删除访客端流量 + * + * @param visitorPortFlow 删除访客端流量 + * @return {@link Result< VisitorPortFlow >} 访客端流量 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + @Override + public Result remove(VisitorPortFlow visitorPortFlow) { + VisitorPortFlowDO visitorPortFlowDO = VisitorPortFlowConverter.INSTANCE.fromVisitorFlow(visitorPortFlow); + lazyLambdaStream.delete(LazyWrappers.lambdaWrapperBean(visitorPortFlowDO)); + return ResultFactory.successOf(); + } + + /** + * describe 是否存在访客端流量 + * + * @param visitorPortFlow 访客端流量领域对象 + * @return {@link Result} 是否存在 true 存在，false 不存在 + * @author Jia wei Wu + * @date 2024/01/24 05:19 下午 + **/ + + @Override + public Result exists(VisitorPortFlow visitorPortFlow) { + VisitorPortFlowDO visitorPortFlowDO = VisitorPortFlowConverter.INSTANCE.fromVisitorFlow(visitorPortFlow); + Boolean exists = lazyLambdaStream.exists(LazyWrappers.lambdaWrapperBean(visitorPortFlowDO)); + return ResultFactory.successOf(exists); + } + + /** + * 根据客户端查询流量 + * + * @param size 分页大小 + * @param current 分页 + * @param visitorPortFlow 查询条件 + * @return {@link Result>} 分页访客端流量DTO对象 + */ + @Override + public Result> findPageGroupByClientId(int size, int current, VisitorPortFlow visitorPortFlow) { + VisitorPortFlowDO visitorPortFlowDO = VisitorPortFlowConverter.INSTANCE.fromVisitorFlow(visitorPortFlow); + LazyPage lazyPage = new LazyPage<>(current, size); + LazyPage visitorFlowLazyPage = lazyLambdaStream + .selectPage( + LazyWrappers.lambdaWrapperBean(visitorPortFlowDO) + .groupBy(VisitorPortFlowDO::getClientId), + lazyPage, + VisitorPortFlow.class); + return ResultFactory.successOf(visitorFlowLazyPage); + } + + /** + * 根据客户端ID查询出 客户端所有的进出口流量 + * + * @param clientIdList 客户端ID + * @return 客户端所有的进出口流量 + */ + @Override + public List findListByClientIds(List clientIdList) { + return lazyLambdaStream.selectList(LazyWrappers.lambdaWrapper() + .in(VisitorPortFlowDO::getClientId,clientIdList), VisitorPortFlow.class); + } +} \ No newline at end of file diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/xml/VisitorFlowMapper.xml b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/xml/VisitorPortFlowMapper.xml similarity index 87% rename from wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/xml/VisitorFlowMapper.xml rename to wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/xml/VisitorPortFlowMapper.xml index 57e5691..9293a8b 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/xml/VisitorFlowMapper.xml +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/xml/VisitorPortFlowMapper.xml @@ -1,8 +1,8 @@ - - + + diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/config/ServerFlowConfiguration.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/config/ServerFlowConfiguration.java index 6542b9c..3a8d5ac 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/config/ServerFlowConfiguration.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/config/ServerFlowConfiguration.java @@ -6,7 +6,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Role; import wu.framework.lazy.cloud.heartbeat.common.adapter.ChannelFlowAdapter; import wu.framework.lazy.cloud.heartbeat.common.advanced.flow.HandleChannelFlowAdvanced; -import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorFlowRepository; +import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorPortFlowRepository; import wu.framework.lazy.cloud.heartbeat.server.netty.flow.ServerHandlerInFlowHandler; import wu.framework.lazy.cloud.heartbeat.server.netty.flow.ServerHandlerOutFlowHandler; @@ -25,8 +25,8 @@ public class ServerFlowConfiguration { */ @Role(BeanDefinition.ROLE_INFRASTRUCTURE) @Bean - public ServerHandlerInFlowHandler serverHandlerInFlowHandler(VisitorFlowRepository visitorFlowRepository) { - return new ServerHandlerInFlowHandler(visitorFlowRepository); + public ServerHandlerInFlowHandler serverHandlerInFlowHandler(VisitorPortFlowRepository visitorPortFlowRepository) { + return new ServerHandlerInFlowHandler(visitorPortFlowRepository); } /** @@ -36,8 +36,8 @@ public class ServerFlowConfiguration { */ @Role(BeanDefinition.ROLE_INFRASTRUCTURE) @Bean - public ServerHandlerOutFlowHandler serverHandlerOutFlowHandler(VisitorFlowRepository visitorFlowRepository) { - return new ServerHandlerOutFlowHandler(visitorFlowRepository); + public ServerHandlerOutFlowHandler serverHandlerOutFlowHandler(VisitorPortFlowRepository visitorPortFlowRepository) { + return new ServerHandlerOutFlowHandler(visitorPortFlowRepository); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/flow/ServerHandlerInFlowHandler.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/flow/ServerHandlerInFlowHandler.java index bd8a977..0d10db5 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/flow/ServerHandlerInFlowHandler.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/flow/ServerHandlerInFlowHandler.java @@ -5,17 +5,17 @@ import org.springframework.util.ObjectUtils; import wu.framework.lazy.cloud.heartbeat.common.advanced.flow.AbstractHandleChannelFlowAdvanced; import wu.framework.lazy.cloud.heartbeat.common.advanced.flow.ChannelFlow; import wu.framework.lazy.cloud.heartbeat.common.enums.ChannelFlowEnum; -import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorFlow; -import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorFlowRepository; +import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorPortFlow; +import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorPortFlowRepository; /** * 进口流量处理 */ public class ServerHandlerInFlowHandler extends AbstractHandleChannelFlowAdvanced { - private final VisitorFlowRepository visitorFlowRepository; + private final VisitorPortFlowRepository visitorPortFlowRepository; - public ServerHandlerInFlowHandler(VisitorFlowRepository visitorFlowRepository) { - this.visitorFlowRepository = visitorFlowRepository; + public ServerHandlerInFlowHandler(VisitorPortFlowRepository visitorPortFlowRepository) { + this.visitorPortFlowRepository = visitorPortFlowRepository; } /** @@ -42,25 +42,25 @@ public class ServerHandlerInFlowHandler extends AbstractHandleChannelFlowAdvance Integer flow = channelFlow.flow(); // 进口流量处理 - VisitorFlow visitorFlow = new VisitorFlow(); - visitorFlow.setInFlow(flow); - visitorFlow.setClientId(clientId); - visitorFlow.setVisitorPort(port); - visitorFlow.setIsDeleted(false); + VisitorPortFlow visitorPortFlow = new VisitorPortFlow(); + visitorPortFlow.setInFlow(flow); + visitorPortFlow.setClientId(clientId); + visitorPortFlow.setVisitorPort(port); + visitorPortFlow.setIsDeleted(false); // 查询是否存在已有流量 而后进行统计汇总 - VisitorFlow findOneVisitorFlowQuery = new VisitorFlow(); - findOneVisitorFlowQuery.setClientId(clientId); - findOneVisitorFlowQuery.setVisitorPort(port); - visitorFlowRepository.findOne(findOneVisitorFlowQuery).accept(existVisitorFlow -> { + VisitorPortFlow findOneVisitorPortFlowQuery = new VisitorPortFlow(); + findOneVisitorPortFlowQuery.setClientId(clientId); + findOneVisitorPortFlowQuery.setVisitorPort(port); + visitorPortFlowRepository.findOne(findOneVisitorPortFlowQuery).accept(existVisitorFlow -> { Integer inFlow = existVisitorFlow.getInFlow(); Integer outFlow = existVisitorFlow.getOutFlow(); if(!ObjectUtils.isEmpty(inFlow)){ - visitorFlow.setInFlow(visitorFlow.getInFlow()+inFlow); + visitorPortFlow.setInFlow(visitorPortFlow.getInFlow()+inFlow); } if (!ObjectUtils.isEmpty(outFlow)) { - visitorFlow.setOutFlow( outFlow); + visitorPortFlow.setOutFlow( outFlow); } }); - visitorFlowRepository.story(visitorFlow); + visitorPortFlowRepository.story(visitorPortFlow); } } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/flow/ServerHandlerOutFlowHandler.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/flow/ServerHandlerOutFlowHandler.java index 3dbd06a..e5f55f4 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/flow/ServerHandlerOutFlowHandler.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/netty/flow/ServerHandlerOutFlowHandler.java @@ -5,17 +5,17 @@ import org.springframework.util.ObjectUtils; import wu.framework.lazy.cloud.heartbeat.common.advanced.flow.AbstractHandleChannelFlowAdvanced; import wu.framework.lazy.cloud.heartbeat.common.advanced.flow.ChannelFlow; import wu.framework.lazy.cloud.heartbeat.common.enums.ChannelFlowEnum; -import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorFlow; -import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorFlowRepository; +import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorPortFlow; +import wu.framework.lazy.cloud.heartbeat.server.domain.model.visitor.flow.VisitorPortFlowRepository; /** * 出口流量处理 */ public class ServerHandlerOutFlowHandler extends AbstractHandleChannelFlowAdvanced { - private final VisitorFlowRepository visitorFlowRepository; + private final VisitorPortFlowRepository visitorPortFlowRepository; - public ServerHandlerOutFlowHandler(VisitorFlowRepository visitorFlowRepository) { - this.visitorFlowRepository = visitorFlowRepository; + public ServerHandlerOutFlowHandler(VisitorPortFlowRepository visitorPortFlowRepository) { + this.visitorPortFlowRepository = visitorPortFlowRepository; } /** @@ -42,25 +42,25 @@ public class ServerHandlerOutFlowHandler extends AbstractHandleChannelFlowAdvanc Integer flow = channelFlow.flow(); // 进口流量处理 - VisitorFlow visitorFlow = new VisitorFlow(); - visitorFlow.setOutFlow(flow); - visitorFlow.setClientId(clientId); - visitorFlow.setVisitorPort(port); - visitorFlow.setIsDeleted(false); + VisitorPortFlow visitorPortFlow = new VisitorPortFlow(); + visitorPortFlow.setOutFlow(flow); + visitorPortFlow.setClientId(clientId); + visitorPortFlow.setVisitorPort(port); + visitorPortFlow.setIsDeleted(false); // 查询是否存在已有流量 而后进行统计汇总 - VisitorFlow findOneVisitorFlowQuery = new VisitorFlow(); - findOneVisitorFlowQuery.setClientId(clientId); - findOneVisitorFlowQuery.setVisitorPort(port); - visitorFlowRepository.findOne(findOneVisitorFlowQuery).accept(existVisitorFlow -> { + VisitorPortFlow findOneVisitorPortFlowQuery = new VisitorPortFlow(); + findOneVisitorPortFlowQuery.setClientId(clientId); + findOneVisitorPortFlowQuery.setVisitorPort(port); + visitorPortFlowRepository.findOne(findOneVisitorPortFlowQuery).accept(existVisitorFlow -> { Integer outFlow = existVisitorFlow.getOutFlow(); Integer inFlow = existVisitorFlow.getInFlow(); if (!ObjectUtils.isEmpty(outFlow)) { - visitorFlow.setOutFlow(visitorFlow.getOutFlow() + outFlow); + visitorPortFlow.setOutFlow(visitorPortFlow.getOutFlow() + outFlow); } if (!ObjectUtils.isEmpty(inFlow)) { - visitorFlow.setInFlow( inFlow); + visitorPortFlow.setInFlow( inFlow); } }); - visitorFlowRepository.story(visitorFlow); + visitorPortFlowRepository.story(visitorPortFlow); } } diff --git a/wu-lazy-cloud-network-ui/src/api/modules/cloudNetwork.js b/wu-lazy-cloud-network-ui/src/api/modules/cloudNetwork.js index d493b7f..bf8190c 100644 --- a/wu-lazy-cloud-network-ui/src/api/modules/cloudNetwork.js +++ b/wu-lazy-cloud-network-ui/src/api/modules/cloudNetwork.js @@ -36,6 +36,10 @@ module.exports = { type: "put", }, + visitorClientFlowPage: { + url: "/visitor/port/flow/findClientFlowPage", + type: "get", + }, networkMappingPage: { url: "/internal/network/penetration/mapping/findPage", type: "get", diff --git a/wu-lazy-cloud-network-ui/src/views/layoutpages/cloud_network/ClientFlowManager.vue b/wu-lazy-cloud-network-ui/src/views/layoutpages/cloud_network/ClientFlowManager.vue index 8daa276..0ba7100 100644 --- a/wu-lazy-cloud-network-ui/src/views/layoutpages/cloud_network/ClientFlowManager.vue +++ b/wu-lazy-cloud-network-ui/src/views/layoutpages/cloud_network/ClientFlowManager.vue @@ -37,21 +37,10 @@ total: total, }" > - - + - + - -