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/Plcsign.java | 69 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
index 8329678..ba72467 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
@@ -1,8 +1,8 @@
package com.example.springboot.component;
-
+
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
-
+
import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -12,11 +12,19 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Arrays;
-
+
public class Plcsign extends Thread {
+
+ // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
+ private Configuration config;
+
+ public Plcsign() throws IOException {
+ config = new Configuration("config.properties");
+ }
+
String name = "";
Integer count = 0;
-
+
public void readValue() {
String str = "";
BufferedReader bufferedReader = null;
@@ -33,20 +41,20 @@
while ((line = bufferedReader.readLine()) != null) {
str += line;
}
-
+
// 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
JSONObject jsonObject = new JSONObject(str);
-
+
// 鑾峰彇json涓殑鍊�
JSONArray address = jsonObject.getJSONArray("address");
for (int i = 0; i < address.size(); i++) {
JSONObject ress = (JSONObject) address.get(i);
-
+
this.name = ress.getStr("name");
this.count = ress.getInt("count");
-
+
}
-
+
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (UnsupportedEncodingException e) {
@@ -55,43 +63,36 @@
e.printStackTrace();
}
}
-
+
@Override
public void run() {
while (this != null) {
try {
- Thread.sleep(1000);
+ Thread.sleep(100);
} catch (InterruptedException e) {
e.printStackTrace();
}
-
-// this.readValue();
-// String PlcAddress = this.name;
-// Integer Plccount = this.count;
- // System.out.println(PlcAddress);
-
-// List<Boolean> plclist = S7control.getinstance().ReadBits(PlcAddress, Plccount);
- List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 112);
-
-// Boolean[] values = { true, true, true, true, true, false, true, false,
-// true, false, true, false, true, false,
-// true, false, true, false, true, false, true, false, true, false, true, false,
-// true, false, true, false, true,
-// false, true, false, true, false,
-// true, false, true, false, true, false, true, false, null,
-// true, false,
-// true, false, true, false, true, false,
-// true, false, true, false, true, };
-// List<Boolean> plclist = new ArrayList<>(Arrays.asList(values));
-
+ List<String> addressList21 = Arrays.asList(config.getProperty("PlcIO.State").split(","));
+ List<Boolean> plclist = S7control.getinstance().readBits(addressList21);
+ // System.out.println("鎬ュ仠"+S7control.getinstance().ReadBits("DB10.0.5", 1));
+ // int index = 0;
+ // for (String item : addressList21) {
+ // System.out.println("鍦板潃锛�"+item+"鍊�"+plclist.get(index)+"涓嬫爣"+index);
+ // index++;
+ // }
+
if (plclist != null) {
// 灏嗚幏鍙栫殑甯冨皵绫诲瀷杞崲涓烘暣鏁扮被鍨�
List<Integer> Intlist = new ArrayList<>();
+ // System.out.println("闀垮害"+plclist.size());
for (Boolean value : plclist) {
if (value != null) {
Intlist.add(value == true ? 0 : 1);
+ }else {
+ Intlist.add(1);
+ System.out.println("null");
}
-
+
}
JSONObject jsonObject = new JSONObject();
jsonObject.append("sig", Intlist);
@@ -99,7 +100,7 @@
// if (sendwServer3 != null) {
// sendwServer3.sendMessage(jsonObject.toString());
// }
-
+
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Sign");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
@@ -109,4 +110,4 @@
}
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0