From 5dee8e0784b69cb3e346a3f9acd549cc726c9e27 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 27 八月 2024 10:00:27 +0800
Subject: [PATCH] 代码恢复
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 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 1b5426b..acd2fcf 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
@@ -66,7 +66,27 @@
if (outGlass != null) {
jsonObject.append("overGlass", overGlass);
}
+ //褰撳墠閽㈠寲宸ョ▼鐨勬嬁璧版暟鎹�
+ LambdaQueryWrapper<TemperingGlassInfo> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.select(TemperingGlassInfo::getEngineerId)
+ .lt(TemperingGlassInfo::getState, Const.TEMPERING_END)
+ .groupBy(TemperingGlassInfo::getEngineerId);
+ List<String> engineerIds = temperingAgoService.list(queryWrapper)
+ .stream()
+ .map(TemperingGlassInfo::getEngineerId)
+ .distinct()
+ .collect(Collectors.toList());
+
+ List<Damage> temperingTakeGlassInfos = damageService.list(
+ new LambdaQueryWrapper<Damage>()
+ .in(Damage::getEngineerId, engineerIds)
+ .eq(Damage::getType, Const.GLASS_STATE_TAKE)
+ .orderByAsc(Damage::getId)
+ );
+
+
+ jsonObject.append("temperingTakeGlassInfos", temperingTakeGlassInfos);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("temperingGlass");
if (sendwServer != null) {
@@ -86,6 +106,8 @@
//姝ｅ湪杩涜鐨勪换鍔�
List<TemperingGlassInfo> temperingTaskType = temperingAgoService.selectTaskType();
jsonObject.append("temperingTaskType", temperingTaskType);
+
+
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("temperingIsRun");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
--
Gitblit v1.8.0