From 78e5175a05eeb3776d3f21f603fb6fb7a18b3d54 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 08 八月 2024 10:14:59 +0800
Subject: [PATCH] 1、任务表中新增是否删除字段 0：未删除 1：已删除 2、磨边队列方法改造：增加设置参数接口，websocket推送数据时可按照设置的参数推送对应的数据 3、任务新增破损、拿走状态处理 4、破损数据新增批量新增 5、工位流程卡玻璃是否到齐方法完善
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
index a58215e..4a9356e 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
@@ -30,26 +30,34 @@
JSONObject jsonObject = new JSONObject();
//姝ｅ湪绛夊緟杩涚墖鐨勭幓鐠�
List<TemperingGlassInfo> waitingGlass = temperingAgoService.selectWaitingGlass();
- jsonObject.append("waitingGlass", waitingGlass);
+ if(waitingGlass!=null){
+ jsonObject.append("waitingGlass", waitingGlass);
+ }
+
//鑾峰彇鏁村湪鐐変腑鐨勪袱涓増鍥緄d
List<TemperingGlassInfo> layoutId = temperingAgoService.selectLayoutId();
//杩涚倝涓殑鐜荤拑
if(!layoutId.isEmpty()) {
- List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(layoutId.get(0).getTemperingLayoutId());
+ List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(layoutId.get(0));
jsonObject.append("intoGlass", intoGlass);
//杩涚倝涓殑绗簩涓増鍥�
if (layoutId.size() > 1) {
- List<TemperingGlassInfo> intoGlass2 = temperingAgoService.selectIntoGlass(layoutId.get(1).getTemperingLayoutId());
+ List<TemperingGlassInfo> intoGlass2 = temperingAgoService.selectIntoGlass(layoutId.get(1));
jsonObject.append("intoGlass2", intoGlass2);
}
}
//鍑虹倝鍚庣殑鐜荤拑
List<TemperingGlassInfo> outGlass = temperingAgoService.selectOutGlass();
- jsonObject.append("outGlass", outGlass);
+ if(outGlass!=null){
+ jsonObject.append("outGlass", outGlass);
+ }
+
//杩囨棆杞彴閽㈠寲鍚庣殑鐜荤拑
List<TemperingGlassInfo> overGlass = temperingAgoService.selectOverGlass();
+ if (outGlass != null) {
+ jsonObject.append("overGlass", overGlass);
+ }
- jsonObject.append("overGlass", overGlass);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("temperingGlass");
if (sendwServer != null) {
@@ -68,7 +76,7 @@
//姝ｅ湪杩涜鐨勪换鍔�
List<TemperingGlassInfo>temperingTaskType=temperingAgoService.selectTaskType();
jsonObject.append("temperingTaskType", temperingTaskType);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("isRun");
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("temperingIsRun");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
--
Gitblit v1.8.0