From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java | 68 ++++++++--------------------------
1 files changed, 16 insertions(+), 52 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
index 1429d59..1fcdedf 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
@@ -88,6 +88,22 @@
}
}
jsonObject.append("bigStorageCageDetailsFeedTask", inTaskList);
+
+ //杩涚墖鑱旀満
+ ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl");
+ jsonObject.append("inkageEntity", inkageEntity.getValue());
+ //杩涚墖璇锋眰
+ ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP1A.DLP1A.RequestMes");
+ jsonObject.append("requestEntity", requestEntity.getValue());
+ //鍚姩鍛戒护
+ ReadWriteEntity mesReplyEntity = miloService.readFromOpcUa("DLP1A.DLP1A.MesReply");
+ jsonObject.append("mesReplyEntity", mesReplyEntity.getValue());
+ //鍑虹墖鑱旀満
+ ReadWriteEntity outInkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl");
+ jsonObject.append("outInkageEntity", outInkageEntity.getValue());
+ //鍑虹墖璇锋眰
+ ReadWriteEntity outRequestEntity = miloService.readFromOpcUa("DLP1B.DLP1B.RequestMes");
+ jsonObject.append("outRequestEntity", outRequestEntity.getValue());
}catch(Exception e){
//todo:涓嶅仛浠诲姟澶勭悊
}
@@ -181,58 +197,6 @@
}
} catch (Exception e) {
e.printStackTrace();
- }
- }
-
-// @Scheduled(fixedDelay = 1000)
- public void temperingIsRun() {
- JSONObject jsonObject = new JSONObject();
- //杩涚墖浠诲姟鏁版嵁
- List<BigStorageCageDetails> bigStorageCageDetailsFeedTask = bigStorageCageDetailsService.selectFeedTask();
- jsonObject.append("bigStorageCageDetailsFeedTask", bigStorageCageDetailsFeedTask);
- //鍑虹墖浠诲姟鏁版嵁
- List<BigStorageCageDetails> bigStorageCageDetailsOutTask = bigStorageCageDetailsService.selectOutTask();
- jsonObject.append("bigStorageCageDetailsOutTask", bigStorageCageDetailsOutTask);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("isRun");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
- } else {
- log.info("Home is closed");
- }
- }
- }
- }
-
- // @Scheduled(fixedDelay = Long.MAX_VALUE)
- public void scanCodeTask() {
- log.info("鎵弿浠诲姟宸插惎鍔�");
- while (true) {
- JSONObject jsonObject = new JSONObject();
- try (Socket socket = new Socket(scanIp, scanPort);
- BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()))) {
- // 鎺ユ敹鏈嶅姟鍣ㄥ搷搴�
- log.info("绛夊緟鎵爜涓�......");
- String glassId = in.readLine();
- log.info("鎵弿鍒扮殑鐜荤拑id锛歿}", glassId);
- List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("slicecage");
- if (CollectionUtils.isNotEmpty(sendwServer)) {
- //鎸夌収鐜荤拑id鑾峰彇鐜荤拑淇℃伅杩斿洖缁欏墠绔晫闈紝鍏蜂綋闇�瑕佸摢浜涙暟鎹緟纭
- GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
- .eq(GlassInfo::getGlassId, glassId).last("limit 1"));
- if (null == glassInfo) {
- log.info("鎸夌収鐜荤拑id锛歿}锛屾棤娉曟壘鍒扮幓鐠冧俊鎭�", glassId);
- } else {
- for (WebSocketServer webserver : sendwServer) {
- jsonObject.append("scanGlass", glassInfo);
- webserver.sendMessage(jsonObject.toString());
- }
- }
- }
- } catch (Exception exception) {
- log.info("璇诲彇寮傚父锛屽師鍥犱负{}", exception.getMessage());
- }
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0