From d035982917751f376da2c0d4b4104ed3d64f39dc Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 12 九月 2024 08:53:44 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java
index 934155a..0096d59 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java
@@ -2,7 +2,15 @@
import cn.hutool.json.JSONObject;
+import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
+import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
+import com.mes.rawglassstation.entity.RawGlassStorageStation;
+import com.mes.rawglassstation.service.RawGlassStorageStationService;
+import com.mes.rawglasstask.entity.RawGlassStorageTask;
+import com.mes.rawglasstask.service.RawGlassStorageTaskService;
+import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
import com.mes.shelfrack.service.ShelfRackService;
+import com.mes.storagetask.entity.request.StorageTaskRequest;
import com.mes.storagetask.service.StorageTaskService;
import com.mes.tools.WebSocketServer;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +18,9 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -22,24 +32,32 @@
private StorageTaskService storageTaskService;
@Autowired
private ShelfRackService shelfRackService;
+ @Autowired
+ private RawGlassStorageDetailsService rawGlassStorageDetailsService;
+ @Autowired
+ private RawGlassStorageStationService rawGlassStorageStationService;
+ @Autowired
+ private RawGlassStorageTaskService rawGlassStorageTaskService;
@Scheduled(fixedDelay = 2000)
public void sendDownWorkstations() {
log.info("鍙戦�佷换鍔′俊鎭拰鏋跺瓙淇℃伅");
JSONObject jsonObject = new JSONObject();
+ List<RawGlassStorageDetails> rack = rawGlassStorageDetailsService.list();
+ List<RawGlassStorageStation> state = rawGlassStorageStationService.list();
+ List<RawGlassStorageTask> tasks = rawGlassStorageTaskService.selectTasks();
- List<Map<String, Object>> rack = shelfRackService.selectshelf_rack();
- List<Map<String, Object>> tasks = storageTaskService.Tasks();
jsonObject.append("rack",rack);
+ jsonObject.append("state",state);
jsonObject.append("tasks",tasks);
log.info(jsonObject.toString());
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("storageTask");
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("rawGlass");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
if (webserver != null&&webserver.session.isOpen()) {
log.info("宸插彂閫�");
- webserver.sendMessage(jsonObject.toString());
+ webserver.sendMessage(String.valueOf(jsonObject));
}
}
}
--
Gitblit v1.8.0