From 3f98ccf49e7ffc098689c37237bd1dceed651ca1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 27 十一月 2023 09:14:39 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java | 85 ++++++++++++++++++++++++++++++++++--------
1 files changed, 68 insertions(+), 17 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 f91920e..0e503c4 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,12 +1,61 @@
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;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
import java.util.Arrays;
public class Plcsign extends Thread {
+ String name = "";
+ Integer count = 0;
+
+ public void readValue() {
+ String str = "";
+ BufferedReader bufferedReader = null;
+ FileInputStream fileInputStream;
+ try {
+ // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
+ fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/Sign.json");
+ // 璇诲彇 fileInputStream 涓瓧鑺傚苟灏嗗叾瑙ｇ爜涓哄瓧绗�
+ InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
+ // 鎻愰珮璇诲彇鏁堢巼锛屽湪 BufferedReader 鍐呭寘瑁� InputStreamReader
+ bufferedReader = new BufferedReader(inputStreamReader);
+ String line = null;
+ // 灏� bufferedReader 鍐呭涓�琛屼竴琛岃祴鍊肩粰str
+ 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) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
@Override
public void run() {
while (this != null) {
@@ -16,30 +65,32 @@
e.printStackTrace();
}
- List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 44);
- List<Boolean> plclist2 = S7control.getinstance().ReadBits("DB102.5.5", 13);
+ this.readValue();
+ String PlcAddress = this.name;
+ Integer Plccount = this.count;
+ // System.out.println(PlcAddress);
- // Boolean[] values = { 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, true, false, true, false, };
- // List<Boolean> plclist = new ArrayList<>(Arrays.asList(values));
+ // List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 44);
+ // List<Boolean> plclist2 = S7control.getinstance().ReadBits("DB102.5.5", 13);
- // Boolean[] values2 = { true, false,
- // true, false, true, false, true, false,
- // true, false, true, false, true, };
- // List<Boolean> plclist2 = new ArrayList<>(Arrays.asList(values2));
+ 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));
- // 灏唒lclist2鐨勫厓绱犳坊鍔犲埌plclist涓�
- plclist.addAll(plclist2);
- // System.out.println(plclist);
if (plclist != null) {
// 灏嗚幏鍙栫殑甯冨皵绫诲瀷杞崲涓烘暣鏁扮被鍨�
List<Integer> Intlist = new ArrayList<>();
for (Boolean value : plclist) {
- Intlist.add(value == true ? 0 : 1);
+ if (value != null) {
+ Intlist.add(value == true ? 0 : 1);
+ }
}
JSONObject jsonObject = new JSONObject();
--
Gitblit v1.8.0