getBindedDeviceByGroup接口分页返回

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<List<DeviceVO>> getBindedDeviceByGroup(
+	public PageResponse<PageInfo<DeviceVO>> 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<PageInfo<DeviceVO>> 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 = "")

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<DeviceGroupPageVO> getBindedGroupByDevice(Integer deviceInfoId);
 
-	List<DeviceVO> getBindedDeviceByGroup(Long deviceGroupId);
+	List<DeviceVO> getBindedDeviceByGroup(DeviceGroupSearchParams pageSearchParam);
 }

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 <foreach collection="deviceGroupIdList" item="item" open="(" separator="," close=")">#{item}</foreach>
     </select>
 
 

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,7 +29,7 @@ public interface DeviceGroupService {
 
 	SimpleDataResponse getBindedGroupByDevice(Integer deviceInfoId, Long userId, Long companyId, Integer languageType);
 
-	SimpleDataResponse getBindedDeviceByGroup(Long deviceGroupId, Long userId, Long companyId, Integer languageType);
+	PageInfo<DeviceVO> getBindedDeviceByGroup(DeviceGroupSearchParams pageSearchParam, Long userId, Long companyId, Integer languageType);
 
 	SimpleDataResponse addDeviceForGroup(BindDeviceForGroupParams bindDeviceForGroupParams, Long userId, Long companyId, Integer languageType);
 

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<List<DeviceVO>> getBindedDeviceByGroup(Long deviceGroupId, Long userId, Long companyId, Integer languageType) {
+	public PageInfo<DeviceVO> getBindedDeviceByGroup(DeviceGroupSearchParams pageSearchParam, Long userId, Long companyId, Integer languageType) {
-		return SimpleDataResponse.success(deviceGroupMapperExt.getBindedDeviceByGroup(deviceGroupId));
+//		return SimpleDataResponse.success(deviceGroupMapperExt.getBindedDeviceByGroup(deviceGroupId));
+		PageHelper.startPage(pageSearchParam.getPageNum() == null ? 1 : pageSearchParam.getPageNum(),
+				pageSearchParam.getPageSize() == null ? 20 : pageSearchParam.getPageSize());
+
+		List<DeviceVO> list = deviceGroupMapperExt.getBindedDeviceByGroup(pageSearchParam);
+		return new PageInfo<>(list);
 	}
 
 	@Override