From e8c036e0871233a61ebbbea11d431b39b0159ccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Tue, 20 Jan 2026 13:46:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/device/api/RemoteGroupService.java | 5 ++-- .../device/api/domain/GroupCreateRequest.java | 30 +++++++++++++++++++ .../factory/RemoteGroupFallbackFactory.java | 3 +- ruoyi-modules/tuoheng-device | 2 +- 4 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/GroupCreateRequest.java diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/RemoteGroupService.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/RemoteGroupService.java index c36c56c..017ba99 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/RemoteGroupService.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/RemoteGroupService.java @@ -4,6 +4,7 @@ import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.device.api.domain.GroupVO; +import com.ruoyi.device.api.domain.GroupCreateRequest; import com.ruoyi.device.api.domain.DockVO; import com.ruoyi.device.api.factory.RemoteGroupFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; @@ -23,12 +24,12 @@ public interface RemoteGroupService /** * 创建分组 * - * @param groupVO 分组信息 + * @param request 分组创建请求 * @param source 请求来源 * @return 结果 */ @PostMapping("/group/create") - R createGroup(@RequestBody GroupVO groupVO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + R createGroup(@RequestBody GroupCreateRequest request, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 删除分组 diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/GroupCreateRequest.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/GroupCreateRequest.java new file mode 100644 index 0000000..2ee9048 --- /dev/null +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/GroupCreateRequest.java @@ -0,0 +1,30 @@ +package com.ruoyi.device.api.domain; + +/** + * 分组创建请求对象 + * + * @author ruoyi + * @date 2026-01-20 + */ +public class GroupCreateRequest +{ + private String groupName; + + public String getGroupName() + { + return groupName; + } + + public void setGroupName(String groupName) + { + this.groupName = groupName; + } + + @Override + public String toString() + { + return "GroupCreateRequest{" + + "groupName='" + groupName + '\'' + + '}'; + } +} diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/factory/RemoteGroupFallbackFactory.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/factory/RemoteGroupFallbackFactory.java index 7081622..875b765 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/factory/RemoteGroupFallbackFactory.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/factory/RemoteGroupFallbackFactory.java @@ -3,6 +3,7 @@ package com.ruoyi.device.api.factory; import com.ruoyi.common.core.domain.R; import com.ruoyi.device.api.RemoteGroupService; import com.ruoyi.device.api.domain.GroupVO; +import com.ruoyi.device.api.domain.GroupCreateRequest; import com.ruoyi.device.api.domain.DockVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,7 +30,7 @@ public class RemoteGroupFallbackFactory implements FallbackFactory createGroup(GroupVO groupVO, String source) + public R createGroup(GroupCreateRequest request, String source) { return R.fail("创建分组失败:" + throwable.getMessage()); } diff --git a/ruoyi-modules/tuoheng-device b/ruoyi-modules/tuoheng-device index aa32816..7a6ff32 160000 --- a/ruoyi-modules/tuoheng-device +++ b/ruoyi-modules/tuoheng-device @@ -1 +1 @@ -Subproject commit aa328169e36dbd438c7627b288cda1944a9cf8e5 +Subproject commit 7a6ff325c49aaef7e8e82217e331e1862ee3e05b