From 88cbf1a8c50a15f35dd78a50adc43e71a6530775 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 26 五月 2025 16:22:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
index 54bf769..0224a8d 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
@@ -27,6 +27,8 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -220,7 +222,7 @@
jsonObject.append("bigStorageCageUsage", bigStorageCageUsage);
List<PieChartVO> pieChartVOS = bigStorageCageService.queryPieChart();
jsonObject.append("pieChartVOS", pieChartVOS);
- List<RunTime> tempRunTimes = bigStorageCageHistoryTaskService.queryRunTimes();
+ List<RunTime> tempRunTimes = bigStorageCageHistoryTaskService.queryRunTimes(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
jsonObject.append("tempRunTimes", tempRunTimes);
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
--
Gitblit v1.8.0