From 23864f27bd5ea0546889999b7d1dd635a604a45f Mon Sep 17 00:00:00 2001 From: sdy Date: Thu, 11 Jun 2026 16:04:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=9B=99=E8=B7=B3=E7=BB=84=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/business/controller/MultiController.java | 2 +- .../modules/business/dto/multi/MultiGroupDeviceDTO.java | 2 +- .../modules/business/entity/MultiGroupDeviceEntity.java | 2 +- .../multictrl/modules/business/service/MultiService.java | 2 +- .../modules/business/service/impl/MultiServiceImpl.java | 6 +++--- prj-deploy/file/pgsql/init.sql | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/admin/src/main/java/com/multictrl/modules/business/controller/MultiController.java b/admin/src/main/java/com/multictrl/modules/business/controller/MultiController.java index 63cba02..2e15b63 100644 --- a/admin/src/main/java/com/multictrl/modules/business/controller/MultiController.java +++ b/admin/src/main/java/com/multictrl/modules/business/controller/MultiController.java @@ -132,7 +132,7 @@ public class MultiController { @GetMapping("/getMultiGroupDockList") @Operation(summary = "获取蛙跳组机库列表") - public Result> getMultiGroupDockList(@RequestParam String multiGroupId) { + public Result> getMultiGroupDockList(@RequestParam Long multiGroupId) { List list = multiService.getMultiGroupDockList(multiGroupId); return new Result>().ok(list); } diff --git a/admin/src/main/java/com/multictrl/modules/business/dto/multi/MultiGroupDeviceDTO.java b/admin/src/main/java/com/multictrl/modules/business/dto/multi/MultiGroupDeviceDTO.java index 55f8245..39664c1 100644 --- a/admin/src/main/java/com/multictrl/modules/business/dto/multi/MultiGroupDeviceDTO.java +++ b/admin/src/main/java/com/multictrl/modules/business/dto/multi/MultiGroupDeviceDTO.java @@ -25,7 +25,7 @@ public class MultiGroupDeviceDTO { @NotBlank(message = "{group.id.require}", groups = {AddGroup.class, UpdateGroup.class}) @JsonProperty(required = true) @Schema(description = "蛙跳组id") - private Long groudId; + private Long groupId; /** * 网关sn */ diff --git a/admin/src/main/java/com/multictrl/modules/business/entity/MultiGroupDeviceEntity.java b/admin/src/main/java/com/multictrl/modules/business/entity/MultiGroupDeviceEntity.java index 91c69c6..a8944f4 100644 --- a/admin/src/main/java/com/multictrl/modules/business/entity/MultiGroupDeviceEntity.java +++ b/admin/src/main/java/com/multictrl/modules/business/entity/MultiGroupDeviceEntity.java @@ -19,7 +19,7 @@ public class MultiGroupDeviceEntity extends BaseEntity { /** * 蛙跳组id */ - private Long groudId; + private Long groupId; /** * 网关sn */ diff --git a/admin/src/main/java/com/multictrl/modules/business/service/MultiService.java b/admin/src/main/java/com/multictrl/modules/business/service/MultiService.java index 5a3d3a9..69a8bc1 100644 --- a/admin/src/main/java/com/multictrl/modules/business/service/MultiService.java +++ b/admin/src/main/java/com/multictrl/modules/business/service/MultiService.java @@ -33,7 +33,7 @@ public interface MultiService { void deleteMultiGroup(List ids); - List getMultiGroupDockList(String multiGroupId); + List getMultiGroupDockList(Long multiGroupId); String privateMultiDockTaskFlightTaskCheck(MultiTaskDTO multiTaskDTO); diff --git a/admin/src/main/java/com/multictrl/modules/business/service/impl/MultiServiceImpl.java b/admin/src/main/java/com/multictrl/modules/business/service/impl/MultiServiceImpl.java index 103a552..5819668 100644 --- a/admin/src/main/java/com/multictrl/modules/business/service/impl/MultiServiceImpl.java +++ b/admin/src/main/java/com/multictrl/modules/business/service/impl/MultiServiceImpl.java @@ -106,10 +106,10 @@ public class MultiServiceImpl implements MultiService { @Transactional(rollbackFor = Exception.class) @Override public void saveMultiGroupDevice(MultiGroupDeviceDTO multiGroupDeviceDTO) { - Long groudId = multiGroupDeviceDTO.getGroudId(); + Long groupId = multiGroupDeviceDTO.getGroupId(); for (String gatewaySn : multiGroupDeviceDTO.getGatewaySns()) { MultiGroupDeviceEntity deviceEntity = new MultiGroupDeviceEntity(); - deviceEntity.setGroudId(groudId); + deviceEntity.setGroupId(groupId); deviceEntity.setGatewaySn(gatewaySn); multiGroupDeviceDao.insert(deviceEntity); } @@ -142,7 +142,7 @@ public class MultiServiceImpl implements MultiService { } @Override - public List getMultiGroupDockList(String multiGroupId) { + public List getMultiGroupDockList(Long multiGroupId) { List multiGroupDeviceEntities = multiGroupDeviceDao.selectList(new QueryWrapper() .eq("group_id", multiGroupId).orderByDesc("update_date")); if (CollUtil.isEmpty(multiGroupDeviceEntities)) { diff --git a/prj-deploy/file/pgsql/init.sql b/prj-deploy/file/pgsql/init.sql index 026ba85..ff6a1f0 100644 --- a/prj-deploy/file/pgsql/init.sql +++ b/prj-deploy/file/pgsql/init.sql @@ -2222,7 +2222,7 @@ ON COLUMN public.bus_multi_group.update_date IS '更新时间'; CREATE TABLE public.bus_multi_group_device ( id int8 NOT NULL, - groud_id int8 NOT NULL, + group_id int8 NOT NULL, gateway_sn varchar(64) NOT NULL, creator int8 NULL, create_date timestamp NULL, @@ -2237,7 +2237,7 @@ ON TABLE public.bus_multi_group_device IS '蛙跳任务组绑定的设备编号' COMMENT ON COLUMN public.bus_multi_group_device.id IS '编号'; COMMENT -ON COLUMN public.bus_multi_group_device.groud_id IS '蛙跳组'; +ON COLUMN public.bus_multi_group_device.group_id IS '蛙跳组'; COMMENT ON COLUMN public.bus_multi_group_device.gateway_sn IS '设备编号sn'; COMMENT