OrgTJWater/TJWaterServer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新api url

Browse Source
This commit is contained in:
JIANG
2026-01-29 11:18:54 +08:00
parent 7122b0b2ac
commit 5cb2d17be1
17 changed files with 85 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/olmap/BurstPipeAnalysis/AnalysisParameters.tsx
View File

@@ -283,7 +283,7 @@ const AnalysisParameters: React.FC = () => {
};
try {
await axios.post(`${config.BACKEND_URL}/burst_analysis/`, body, {
await axios.post(`${config.BACKEND_URL}/api/v1/burst_analysis/`, body, {
headers: {
"Accept-Encoding": "gzip",
"Content-Type": "application/json",

2
src/components/olmap/BurstPipeAnalysis/BurstPipeAnalysisPanel.tsx
View File

@@ -129,7 +129,7 @@ const BurstPipeAnalysisPanel: React.FC<BurstPipeAnalysisPanelProps> = ({
const handleLocateScheme = async (scheme: SchemeRecord) => {
try {
const response = await axios.get(
`${config.BACKEND_URL}/postgresql/burst-locate-result/${scheme.schemeName}`
`${config.BACKEND_URL}/api/v1/burst-locate-result/${scheme.schemeName}`
);
setLocationResults(response.data);
setCurrentTab(2); // 切换到定位结果标签页

2
src/components/olmap/BurstPipeAnalysis/SchemeQuery.tsx
View File

@@ -133,7 +133,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
setLoading(true);
try {
const response = await axios.get(
`${config.BACKEND_URL}/getallschemes/?network=${network}`
`${config.BACKEND_URL}/api/v1/getallschemes/?network=${network}`
);
let filteredResults = response.data;

2
src/components/olmap/ContaminantSimulation/AnalysisParameters.tsx
View File

@@ -157,7 +157,7 @@ const AnalysisParameters: React.FC = () => {
pattern: pattern || undefined,
};
await axios.get(`${config.BACKEND_URL}/contaminant_simulation/`, {
await axios.get(`${config.BACKEND_URL}/api/v1/contaminant_simulation/`, {
params,
});

2
src/components/olmap/ContaminantSimulation/SchemeQuery.tsx
View File

@@ -93,7 +93,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
setLoading(true);
try {
const response = await axios.get(
`${config.BACKEND_URL}/getallschemes/?network=${network}`
`${config.BACKEND_URL}/api/v1/getallschemes/?network=${network}`
);
let filteredResults = response.data;

20
src/components/olmap/HealthRiskAnalysis/Timeline.tsx
View File

@@ -38,8 +38,6 @@ import {
RISK_BREAKS,
} from "./types";
const backendUrl = config.BACKEND_URL;
// 辅助函数：将日期向下取整到最近的15分钟
const getRoundedDate = (date: Date): Date => {
const minutes = date.getHours() * 60 + date.getMinutes();
@@ -49,7 +47,7 @@ const getRoundedDate = (date: Date): Date => {
Math.floor(roundedMinutes / 60),
roundedMinutes % 60,
0,
0
0,
);
return roundedDate;
};
@@ -124,7 +122,7 @@ const Timeline: React.FC<TimelineProps> = ({
setCurrentYear(value);
}, 500); // 500ms 防抖延迟
},
[minTime, maxTime]
[minTime, maxTime],
);
// 播放控制
@@ -215,7 +213,7 @@ const Timeline: React.FC<TimelineProps> = ({
}, newInterval);
}
},
[isPlaying]
[isPlaying],
);
// 组件加载时设置初始时间为当前时间的最近15分钟
@@ -245,7 +243,7 @@ const Timeline: React.FC<TimelineProps> = ({
const safeIndex = Math.max(0, Math.min(index, y.length - 1));
return y[safeIndex];
},
[]
[],
);
// 更新管道图层中的 healthRisk 属性
@@ -270,7 +268,7 @@ const Timeline: React.FC<TimelineProps> = ({
});
});
},
[pipeLayer]
[pipeLayer],
);
// 监听瓦片加载，为新瓦片设置 healthRisk 属性
@@ -313,7 +311,7 @@ const Timeline: React.FC<TimelineProps> = ({
predictionResults.forEach((result) => {
const probability = getSurvivalProbabilityAtYear(
result.survival_function,
currentYear - 4 // 使用索引 (0-based)
currentYear - 4, // 使用索引 (0-based)
);
pipeHealthData.set(result.link_id, probability);
});
@@ -347,7 +345,7 @@ const Timeline: React.FC<TimelineProps> = ({
widthCases.push(["<=", ["get", "healthRisk"], breakValue], width);
});
console.log(
`应用健康风险样式，年份: ${currentYear}, 分段: ${breaks.length}`
`应用健康风险样式，年份: ${currentYear}, 分段: ${breaks.length}`,
);
console.log("颜色表达式:", colorCases);
console.log("宽度表达式:", widthCases);
@@ -371,7 +369,7 @@ const Timeline: React.FC<TimelineProps> = ({
const layers = map.getLayers().getArray();
const pipesLayer = layers.find(
(layer) =>
layer instanceof WebGLVectorTileLayer && layer.get("value") === "pipes"
layer instanceof WebGLVectorTileLayer && layer.get("value") === "pipes",
) as WebGLVectorTileLayer | undefined;
if (pipesLayer) {
@@ -426,7 +424,7 @@ const Timeline: React.FC<TimelineProps> = ({
});
try {
const response = await fetch(
`${backendUrl}/timescaledb/composite/pipeline-health-prediction?query_time=${query_time}&network_name=${NETWORK_NAME}`
`${config.BACKEND_URL}/api/v1/composite/pipeline-health-prediction?query_time=${query_time}&network_name=${NETWORK_NAME}`,
);
if (response.ok) {

2
src/components/olmap/MonitoringPlaceOptimization/OptimizationParameters.tsx
View File

@@ -94,7 +94,7 @@ const OptimizationParameters: React.FC = () => {
try {
// 发送优化请求
const response = await axios.post(
`${config.BACKEND_URL}/sensorplacementscheme/create`,
`${config.BACKEND_URL}/api/v1/sensorplacementscheme/create`,
null,
{
params: {

2
src/components/olmap/MonitoringPlaceOptimization/SchemeQuery.tsx
View File

@@ -148,7 +148,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
setLoading(true);
try {
const response = await axios.get(
`${config.BACKEND_URL}/getallsensorplacements/?network=${network}`
`${config.BACKEND_URL}/api/v1/getallsensorplacements/?network=${network}`
);
let filteredResults = response.data;

56
src/components/olmap/SCADADataPanel.tsx
View File

@@ -78,7 +78,7 @@ type LoadingState = "idle" | "loading" | "success" | "error";
*/
const fetchFromBackend = async (
deviceIds: string[],
range: { from: Date; to: Date }
range: { from: Date; to: Date },
): Promise<TimeSeriesPoint[]> => {
if (deviceIds.length === 0) {
return [];
@@ -88,12 +88,11 @@ const fetchFromBackend = async (
const start_time = dayjs(range.from).toISOString();
const end_time = dayjs(range.to).toISOString();
// 清洗数据接口
const cleaningDataUrl = `${config.BACKEND_URL}/timescaledb/scada/by-ids-field-time-range?device_ids=${device_ids}&field=cleaned_value&start_time=${start_time}&end_time=${end_time}`;
const cleaningDataUrl = `${config.BACKEND_URL}/api/v1/scada/by-ids-field-time-range?device_ids=${device_ids}&field=cleaned_value&start_time=${start_time}&end_time=${end_time}`;
// 原始数据
const rawDataUrl = `${config.BACKEND_URL}/timescaledb/scada/by-ids-field-time-range?device_ids=${device_ids}&field=monitored_value&start_time=${start_time}&end_time=${end_time}`;
const rawDataUrl = `${config.BACKEND_URL}/api/v1/scada/by-ids-field-time-range?device_ids=${device_ids}&field=monitored_value&start_time=${start_time}&end_time=${end_time}`;
// 模拟数据接口
const simulationDataUrl = `${config.BACKEND_URL}/timescaledb/composite/scada-simulation?device_ids=${device_ids}&start_time=${start_time}&end_time=${end_time}`;
const simulationDataUrl = `${config.BACKEND_URL}/api/v1/composite/scada-simulation?device_ids=${device_ids}&start_time=${start_time}&end_time=${end_time}`;
try {
// 优先查询清洗数据和模拟数据
const [cleaningRes, simulationRes] = await Promise.all([
@@ -115,7 +114,7 @@ const fetchFromBackend = async (
simulationData,
deviceIds,
"clean",
"sim"
"sim",
);
} else {
// 如果清洗数据没有数据，查询原始数据，返回模拟和原始数据
@@ -128,7 +127,7 @@ const fetchFromBackend = async (
rawData,
deviceIds,
"sim",
"raw"
"raw",
);
}
} catch (error) {
@@ -143,7 +142,7 @@ const fetchFromBackend = async (
*/
const transformBackendData = (
backendData: any,
deviceIds: string[]
deviceIds: string[],
): TimeSeriesPoint[] => {
// 处理后端返回的对象格式: { deviceId: [{time: "...", value: ...}] }
if (backendData && !Array.isArray(backendData)) {
@@ -176,12 +175,12 @@ const transformBackendData = (
([timestamp, values]) => ({
timestamp,
values,
})
}),
);
result.sort(
(a, b) =>
new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime()
new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime(),
);
return result;
@@ -200,7 +199,7 @@ const mergeTimeSeriesData = (
data2: TimeSeriesPoint[],
deviceIds: string[],
suffix1: string,
suffix2: string
suffix2: string,
): TimeSeriesPoint[] => {
const timeMap = new Map<string, Record<string, number | null>>();
@@ -228,7 +227,7 @@ const mergeTimeSeriesData = (
}));
result.sort(
(a, b) => new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime()
(a, b) => new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime(),
);
return result;
@@ -239,7 +238,7 @@ const formatTimestamp = (timestamp: string) =>
const ensureValidRange = (
from: Dayjs,
to: Dayjs
to: Dayjs,
): { from: Dayjs; to: Dayjs } => {
if (from.isAfter(to)) {
return { from: to, to: from };
@@ -251,7 +250,7 @@ const buildDataset = (
points: TimeSeriesPoint[],
deviceIds: string[],
fractionDigits: number,
showCleaning: boolean
showCleaning: boolean,
) => {
return points.map((point) => {
const entry: Record<string, any> = {
@@ -325,19 +324,18 @@ const SCADADataPanel: React.FC<SCADADataPanelProps> = ({
return async (
deviceIds: string[],
range: { from: Date; to: Date }
range: { from: Date; to: Date },
): Promise<TimeSeriesPoint[]> => {
const device_ids = deviceIds.join(",");
const start_time = dayjs(range.from).toISOString();
const end_time = dayjs(range.to).toISOString();
// 清洗数据接口
const cleaningDataUrl = `${config.BACKEND_URL}/timescaledb/scada/by-ids-field-time-range?device_ids=${device_ids}&field=cleaned_value&start_time=${start_time}&end_time=${end_time}`;
const cleaningDataUrl = `${config.BACKEND_URL}/api/v1/scada/by-ids-field-time-range?device_ids=${device_ids}&field=cleaned_value&start_time=${start_time}&end_time=${end_time}`;
// 原始数据
const rawDataUrl = `${config.BACKEND_URL}/timescaledb/scada/by-ids-field-time-range?device_ids=${device_ids}&field=monitored_value&start_time=${start_time}&end_time=${end_time}`;
const rawDataUrl = `${config.BACKEND_URL}/api/v1/scada/by-ids-field-time-range?device_ids=${device_ids}&field=monitored_value&start_time=${start_time}&end_time=${end_time}`;
// 模拟数据接口
const simulationDataUrl = `${config.BACKEND_URL}/timescaledb/composite/scada-simulation?device_ids=${device_ids}&start_time=${start_time}&end_time=${end_time}`;
const simulationDataUrl = `${config.BACKEND_URL}/api/v1/composite/scada-simulation?device_ids=${device_ids}&start_time=${start_time}&end_time=${end_time}`;
try {
const [cleanRes, rawRes, simRes] = await Promise.all([
fetch(cleaningDataUrl)
@@ -381,12 +379,12 @@ const SCADADataPanel: React.FC<SCADADataPanelProps> = ({
([timestamp, values]) => ({
timestamp,
values,
})
}),
);
result.sort(
(a, b) =>
new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime()
new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime(),
);
return result;
@@ -420,7 +418,7 @@ const SCADADataPanel: React.FC<SCADADataPanelProps> = ({
const dataset = useMemo(
() => buildDataset(timeSeries, deviceIds, fractionDigits, showCleaning),
[timeSeries, deviceIds, fractionDigits, showCleaning]
[timeSeries, deviceIds, fractionDigits, showCleaning],
);
const handleFetch = useCallback(
@@ -447,7 +445,7 @@ const SCADADataPanel: React.FC<SCADADataPanelProps> = ({
setLoadingState("error");
}
},
[deviceIds, customFetcher, hasDevices, normalizedRange]
[deviceIds, customFetcher, hasDevices, normalizedRange],
);
// 处理数据清洗
@@ -479,9 +477,9 @@ const SCADADataPanel: React.FC<SCADADataPanelProps> = ({
const response = await axios.post(
`${
config.BACKEND_URL
}/timescaledb/composite/clean-scada?device_ids=${deviceIds.join(
","
)}&start_time=${startTime}&end_time=${endTime}`
}/api/v1/composite/clean-scada?device_ids=${deviceIds.join(
",",
)}&start_time=${startTime}&end_time=${endTime}`,
);
console.log("[SCADADataPanel] 清洗响应:", response.data);
@@ -627,7 +625,7 @@ const SCADADataPanel: React.FC<SCADADataPanelProps> = ({
const fieldKey = `${id}_${key}`;
// 检查是否有该字段的数据
const hasData = dataset.some(
(item) => item[fieldKey] !== null && item[fieldKey] !== undefined
(item) => item[fieldKey] !== null && item[fieldKey] !== undefined,
);
if (hasData) {
@@ -663,7 +661,7 @@ const SCADADataPanel: React.FC<SCADADataPanelProps> = ({
}-${index}`,
...item,
})),
[dataset]
[dataset],
);
const renderEmpty = () => {
@@ -760,7 +758,7 @@ const SCADADataPanel: React.FC<SCADADataPanelProps> = ({
["raw", "clean", "sim"].forEach((suffix, sIndex) => {
const key = `${id}_${suffix}`;
const hasData = dataset.some(
(item) => item[key] !== null && item[key] !== undefined
(item) => item[key] !== null && item[key] !== undefined,
);
if (hasData) {
series.push({

2
src/components/olmap/SCADADeviceList.tsx
View File

@@ -617,7 +617,7 @@ const SCADADeviceList: React.FC<SCADADeviceListProps> = ({
// 调用后端清洗接口
const response = await axios.post(
`${config.BACKEND_URL}/timescaledb/composite/clean-scada?device_ids=all&start_time=${startTime}&end_time=${endTime}`
`${config.BACKEND_URL}/api/v1/composite/clean-scada?device_ids=all&start_time=${startTime}&end_time=${endTime}`
);
// 处理成功响应