From 28ded8102d83cf74bc232d1cdfc89b7f22c41952 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 03 十二月 2024 09:09:31 +0800
Subject: [PATCH] 增加点击防抖事件 增加笼子使用详情的计算优化。 增加数据推送时的报错处理 测量台交互逻辑增加 参数界面增加翻转加减速度
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 60 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
index 7bac542..d8d8436 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -161,21 +161,23 @@
String cleanedLayer = cleanedLayers.isEmpty() ? "" : cleanedLayers;
if ("4".equals(PlcRequest)) {
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 0);
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
+ (short) 0);
System.out.println("鏀跺洓褰掗浂");
}
// 鎵爜璇锋眰鏃�
- if ("1".equals(A01ToMES) && "0".equals(MESToA01)&&"0".equals(MesSend)&&"0".equals(PlcRequest)) {
- if(cleanedMateid==""||cleanedLayer==""){
- cleanedMateid="0";
- cleanedLayer="0";
+ if ("1".equals(A01ToMES) && "0".equals(MESToA01) && "0".equals(MesSend) && "0".equals(PlcRequest)) {
+ if (cleanedMateid == "" || cleanedLayer == "") {
+ cleanedMateid = "0";
+ cleanedLayer = "0";
}
- int cont = storageCageService.ScanMatch(celanedOrder, Integer.parseInt(cleanedMateid),Integer.parseInt(cleanedLayer));
+ int cont = storageCageService.ScanMatch(celanedOrder, Integer.parseInt(cleanedMateid),
+ Integer.parseInt(cleanedLayer));
if (cont > 0) {
System.out.println("鎵爜鎴愬姛");
System.out.println(
"Order:" + celanedOrder + " Mateid:" + cleanedMateid + " Layer:" + cleanedLayer);
-
+
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToA01").getAddress(),
(short) 1);
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
@@ -274,37 +276,47 @@
// System.out.println("jsonObject:" + jsonObject);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
-
+
if (sendwServer != null) {
- Iterator<WebSocketServer> iterator = sendwServer.iterator();
- while (iterator.hasNext()) {
- WebSocketServer webserver = iterator.next();
- webserver.sendMessage(jsonObject.toString());
+ try {
+ Iterator<WebSocketServer> iterator = sendwServer.iterator();
+ while (iterator.hasNext()) {
+
+ WebSocketServer webserver = iterator.next();
+ webserver.sendMessage(jsonObject.toString());
List<String> messages = webserver.getMessages();
if (!messages.isEmpty()) {
// // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
webserver.clearMessages();
- }
+ }
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace(); // 鎵撳嵃鍫嗘爤淇℃伅锛屾柟渚垮畾浣嶉棶棰�
+ System.out.println("webserver鍑虹幇寮傚父: " + e.getMessage());
+ // TODO: handle exception
}
}
- // ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
+ // ArrayList<WebSocketServer> sendwServer =
+ // WebSocketServer.sessionMap.get("Home");
// if (sendwServer != null) {
- // for (WebSocketServer webserver : sendwServer) {
- // webserver.sendMessage(jsonObject.toString());
- // if (webserver != null) {
- // List<String> messages = webserver.getMessages();
+ // for (WebSocketServer webserver : sendwServer) {
+ // webserver.sendMessage(jsonObject.toString());
+ // if (webserver != null) {
+ // List<String> messages = webserver.getMessages();
- // if (!messages.isEmpty()) {
- // // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- // webserver.clearMessages();
- // }
- // }
+ // if (!messages.isEmpty()) {
+ // // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+ // webserver.clearMessages();
+ // }
+ // }
- // }
+ // }
// }
} catch (InterruptedException e) {
+ System.out.println("绾跨▼鍑虹幇寮傚父");
e.printStackTrace();
}
}
--
Gitblit v1.8.0