From f5a13d8fc3d0e49adcf73231e7ba60bfd7f5e296 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 13 八月 2024 09:14:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
index ba99c63..b42a294 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -150,7 +150,7 @@
public void temperingIsRun() {
JSONObject jsonObject = new JSONObject();
//姝ｅ湪杩涜鐨勪换鍔�
- List<EdgGlassTaskInfo> taskCaches = edgGlassTaskInfoService.selectTaskCacheIsRun();
+ List<TaskCache> taskCaches = taskCacheService.selectTaskCacheIsRun();
jsonObject.append("taskCaches", taskCaches);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("isRun");
if (sendwServer != null) {
@@ -782,7 +782,7 @@
public void cacheGlassIsRun() {
JSONObject jsonObject = new JSONObject();
//姝ｅ湪杩涜鐨勪换鍔�
- List<EdgGlassTaskInfo> taskCaches = edgGlassTaskInfoService.selectTaskCacheIsRun();
+ List<TaskCache> taskCaches = taskCacheService.selectTaskCacheIsRun();
jsonObject.append("taskCaches", taskCaches);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlassIsRun");
if (sendwServer != null) {
--
Gitblit v1.8.0