From a9f956b8721682e4022cc14e46a19605da616fd6 Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Thu, 20 Feb 2025 21:57:06 +0800
Subject: [PATCH] =?UTF-8?q?feat(pdcDeviceData):=E6=8C=89=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 GetReport2Request 中添加 organizationId 字段
- 在 PdcDeviceDataService 中设置当前用户的组织 ID
- 更新 SQL 查询语句，增加按组织 ID 过滤的条件
---
 .../lihongjie/coal/pdcDeviceData/dto/GetReport2Request.java   | 3 +++
 .../coal/pdcDeviceData/service/PdcDeviceDataService.java      | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/src/main/java/cn/lihongjie/coal/pdcDeviceData/dto/GetReport2Request.java b/src/main/java/cn/lihongjie/coal/pdcDeviceData/dto/GetReport2Request.java
index 7783e5ba..bb9d3665 100644
--- a/src/main/java/cn/lihongjie/coal/pdcDeviceData/dto/GetReport2Request.java
+++ b/src/main/java/cn/lihongjie/coal/pdcDeviceData/dto/GetReport2Request.java
@@ -32,4 +32,7 @@ hour
 
     private String td;
 
+
+    private String organizationId;
+
 }
diff --git a/src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java b/src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java
index fe4dfb26..894dcf45 100644
--- a/src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java
+++ b/src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java
@@ -96,6 +96,8 @@ public class PdcDeviceDataService
 
         request.setTd("1 " + request.getTimeDimension());
 
+        request.setOrganizationId(Ctx.currentUser().getOrganizationId());
+
         return JpaUtils.execNativeQuery(
                 em,
                 FreeMakerUtils.render(
@@ -117,6 +119,8 @@ public class PdcDeviceDataService
                                              where dd.time >= :startTime
                                                and dd.time <= :endTime
                                                
+                                               and dd.organization_id = :organizationId
+                                               
                                                <#if deviceGroup??>
                                                
                                                 and pd.device_group like '%'  || :deviceGroup || '%'