From 409b5ac5a3b160eacb1fefa6a10bf97b5f6860d7 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期三, 02 九月 2026 17:41:22 +0800
Subject: [PATCH] 实现采集器实时扩展测量接收
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TestConsoleDataServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TestConsoleDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TestConsoleDataServiceImpl.java
index adf7bb1..4d8a52c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TestConsoleDataServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TestConsoleDataServiceImpl.java
@@ -134,7 +134,7 @@
List<Map<String, Object>> changes = (List<Map<String, Object>>) (List<?>) JSON.parseArray(action.getChangesSummary(), Map.class);
Set<String> editable = switch (action.getDataType())
{
- case "REALTIME" -> Set.of("voltage", "current", "capacity", "energy");
+ case "REALTIME" -> Set.of("voltage", "current", "capacity", "energy", "metricValue");
case "STEP" -> Set.of("stepDuration", "capacity", "energy", "startVoltage", "endVoltage",
"chargePeakVoltage", "dischargeValleyVoltage");
case "CYCLE" -> Set.of("chargeCapacity", "dischargeCapacity", "efficiency", "chargeEnergy",
@@ -215,7 +215,7 @@
{
return switch (dataType)
{
- case "REALTIME" -> Set.of("voltage", "current", "capacity", "energy");
+ case "REALTIME" -> Set.of("voltage", "current", "capacity", "energy", "metricValue");
case "STEP" -> Set.of("stepDuration", "capacity", "energy", "startVoltage", "endVoltage",
"chargePeakVoltage", "dischargeValleyVoltage");
case "CYCLE" -> Set.of("chargeCapacity", "dischargeCapacity", "efficiency", "chargeEnergy",
@@ -227,6 +227,12 @@
private Long[] parseDeleteIdentity(String value, String dataType)
{
String[] parts = value.split(":", -1);
+ if ("REALTIME".equals(dataType) && parts.length == 5 && "collector".equals(parts[0])
+ && !parts[2].isBlank() && !parts[4].isBlank())
+ {
+ try { return new Long[] { Long.valueOf(parts[1]), Long.valueOf(parts[3]) }; }
+ catch (NumberFormatException exception) { return null; }
+ }
int expectedLength = "STEP".equals(dataType) ? 8 : "CYCLE".equals(dataType) ? 7 : 6;
int legacyLength = "STEP".equals(dataType) ? 5 : "CYCLE".equals(dataType) ? 4 : 3;
if (parts.length != expectedLength && parts.length != legacyLength) return null;
--
Gitblit v1.7.1