From 4220194f54535388daad46136f8da0452441b806 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期三, 02 九月 2026 14:09:58 +0800
Subject: [PATCH] 补齐控制台来源身份与时间字段
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TestConsoleDataServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 d82d7e4..adf7bb1 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
@@ -227,16 +227,25 @@
private Long[] parseDeleteIdentity(String value, String dataType)
{
String[] parts = value.split(":", -1);
- int expectedLength = "STEP".equals(dataType) ? 5 : "CYCLE".equals(dataType) ? 4 : 3;
- if (parts.length != expectedLength) 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;
int offset = "REALTIME".equals(dataType) ? 0 : 1;
try
{
+ if (parts.length == legacyLength && "STEP".equals(dataType))
+ return new Long[] { Long.valueOf(parts[1]), Long.valueOf(parts[2]),
+ Long.valueOf(parts[3]), Long.valueOf(parts[4]) };
+ if (parts.length == legacyLength)
+ return new Long[] { Long.valueOf(parts[0]), Long.valueOf(parts[1]), Long.valueOf(parts[2]) };
if ("STEP".equals(dataType))
return new Long[] { Long.valueOf(parts[offset]), Long.valueOf(parts[offset + 1]),
- Long.valueOf(parts[offset + 2]), Long.valueOf(parts[offset + 3]) };
+ Long.valueOf(parts[offset + 2]), Long.valueOf(parts[offset + 3]),
+ Long.valueOf(parts[offset + 4]), Long.valueOf(parts[offset + 5]),
+ Long.valueOf(parts[offset + 6]) };
return new Long[] { Long.valueOf(parts[offset]), Long.valueOf(parts[offset + 1]),
- Long.valueOf(parts[offset + 2]) };
+ Long.valueOf(parts[offset + 2]), Long.valueOf(parts[offset + 3]),
+ Long.valueOf(parts[offset + 4]), Long.valueOf(parts[offset + 5]) };
}
catch (NumberFormatException exception) { return null; }
}
--
Gitblit v1.7.1