From 92269672b485a4d3c4a7efb45a2ea604479d99ca Mon Sep 17 00:00:00 2001 From: "review512jwy@163.com" <“review512jwy@163.com”> Date: Tue, 9 Dec 2025 19:28:03 +0800 Subject: [PATCH] =?UTF-8?q?getBindedDeviceByGroup=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceGroupController.java | 20 +++++++++++++++++-- .../back/dao/ex/DeviceGroupMapperExt.java | 2 +- .../mappers/ex/DeviceGroupMapperExt.xml | 2 +- .../back/service/DeviceGroupService.java | 5 +++-- .../service/impl/DeviceGroupServiceImpl.java | 9 +++++++-- 5 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/DeviceGroupController.java b/dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/DeviceGroupController.java index 4e1db67..064b6fd 100644 --- a/dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/DeviceGroupController.java +++ b/dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/DeviceGroupController.java @@ -23,6 +23,7 @@ import com.dongjian.dashboard.back.configurator.interceptor.AccessRequired; import com.dongjian.dashboard.back.service.DeviceGroupService; import com.dongjian.dashboard.back.vo.devicegroup.DeviceGroupPageVO; +import java.util.Collections; import java.util.List; @@ -151,14 +152,29 @@ public class DeviceGroupController { @Operation(summary = "根据设备组ID获取绑定的设备") @RequestMapping(value = "/getBindedDeviceByGroup/{deviceGroupId}", method = RequestMethod.GET) - public SimpleDataResponse> getBindedDeviceByGroup( + public PageResponse> getBindedDeviceByGroup( @PathVariable Long deviceGroupId, @Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required = true) String LoginName, @Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required = true) String AccessToken, @Parameter(name = "UserId", description = "User ID", required = true, schema = @Schema(defaultValue = "1")) @RequestHeader(required = true) Long UserId, @Parameter(name = "CompanyId", description = "User's company ID", required = false, schema = @Schema(defaultValue = "1")) @RequestHeader(required = false) Long CompanyId, @Parameter(name = "LanguageType", description = "Language type: 0 - Chinese, 1 - English, 2 - Japanese", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required = true) Integer LanguageType) { - return deviceGroupService.getBindedDeviceByGroup(deviceGroupId, UserId, CompanyId, LanguageType); + + DeviceGroupSearchParams pageSearchParam = new DeviceGroupSearchParams(); + pageSearchParam.setUserId(UserId); + pageSearchParam.setDeviceGroupIdList(Collections.singletonList(deviceGroupId)); + + PageResponse> pageResponse = new PageResponse<>(); + try { + pageResponse.setData(deviceGroupService.getBindedDeviceByGroup(pageSearchParam, UserId, CompanyId, LanguageType)); + pageResponse.setCode(ResponseCode.SUCCESS); + pageResponse.setMsg("success"); + } catch (Exception e) { + logger.error("Error querying list", e); + pageResponse.setCode(ResponseCode.SERVER_ERROR); + pageResponse.setMsg("service error"); + } + return pageResponse; } @OperationLog(operation = "addDeviceForGroup", remark = "") diff --git a/dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/DeviceGroupMapperExt.java b/dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/DeviceGroupMapperExt.java index ce766cd..358eb60 100644 --- a/dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/DeviceGroupMapperExt.java +++ b/dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/DeviceGroupMapperExt.java @@ -18,5 +18,5 @@ public interface DeviceGroupMapperExt extends DeviceGroupMapper { List getBindedGroupByDevice(Integer deviceInfoId); - List getBindedDeviceByGroup(Long deviceGroupId); + List getBindedDeviceByGroup(DeviceGroupSearchParams pageSearchParam); } diff --git a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceGroupMapperExt.xml b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceGroupMapperExt.xml index ac5b6ef..781240b 100644 --- a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceGroupMapperExt.xml +++ b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceGroupMapperExt.xml @@ -94,7 +94,7 @@ left join data_provider_gateway_info on data_provider_gateway_info.id = device_info.gateway_info_id left join type on device_info.type_id = type.id left join basic_project on device_info.project_id = basic_project.id - where dashboard_device_group_relation.device_group_id = #{deviceGroupId} + where dashboard_device_group_relation.device_group_id IN #{item} diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/DeviceGroupService.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/DeviceGroupService.java index e8863d9..de244d4 100644 --- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/DeviceGroupService.java +++ b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/DeviceGroupService.java @@ -3,6 +3,7 @@ package com.dongjian.dashboard.back.service; import com.dongjian.dashboard.back.common.response.PageInfo; import com.dongjian.dashboard.back.common.response.SimpleDataResponse; import com.dongjian.dashboard.back.dto.devicegroup.*; +import com.dongjian.dashboard.back.vo.device.DeviceVO; import com.dongjian.dashboard.back.vo.devicegroup.DeviceGroupPageVO; import java.util.List; @@ -28,9 +29,9 @@ public interface DeviceGroupService { SimpleDataResponse getBindedGroupByDevice(Integer deviceInfoId, Long userId, Long companyId, Integer languageType); - SimpleDataResponse getBindedDeviceByGroup(Long deviceGroupId, Long userId, Long companyId, Integer languageType); + PageInfo getBindedDeviceByGroup(DeviceGroupSearchParams pageSearchParam, Long userId, Long companyId, Integer languageType); - SimpleDataResponse addDeviceForGroup(BindDeviceForGroupParams bindDeviceForGroupParams, Long userId, Long companyId, Integer languageType); + SimpleDataResponse addDeviceForGroup(BindDeviceForGroupParams bindDeviceForGroupParams, Long userId, Long companyId, Integer languageType); SimpleDataResponse delDeviceForGroup(BindDeviceForGroupParams bindDeviceForGroupParams, Long userId, Long companyId, Integer languageType); } diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceGroupServiceImpl.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceGroupServiceImpl.java index 234c100..6410474 100644 --- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceGroupServiceImpl.java +++ b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceGroupServiceImpl.java @@ -342,8 +342,13 @@ public class DeviceGroupServiceImpl implements DeviceGroupService { } @Override - public SimpleDataResponse> getBindedDeviceByGroup(Long deviceGroupId, Long userId, Long companyId, Integer languageType) { - return SimpleDataResponse.success(deviceGroupMapperExt.getBindedDeviceByGroup(deviceGroupId)); + public PageInfo getBindedDeviceByGroup(DeviceGroupSearchParams pageSearchParam, Long userId, Long companyId, Integer languageType) { +// return SimpleDataResponse.success(deviceGroupMapperExt.getBindedDeviceByGroup(deviceGroupId)); + PageHelper.startPage(pageSearchParam.getPageNum() == null ? 1 : pageSearchParam.getPageNum(), + pageSearchParam.getPageSize() == null ? 20 : pageSearchParam.getPageSize()); + + List list = deviceGroupMapperExt.getBindedDeviceByGroup(pageSearchParam); + return new PageInfo<>(list); } @Override