From 24772b6aed1f11ee416415a154e6fca415f4154e Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期六, 06 十二月 2025 22:01:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/task/DeviceLogScheduler.java | 213 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 170 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/core/task/DeviceLogScheduler.java b/src/main/java/com/zy/core/task/DeviceLogScheduler.java
index da31515..0f0d4f7 100644
--- a/src/main/java/com/zy/core/task/DeviceLogScheduler.java
+++ b/src/main/java/com/zy/core/task/DeviceLogScheduler.java
@@ -1,68 +1,195 @@
package com.zy.core.task;
+
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.entity.DeviceConfig;
+import com.alibaba.fastjson.serializer.SerializerFeature;
import com.zy.asrs.entity.DeviceDataLog;
-import com.zy.asrs.service.DeviceConfigService;
import com.zy.asrs.service.DeviceDataLogService;
-import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.SlaveType;
+import com.zy.common.utils.RedisUtil;
+import com.zy.core.enums.RedisKeyType;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.text.SimpleDateFormat;
+import java.util.Comparator;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Set;
import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.stream.Collectors;
@Slf4j
@Component
public class DeviceLogScheduler {
- @Autowired
- private DeviceConfigService deviceConfigService;
+ @Value("${deviceLogStorage.type}")
+ private String storageType;
+ @Value("${deviceLogStorage.loggingPath}")
+ private String loggingPath;
+ @Value("${deviceLogStorage.expireDays}")
+ private Integer expireDays;
@Autowired
private DeviceDataLogService deviceDataLogService;
+ @Autowired
+ private RedisUtil redisUtil;
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void delDeviceLog() {
+ if ("mysql".equals(storageType)) {
+ deviceDataLogService.clearLog(expireDays == null ? 1 : expireDays);
+ }else if ("file".equals(storageType)) {
+ clearFileLog(expireDays == null ? 1 : expireDays);
+ }else {
+ log.error("鏈畾涔夌殑瀛樺偍绫诲瀷锛歿}", storageType);
+ }
+ }
@Scheduled(cron = "0/3 * * * * ? ")
public void execute() {
-// List<DeviceConfig> shuttleList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
-// .eq("device_type", String.valueOf(SlaveType.Shuttle)));
-// for (DeviceConfig deviceConfig : shuttleList) {
-// ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, deviceConfig.getDeviceNo());
-// if(shuttleThread == null){
-// continue;
-// }
-//
-// ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
-// if (shuttleProtocol == null) {
-// continue;
-// }
-//
-// if (System.currentTimeMillis() - shuttleProtocol.getDeviceDataLog() > 500) {
-// if (shuttleThread.getOriginDeviceData() != null) {
-// //閲囬泦鏃堕棿瓒呰繃5s锛屼繚瀛樹竴娆℃暟鎹褰�
-//
-// //绂荤嚎涓嶅仛鏃ュ織瀛樺偍
-// if (shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.OFFLINE)) {
-// continue;
-// }
-//
-// //淇濆瓨鏁版嵁璁板綍
-// DeviceDataLog deviceDataLog = new DeviceDataLog();
-// deviceDataLog.setOriginData(JSON.toJSONString(shuttleThread.getOriginDeviceData()));
-// deviceDataLog.setWcsData(JSON.toJSONString(shuttleProtocol));
-// deviceDataLog.setType(String.valueOf(SlaveType.Shuttle));
-// deviceDataLog.setDeviceNo(deviceConfig.getDeviceNo());
-// deviceDataLog.setCreateTime(new Date());
-// deviceDataLogService.insert(deviceDataLog);
-//
-// //鏇存柊閲囬泦鏃堕棿
-// shuttleThread.updateDeviceDataLogTime(System.currentTimeMillis());
-// }
-// }
-// }
+ int maxCount = 100;
+ Set<String> keys = redisUtil.scanKeys(RedisKeyType.DEVICE_LOG_KEY.key, maxCount);
+ if (keys == null || keys.isEmpty()) {
+ return;
+ }
+ List<Object> values = redisUtil.multiGet(keys);
+ List<DeviceDataLog> list = new ArrayList<>();
+ for (Object object : values) {
+ if (object instanceof DeviceDataLog) {
+ list.add((DeviceDataLog) object);
+ }
+ }
+ if (!list.isEmpty()) {
+ if ("mysql".equals(storageType)) {
+ mysqlSave(keys, list);
+ }else if ("file".equals(storageType)) {
+ fileSave(keys, list);
+ }else {
+ log.error("鏈畾涔夌殑瀛樺偍绫诲瀷锛歿}", storageType);
+ }
+ }
+ }
+
+ private void mysqlSave(Set<String> keys, List<DeviceDataLog> list) {
+ if (deviceDataLogService.saveBatch(list)) {
+ redisUtil.del(keys.toArray(new String[0]));
+ }
+ }
+
+ private void fileSave(Set<String> keys, List<DeviceDataLog> list) {
+ try {
+ Path baseDir = Paths.get(loggingPath);
+ Files.createDirectories(baseDir);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+ Map<String, Map<String, List<DeviceDataLog>>> group = new HashMap<>();
+ for (DeviceDataLog logItem : list) {
+ String typeName = logItem.getType();
+ String datePart = sdf.format(logItem.getCreateTime() == null ? new Date() : logItem.getCreateTime());
+ String prefix = typeName + "_" + String.valueOf(logItem.getDeviceNo()) + "_" + datePart + "_";
+ group.computeIfAbsent(datePart, k -> new HashMap<>())
+ .computeIfAbsent(prefix, k -> new ArrayList<>())
+ .add(logItem);
+ }
+ for (Map.Entry<String, Map<String, List<DeviceDataLog>>> dateEntry : group.entrySet()) {
+ Path dayDir = baseDir.resolve(dateEntry.getKey());
+ Files.createDirectories(dayDir);
+ for (Map.Entry<String, List<DeviceDataLog>> entry : dateEntry.getValue().entrySet()) {
+ String prefix = entry.getKey();
+ List<DeviceDataLog> logs = entry.getValue();
+ logs.sort(Comparator.comparing(DeviceDataLog::getCreateTime, Comparator.nullsLast(Date::compareTo)));
+ int index = findStartIndex(dayDir, prefix);
+ Path current = dayDir.resolve(prefix + index + ".log");
+ if (!Files.exists(current)) {
+ Files.createFile(current);
+ }
+ long size = Files.size(current);
+ long max = 1024L * 1024L;
+ for (DeviceDataLog d : logs) {
+ String json = JSON.toJSONStringWithDateFormat(d, "yyyy-MM-dd HH:mm:ss.SSS", SerializerFeature.WriteDateUseDateFormat);
+ byte[] line = (json + System.lineSeparator()).getBytes(StandardCharsets.UTF_8);
+ if (size + line.length > max) {
+ index++;
+ current = dayDir.resolve(prefix + index + ".log");
+ Files.createFile(current);
+ size = 0;
+ }
+ Files.write(current, line, StandardOpenOption.CREATE, StandardOpenOption.APPEND);
+ size += line.length;
+ }
+ }
+ }
+ redisUtil.del(keys.toArray(new String[0]));
+ } catch (Exception e) {
+ log.error("璁惧鏃ュ織鏂囦欢瀛樺偍澶辫触", e);
+ }
+ }
+
+ private int findStartIndex(Path baseDir, String prefix) throws Exception {
+ List<Path> matched = Files.list(baseDir)
+ .filter(p -> {
+ String n = p.getFileName().toString();
+ return n.startsWith(prefix) && n.endsWith(".log");
+ })
+ .collect(Collectors.toList());
+ int maxIdx = 0;
+ for (Path p : matched) {
+ String name = p.getFileName().toString();
+ String suf = name.substring(prefix.length());
+ if (!suf.isEmpty()) {
+ try {
+ int val = Integer.parseInt(suf.replace(".log", ""));
+ if (val > maxIdx) {
+ maxIdx = val;
+ }
+ } catch (NumberFormatException ignored) {}
+ }
+ }
+ int candidate = maxIdx == 0 ? 1 : maxIdx;
+ Path path = baseDir.resolve(prefix + candidate + ".log");
+ if (Files.exists(path)) {
+ long size = Files.size(path);
+ if (size >= 1024L * 1024L) {
+ return candidate + 1;
+ }
+ }
+ return candidate;
+ }
+
+ private void clearFileLog(int days) {
+ try {
+ Path baseDir = Paths.get(loggingPath);
+ if (!Files.exists(baseDir)) {
+ return;
+ }
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+ long cutoff = System.currentTimeMillis() - (long) days * 24 * 60 * 60 * 1000;
+ List<Path> dirs = Files.list(baseDir).filter(Files::isDirectory).collect(Collectors.toList());
+ for (Path dir : dirs) {
+ String name = dir.getFileName().toString();
+ if (name.length() == 8 && name.chars().allMatch(Character::isDigit)) {
+ Date d = sdf.parse(name);
+ if (d.getTime() < cutoff) {
+ List<Path> all = Files.walk(dir).sorted(Comparator.reverseOrder()).collect(Collectors.toList());
+ for (Path p : all) {
+ try {
+ Files.deleteIfExists(p);
+ } catch (Exception ignored) {}
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.error("璁惧鏃ュ織鏂囦欢娓呯悊澶辫触", e);
+ }
}
}
--
Gitblit v1.9.1