From d89dcf8ba3353f978d7d1dca7f1ad1a8151b1462 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 12 四月 2026 18:30:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/task/DeviceLogScheduler.java | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/core/task/DeviceLogScheduler.java b/src/main/java/com/zy/core/task/DeviceLogScheduler.java
index e134564..c448830 100644
--- a/src/main/java/com/zy/core/task/DeviceLogScheduler.java
+++ b/src/main/java/com/zy/core/task/DeviceLogScheduler.java
@@ -149,12 +149,8 @@
if (prefix == null) {
continue;
}
- String deviceFolderKey = buildDeviceFolderKey(logItem);
- if (deviceFolderKey == null) {
- continue;
- }
group.computeIfAbsent(datePart, k -> new HashMap<>())
- .computeIfAbsent(deviceFolderKey, k -> new ArrayList<>())
+ .computeIfAbsent(prefix, k -> new ArrayList<>())
.add(logItem);
}
for (Map.Entry<String, Map<String, List<DeviceDataLog>>> dateEntry : group.entrySet()) {
@@ -217,13 +213,6 @@
return logItem.getType() + "_" + logItem.getDeviceNo() + "_station_" + logItem.getStationId() + "_" + datePart + "_";
}
return logItem.getType() + "_" + logItem.getDeviceNo() + "_" + datePart + "_";
- }
-
- private String buildDeviceFolderKey(DeviceDataLog logItem) {
- if (logItem == null || logItem.getType() == null || logItem.getDeviceNo() == null) {
- return null;
- }
- return logItem.getType() + ":" + logItem.getDeviceNo();
}
private Path resolveDeviceDir(Path dayDir, DeviceDataLog logItem) {
--
Gitblit v1.9.1