From d1d6a3494e56f6d2954d020716690519dd53a80e Mon Sep 17 00:00:00 2001 From: JIANG Date: Tue, 9 Dec 2025 18:35:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E5=8C=B9=E9=85=8D=20timescaledb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/OlMap/Controls/StyleEditorPanel.tsx | 1 - src/app/OlMap/Controls/Timeline.tsx | 7 +++++-- src/app/OlMap/Controls/Toolbar.tsx | 6 ++++-- src/components/olmap/SCADADataPanel.tsx | 3 +-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/app/OlMap/Controls/StyleEditorPanel.tsx b/src/app/OlMap/Controls/StyleEditorPanel.tsx index 585a12d..9dbb508 100644 --- a/src/app/OlMap/Controls/StyleEditorPanel.tsx +++ b/src/app/OlMap/Controls/StyleEditorPanel.tsx @@ -31,7 +31,6 @@ import { parseColor } from "@utils/parseColor"; import { VectorTile } from "ol"; import { useNotification } from "@refinedev/core"; import { config } from "@/config/config"; -import { set } from "ol/transform"; interface StyleConfig { property: string; diff --git a/src/app/OlMap/Controls/Timeline.tsx b/src/app/OlMap/Controls/Timeline.tsx index b9735d0..826464a 100644 --- a/src/app/OlMap/Controls/Timeline.tsx +++ b/src/app/OlMap/Controls/Timeline.tsx @@ -119,7 +119,8 @@ const Timeline: React.FC = ({ `${backendUrl}/queryallschemerecordsbytimeproperty/?querytime=${query_time}&type=node&property=${junctionProperties}&schemename=${schemeName}` )) : (nodePromise = fetch( - `${backendUrl}/queryallrecordsbytimeproperty/?querytime=${query_time}&type=node&property=${junctionProperties}` + // `${backendUrl}/queryallrecordsbytimeproperty/?querytime=${query_time}&type=node&property=${junctionProperties}` + `${backendUrl}/timescaledb/realtime/query/by-time-property?query_time=${query_time}&type=node&property=${junctionProperties}` )); requests.push(nodePromise); } @@ -136,7 +137,8 @@ const Timeline: React.FC = ({ `${backendUrl}/queryallschemerecordsbytimeproperty/?querytime=${query_time}&type=link&property=${pipeProperties}&schemename=${schemeName}` )) : (linkPromise = fetch( - `${backendUrl}/queryallrecordsbytimeproperty/?querytime=${query_time}&type=link&property=${pipeProperties}` + // `${backendUrl}/queryallrecordsbytimeproperty/?querytime=${query_time}&type=link&property=${pipeProperties}` + `${backendUrl}/timescaledb/realtime/query/by-time-property?query_time=${query_time}&type=link&property=${pipeProperties}` )); requests.push(linkPromise); } @@ -210,6 +212,7 @@ const Timeline: React.FC = ({ // 播放时间间隔选项 const intervalOptions = [ + { value: 5000, label: "5秒" }, { value: 10000, label: "10秒" }, { value: 15000, label: "15秒" }, { value: 20000, label: "20秒" }, diff --git a/src/app/OlMap/Controls/Toolbar.tsx b/src/app/OlMap/Controls/Toolbar.tsx index eca99db..f36ad9c 100644 --- a/src/app/OlMap/Controls/Toolbar.tsx +++ b/src/app/OlMap/Controls/Toolbar.tsx @@ -340,11 +340,13 @@ const Toolbar: React.FC = ({ hiddenButtons, queryType }) => { let response; if (queryType === "scheme") { response = await fetch( - `${backendUrl}/queryschemesimulationrecordsbyidtime/?scheme_name=${schemeName}&id=${id}&querytime=${querytime}&type=${type}` + // `${backendUrl}/queryschemesimulationrecordsbyidtime/?scheme_name=${schemeName}&id=${id}&querytime=${querytime}&type=${type}` + `${backendUrl}/timescaledb/scheme/query/by-id-time?scheme_name=${schemeName}&id=${id}&type=${type}&query_time=${querytime}` ); } else { response = await fetch( - `${backendUrl}/querysimulationrecordsbyidtime/?id=${id}&querytime=${querytime}&type=${type}` + // `${backendUrl}/querysimulationrecordsbyidtime/?id=${id}&querytime=${querytime}&type=${type}` + `${backendUrl}/timescaledb/realtime/query/by-id-time?id=${id}&type=${type}&query_time=${querytime}` ); } if (!response.ok) { diff --git a/src/components/olmap/SCADADataPanel.tsx b/src/components/olmap/SCADADataPanel.tsx index 75e7f84..e1b69ef 100644 --- a/src/components/olmap/SCADADataPanel.tsx +++ b/src/components/olmap/SCADADataPanel.tsx @@ -32,7 +32,7 @@ import utc from "dayjs/plugin/utc"; import timezone from "dayjs/plugin/timezone"; import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs"; import { DateTimePicker, LocalizationProvider } from "@mui/x-date-pickers"; -import config, { NETWORK_NAME } from "@/config/config"; +import config from "@/config/config"; import { GeoJSON } from "ol/format"; import { useGetIdentity } from "@refinedev/core"; import { useNotification } from "@refinedev/core"; @@ -451,7 +451,6 @@ const SCADADataPanel: React.FC = ({ null, { params: { - network: NETWORK_NAME, ids_list: deviceIds.join(","), // 修改:将数组转为逗号分隔字符串 start_time: startTime, end_time: endTime,