From cfd9f0b05e4e9b46c4d72ec5cefd3c04648648ea Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 02 九月 2024 08:11:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java | 20 --------------------
1 files changed, 0 insertions(+), 20 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 acd2fcf..220c807 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,27 +66,7 @@
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) {
--
Gitblit v1.8.0