From ffc84c52298243ceacdf6ac5523c6fd507278374 Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Thu, 20 Feb 2025 21:55:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(acDeviceData):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87ID=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 AcDeviceDataReportRequest 中添加 organizationId 字段
- 在报告查询中加入组织ID筛选条件
- 使用 Ctx.currentUser().getOrganizationId() 获取当前用户组织ID
---
 .../dto/AcDeviceDataReportRequest.java        |  3 +++
 .../service/AcDeviceDataService.java          | 22 ++++++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

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<AcDeviceDataEntity, AcDevic
 
     public Page report(AcDeviceDataReportRequest request) {
 
-        if (StringUtils.isEmpty(request.getTimeDimension())){
+        if (StringUtils.isEmpty(request.getTimeDimension())) {
             request.setTimeDimension("day");
         }
 
+        request.setOrganizationId(Ctx.currentUser().getOrganizationId());
+
         String fields =
                 CollectionUtils.isEmpty(request.getReportFields())
                         ? " 1 "
@@ -128,6 +131,8 @@ public class AcDeviceDataService extends BaseService<AcDeviceDataEntity, AcDevic
             where += " and d.direction_name = :directionName ";
         }
 
+        where += " and d.organization_id = :organizationId ";
+
         var sql =
                 "select DATE_TRUNC('"
                         + request.getTimeDimension()
@@ -149,7 +154,13 @@ public class AcDeviceDataService extends BaseService<AcDeviceDataEntity, AcDevic
 
         var countSql = "select count(1) from (" + sql + ") as t";
 
-        var selectSql = "select * from (" + sql + ") as t limit " + request.getPageSize() + " offset " + request.getPageNo() * request.getPageSize();
+        var selectSql =
+                "select * from ("
+                        + sql
+                        + ") as t limit "
+                        + request.getPageSize()
+                        + " offset "
+                        + request.getPageNo() * request.getPageSize();
 
         Query selectQuery = em.createNativeQuery(selectSql, Tuple.class);
         Query countQuery = em.createNativeQuery(countSql, Integer.class);
@@ -210,8 +221,9 @@ public class AcDeviceDataService extends BaseService<AcDeviceDataEntity, AcDevic
                                                                         e -> 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()));
     }
 }