diff --git a/src/main/java/cn/lihongjie/coal/acDeviceData/dto/AcDeviceDataReportRequest.java b/src/main/java/cn/lihongjie/coal/acDeviceData/dto/AcDeviceDataReportRequest.java index 2aba312f..906068d7 100644 --- a/src/main/java/cn/lihongjie/coal/acDeviceData/dto/AcDeviceDataReportRequest.java +++ b/src/main/java/cn/lihongjie/coal/acDeviceData/dto/AcDeviceDataReportRequest.java @@ -49,4 +49,7 @@ direction_name, private String directionName; + private String organizationId; + + } diff --git a/src/main/java/cn/lihongjie/coal/acDeviceData/service/AcDeviceDataService.java b/src/main/java/cn/lihongjie/coal/acDeviceData/service/AcDeviceDataService.java index 68fe2be2..c082e900 100644 --- a/src/main/java/cn/lihongjie/coal/acDeviceData/service/AcDeviceDataService.java +++ b/src/main/java/cn/lihongjie/coal/acDeviceData/service/AcDeviceDataService.java @@ -10,6 +10,7 @@ import cn.lihongjie.coal.acDeviceData.repository.AcDeviceDataRepository; import cn.lihongjie.coal.base.dto.CommonQuery; import cn.lihongjie.coal.base.dto.IdRequest; import cn.lihongjie.coal.base.service.BaseService; +import cn.lihongjie.coal.common.Ctx; import cn.lihongjie.coal.common.JpaUtils; import cn.lihongjie.coal.dbFunctions.DbFunctionService; @@ -87,10 +88,12 @@ public class AcDeviceDataService extends BaseService e.getValue()))) .toList(); - - - return new PageImpl<>(ans, PageRequest.of(0, request.getPageSize()), Integer.parseInt(countQuery.getSingleResult().toString())); + return new PageImpl<>( + ans, + PageRequest.of(0, request.getPageSize()), + Integer.parseInt(countQuery.getSingleResult().toString())); } }