From 2cc414131f5196a2aa2cd9640297e98d6c25699b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 18 七月 2024 08:38:09 +0800
Subject: [PATCH] 1、磨边前fixbug：解决查询结果结果long无法转为int异常 2、钢化记录表：初步搭建完成，功能待开发 3、下片理片表中片序字段数据补充
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java | 59 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 16 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
index 308599c..0b65991 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
@@ -1,6 +1,7 @@
package com.mes.job;
import cn.hutool.json.JSONObject;
+import com.mes.downstorage.service.DownStorageCageService;
import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.service.DownWorkstationService;
import com.mes.tools.WebSocketServer;
@@ -17,52 +18,78 @@
@Component
public class Downpush {
-
@Autowired
private DownWorkstationService downWorkstationService;
- @Scheduled(fixedDelay = 1000)
- public void Downpush() {
+ @Autowired
+ private DownStorageCageService downStorageCageService;
-
+ @Scheduled(fixedDelay = 2000)
+ public void sendDownWorkstations() {
+ log.info("鍙戦�佸伐浣嶇幓鐠冧俊鎭�");
JSONObject jsonObject = new JSONObject();
- JSONObject jsonObject2 = new JSONObject();
- JSONObject jsonObject3 = new JSONObject();
List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1,6);
- List<Map<String, Object>> glassinfodata = downWorkstationService.getTotalGlassDimensionsByWorkstation(1,3);
- List<Map<String, Object>> glassinfodata2 = downWorkstationService.getTotalGlassDimensionsByWorkstation(4,6);
jsonObject.append("params",data);
- jsonObject2.append("glassinfo",glassinfodata);
- jsonObject3.append("glassinfo2",glassinfodata2);
log.info(jsonObject.toString());
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unloadglass");
- ArrayList<WebSocketServer> sendwServer2 = WebSocketServer.sessionMap.get("unloadglass2");
- ArrayList<WebSocketServer> sendwServer3 = WebSocketServer.sessionMap.get("unloadglass3");
- // log.info(sendwServer.toString());
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
-
if (webserver != null&&webserver.session.isOpen()) {
+ log.info("宸插彂閫�");
webserver.sendMessage(jsonObject.toString());
}
}
}
+ }
+
+ @Scheduled(fixedDelay = 1000)
+ public void sendGlassInfoData() {
+ log.info("鍙戦�佸伐浣嶆樉绀哄浘淇℃伅1");
+ JSONObject jsonObject2 = new JSONObject();
+ List<Map<String, Object>> glassinfodata = downWorkstationService.getTotalGlassDimensionsByWorkstation(1,3);
+ jsonObject2.append("glassinfo",glassinfodata);
+ log.info(jsonObject2.toString());
+ ArrayList<WebSocketServer> sendwServer2 = WebSocketServer.sessionMap.get("unloadglass2");
if (sendwServer2 != null) {
for (WebSocketServer webserver : sendwServer2) {
-
if (webserver != null&&webserver.session.isOpen()) {
webserver.sendMessage(jsonObject2.toString());
}
}
}
+ }
+
+ @Scheduled(fixedDelay = 1000)
+ public void sendGlassInfoData2() {
+ log.info("鍙戦�佸伐浣嶆樉绀哄浘淇℃伅2");
+ JSONObject jsonObject3 = new JSONObject();
+ List<Map<String, Object>> glassinfodata2 = downWorkstationService.getTotalGlassDimensionsByWorkstation(4,6);
+ jsonObject3.append("glassinfo2",glassinfodata2);
+ log.info(jsonObject3.toString());
+ ArrayList<WebSocketServer> sendwServer3 = WebSocketServer.sessionMap.get("unloadglass3");
if (sendwServer3 != null) {
for (WebSocketServer webserver : sendwServer3) {
-
if (webserver != null&&webserver.session.isOpen()) {
webserver.sendMessage(jsonObject3.toString());
}
}
}
+ }
+ @Scheduled(fixedDelay = 2000)
+ public void sendDownStorageCages() {
+ log.info("鍙戦�佺紦瀛樼幓鐠冧俊鎭�");
+ JSONObject jsonObject4 = new JSONObject();
+ List<Map<String, Object>> list=downStorageCageService.selectDownStorageCages();
+ jsonObject4.append("params2",list);
+ log.info(jsonObject4.toString());
+ ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("downcache");
+ if (sendwServer4 != null) {
+ for (WebSocketServer webserver : sendwServer4) {
+ if (webserver != null&&webserver.session.isOpen()) {
+ webserver.sendMessage(jsonObject4.toString());
+ }
+ }
+ }
}
}
--
Gitblit v1.8.0