sdy
/
Dock-MultiCtrl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

蛙跳组设备字段优化

This commit is contained in:
sdy 2026-06-11 16:04:18 +08:00
parent 67cedde4c5
commit 23864f27bd
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/src/main/java/com/multictrl/modules/business/controller/MultiController.java
View File

@ -132,7 +132,7 @@ public class MultiController {
@GetMapping("/getMultiGroupDockList") @GetMapping("/getMultiGroupDockList")
@Operation(summary = "获取蛙跳组机库列表") @Operation(summary = "获取蛙跳组机库列表")
public Result<List<DockDTO>> getMultiGroupDockList(@RequestParam String multiGroupId) { public Result<List<DockDTO>> getMultiGroupDockList(@RequestParam Long multiGroupId) {
List<DockDTO> list = multiService.getMultiGroupDockList(multiGroupId); List<DockDTO> list = multiService.getMultiGroupDockList(multiGroupId);
return new Result<List<DockDTO>>().ok(list); return new Result<List<DockDTO>>().ok(list);
} }

2
admin/src/main/java/com/multictrl/modules/business/dto/multi/MultiGroupDeviceDTO.java
View File

@ -25,7 +25,7 @@ public class MultiGroupDeviceDTO {
@NotBlank(message = "{group.id.require}", groups = {AddGroup.class, UpdateGroup.class}) @NotBlank(message = "{group.id.require}", groups = {AddGroup.class, UpdateGroup.class})
@JsonProperty(required = true) @JsonProperty(required = true)
@Schema(description = "蛙跳组id") @Schema(description = "蛙跳组id")
private Long groudId; private Long groupId;
/** /**
* 网关sn * 网关sn
*/ */

2
admin/src/main/java/com/multictrl/modules/business/entity/MultiGroupDeviceEntity.java
View File

@ -19,7 +19,7 @@ public class MultiGroupDeviceEntity extends BaseEntity {
/** /**
* 蛙跳组id * 蛙跳组id
*/ */
private Long groudId; private Long groupId;
/** /**
* 网关sn * 网关sn
*/ */

2
admin/src/main/java/com/multictrl/modules/business/service/MultiService.java
View File

@ -33,7 +33,7 @@ public interface MultiService {
void deleteMultiGroup(List<Long> ids); void deleteMultiGroup(List<Long> ids);
List<DockDTO> getMultiGroupDockList(String multiGroupId); List<DockDTO> getMultiGroupDockList(Long multiGroupId);
String privateMultiDockTaskFlightTaskCheck(MultiTaskDTO multiTaskDTO); String privateMultiDockTaskFlightTaskCheck(MultiTaskDTO multiTaskDTO);

6
admin/src/main/java/com/multictrl/modules/business/service/impl/MultiServiceImpl.java
View File

@ -106,10 +106,10 @@ public class MultiServiceImpl implements MultiService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public void saveMultiGroupDevice(MultiGroupDeviceDTO multiGroupDeviceDTO) { public void saveMultiGroupDevice(MultiGroupDeviceDTO multiGroupDeviceDTO) {
Long groudId = multiGroupDeviceDTO.getGroudId(); Long groupId = multiGroupDeviceDTO.getGroupId();
for (String gatewaySn : multiGroupDeviceDTO.getGatewaySns()) { for (String gatewaySn : multiGroupDeviceDTO.getGatewaySns()) {
MultiGroupDeviceEntity deviceEntity = new MultiGroupDeviceEntity(); MultiGroupDeviceEntity deviceEntity = new MultiGroupDeviceEntity();
deviceEntity.setGroudId(groudId); deviceEntity.setGroupId(groupId);
deviceEntity.setGatewaySn(gatewaySn); deviceEntity.setGatewaySn(gatewaySn);
multiGroupDeviceDao.insert(deviceEntity); multiGroupDeviceDao.insert(deviceEntity);
} }
@ -142,7 +142,7 @@ public class MultiServiceImpl implements MultiService {
} }
@Override @Override
public List<DockDTO> getMultiGroupDockList(String multiGroupId) { public List<DockDTO> getMultiGroupDockList(Long multiGroupId) {
List<MultiGroupDeviceEntity> multiGroupDeviceEntities = multiGroupDeviceDao.selectList(new QueryWrapper<MultiGroupDeviceEntity>() List<MultiGroupDeviceEntity> multiGroupDeviceEntities = multiGroupDeviceDao.selectList(new QueryWrapper<MultiGroupDeviceEntity>()
.eq("group_id", multiGroupId).orderByDesc("update_date")); .eq("group_id", multiGroupId).orderByDesc("update_date"));
if (CollUtil.isEmpty(multiGroupDeviceEntities)) { if (CollUtil.isEmpty(multiGroupDeviceEntities)) {

4
prj-deploy/file/pgsql/init.sql
View File

@ -2222,7 +2222,7 @@ ON COLUMN public.bus_multi_group.update_date IS '更新时间';
CREATE TABLE public.bus_multi_group_device CREATE TABLE public.bus_multi_group_device
( (
id int8 NOT NULL, id int8 NOT NULL,
groud_id int8 NOT NULL, group_id int8 NOT NULL,
gateway_sn varchar(64) NOT NULL, gateway_sn varchar(64) NOT NULL,
creator int8 NULL, creator int8 NULL,
create_date timestamp NULL, create_date timestamp NULL,
@ -2237,7 +2237,7 @@ ON TABLE public.bus_multi_group_device IS '蛙跳任务组绑定的设备编号'
COMMENT COMMENT
ON COLUMN public.bus_multi_group_device.id IS '编号'; ON COLUMN public.bus_multi_group_device.id IS '编号';
COMMENT COMMENT
ON COLUMN public.bus_multi_group_device.groud_id IS '蛙跳组'; ON COLUMN public.bus_multi_group_device.group_id IS '蛙跳组';
COMMENT COMMENT
ON COLUMN public.bus_multi_group_device.gateway_sn IS '设备编号sn'; ON COLUMN public.bus_multi_group_device.gateway_sn IS '设备编号sn';
COMMENT COMMENT