From 6485c1ffa31a8723945f873525beed331efeab08 Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期二, 11 三月 2025 09:27:09 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject --- hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java | 8 ++++++++ 1 files changed, 8 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 f5661a3..23ca9f9 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 @@ -120,6 +120,14 @@ .groupBy(TemperingGlassInfo::getEngineerId, TemperingGlassInfo::getTemperingLayoutId) // 鎸� engineerId 鍜� temperingLayoutId 鍒嗙粍 ); jsonObject.append("temperingGlassInfoList", temperingGlassInfoList.size()); + //澶у睆閽㈠寲淇℃伅 + List<TemperingGlassInfo> temperingGlassInfoOutList = temperingAgoService.list( + new LambdaQueryWrapper<TemperingGlassInfo>() + .select(TemperingGlassInfo::getEngineerId, TemperingGlassInfo::getTemperingLayoutId) // 閫夋嫨瑕佸幓閲嶇殑瀛楁 + .eq(TemperingGlassInfo::getState, Const.TEMPERING_SUCCESS) + .groupBy(TemperingGlassInfo::getEngineerId, TemperingGlassInfo::getTemperingLayoutId) // 鎸� engineerId 鍜� temperingLayoutId 鍒嗙粍 + ); + jsonObject.append("temperingGlassInfoOutList", temperingGlassInfoOutList.size()); ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen"); if (sendwServer != null) { for (WebSocketServer webserver : sendwServer) { -- Gitblit v1.8.0