diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceGroupController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceGroupController.java index 28601a1a..3e1018e9 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceGroupController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceGroupController.java @@ -114,4 +114,21 @@ public class DeviceGroupController extends BaseController { return toAjax(deviceGroupService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 绑定设备分组 + * + * @param groupId 分组id + * @param deviceId 设备id + */ + @Operation(summary = "绑定设备分组") + // @SaCheckPermission("fys-equipment:group:remove") + @Log(title = "绑定设备分组", businessType = BusinessType.DELETE) + @GetMapping("/groupId/{deviceId}") + public R bindingDevice(@NotEmpty(message = "分组id 不能为空") @PathVariable Long groupId, + @NotEmpty(message = "设备id 不能为空") @PathVariable Long[] deviceId) { + return toAjax(deviceGroupService.bindingDevice(groupId, deviceId)); + } + + } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceGroupService.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceGroupService.java index 9662fef4..3be6a880 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceGroupService.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceGroupService.java @@ -3,6 +3,7 @@ package com.fuyuanshen.equipment.service; import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; import com.fuyuanshen.equipment.domain.vo.DeviceGroupVo; import com.fuyuanshen.equipment.domain.bo.DeviceGroupBo; +import jakarta.validation.constraints.NotEmpty; import java.util.Collection; import java.util.List; @@ -56,4 +57,14 @@ public interface IDeviceGroupService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + + /** + * 绑定设备分组 + * + * @param groupId 分组id + * @param deviceId 设备id + * @return 是否绑定成功 + */ + Boolean bindingDevice(@NotEmpty(message = "分组id 不能为空") Long groupId, @NotEmpty(message = "设备id 不能为空") Long[] deviceId); } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGroupServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGroupServiceImpl.java index 51cf369b..2981a65f 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGroupServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGroupServiceImpl.java @@ -11,6 +11,7 @@ import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; import com.fuyuanshen.common.satoken.utils.LoginHelper; import com.fuyuanshen.equipment.domain.Device; import com.fuyuanshen.equipment.domain.DeviceTypeGrants; +import jakarta.validation.constraints.NotEmpty; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -63,7 +64,7 @@ public class DeviceGroupServiceImpl implements IDeviceGroupService { public List queryList(DeviceGroupBo bo) { Page page = new Page<>(bo.getPageNum(), bo.getPageSize()); // 1. 查询顶级分组(parent_id为null) - IPage rootGroups = baseMapper.selectRootGroups(bo, page); + IPage rootGroups = baseMapper.selectRootGroups(bo, page); List records = rootGroups.getRecords(); // 2. 递归构建树形结构 @@ -169,4 +170,19 @@ public class DeviceGroupServiceImpl implements IDeviceGroupService { } return baseMapper.deleteByIds(ids) > 0; } + + /** + * 绑定设备分组 + * + * @param groupId 分组id + * @param deviceId 设备id + * @return 是否绑定成功 + */ + @Override + public Boolean bindingDevice(Long groupId, Long[] deviceId) { + + + + return true; + } }