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/PlcAlbaniaServo.java | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcAlbaniaServo.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcAlbaniaServo.java
index c2bf875..6ea1abc 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcAlbaniaServo.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcAlbaniaServo.java
@@ -42,6 +42,7 @@
//A01
List<String> A01input = Arrays.asList(config.getProperty("PlcA01.param").split(","));
List<Float> listA01param = S7control.getinstance().readFloat32(A01input);
+
List<String> A01button = Arrays.asList(config.getProperty("PlcA01.button").split(","));
List<Boolean> listA01button = S7control.getinstance().readBits(A01button);
for (Boolean boolean1 : listA01button) {
@@ -92,20 +93,46 @@
}
jsonObject.append("listC02param", listC02param);
- //涓┖鍙�
- List<String> Hollowinput = Arrays.asList(config.getProperty("PlcHollow.param").split(","));
+ //绯荤粺
+ List<String> PlcSysinput = Arrays.asList(config.getProperty("PlcSys.param").split(","));
+ List<Float> listPlcSysparam = S7control.getinstance().readFloat32(PlcSysinput);
+
+ List<String> PlcSysbutton = Arrays.asList(config.getProperty("PlcSys.button").split(","));
+ List<Boolean> listPlcSysbutton = S7control.getinstance().readBits(PlcSysbutton);
+ for (Boolean boolean1 : listPlcSysbutton) {
+ listPlcSysparam.add((float) (boolean1 ? 1 : 0));
+ }
+ jsonObject.append("listPlcSysparam", listPlcSysparam);
+
+ //璁℃暟
+ List<String> PlcCountinput = Arrays.asList(config.getProperty("PlcCount.param").split(","));
+ List<Float> listPlcCountparam = S7control.getinstance().readFloat32(PlcCountinput);
+
+ List<String> PlcCountbutton = Arrays.asList(config.getProperty("PlcCount.button").split(","));
+ List<Boolean> listPlcCountbutton = S7control.getinstance().readBits(PlcCountbutton);
+ for (Boolean boolean1 : listPlcCountbutton) {
+ listPlcCountparam.add((float) (boolean1 ? 1 : 0));
+ }
+ jsonObject.append("listPlcCountparam", listPlcCountparam);
+
+ //寤舵椂
+ List<String> PlcTimerinput = Arrays.asList(config.getProperty("PlcTimer.param").split(","));
+ List<Long> listPlcTimerparam = S7control.getinstance().readtimes(PlcTimerinput);
+ jsonObject.append("listPlcTimerparam", listPlcTimerparam);
+
+ //绗煎瓙
+ List<String> Hollowinput = Arrays.asList(config.getProperty("PlcCage.param").split(","));
List<Float> listHollowparam = S7control.getinstance().readFloat32(Hollowinput);
- List<String> Hollowbutton = Arrays.asList(config.getProperty("PlcHollow.button").split(","));
+ List<String> Hollowbutton = Arrays.asList(config.getProperty("PlcCage.button").split(","));
List<Boolean> listHollowbutton = S7control.getinstance().readBits(Hollowbutton);
for (Boolean boolean1 : listHollowbutton) {
listHollowparam.add((float) (boolean1 ? 1 : 0));
}
jsonObject.append("listHollowparam", listHollowparam);
- //褰撳墠浣嶇疆
- List<String> positioninput = Arrays.asList(config.getProperty("Plc.position").split(","));
- List<Float> listpositionparam = S7control.getinstance().readFloat32(positioninput);
- jsonObject.append("listpositionparam", listpositionparam);
+
+
+
// System.out.println(listpositionparam);
// System.out.println(S7control.getinstance().readFloat32("DB10.1758"));
--
Gitblit v1.8.0