From b0656b315e2eb8376d53ad237e58bdd6e65e31ec Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 01 八月 2024 14:55:50 +0800
Subject: [PATCH] 原片仓储接口完善
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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..700a1c1 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,9 @@
import cn.hutool.json.JSONObject;
+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 +12,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;
@@ -29,8 +33,9 @@
log.info("鍙戦�佷换鍔′俊鎭拰鏋跺瓙淇℃伅");
JSONObject jsonObject = new JSONObject();
- List<Map<String, Object>> rack = shelfRackService.selectshelf_rack();
- List<Map<String, Object>> tasks = storageTaskService.Tasks();
+ List<RawUsageAndShelfRack> rack = shelfRackService.selectshelf_rack();
+ List<StorageTaskRequest> tasks = storageTaskService.Tasks();
+
jsonObject.append("rack",rack);
jsonObject.append("tasks",tasks);
log.info(jsonObject.toString());
@@ -39,7 +44,7 @@
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