From 595b8d1c505777db0d449622419d5e35eaf5cd7f Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 23 八月 2024 16:46:59 +0800
Subject: [PATCH] 增加放回接口和绕过全局逻辑方法,还原部门被覆盖代码
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java | 22 ----------------------
1 files changed, 0 insertions(+), 22 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..1b5426b 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) {
@@ -106,8 +86,6 @@
//姝ｅ湪杩涜鐨勪换鍔�
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