From cfc2855d2fe063e26947bad7277a1091efbb3bbb Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 28 十一月 2024 02:16:21 +0800
Subject: [PATCH] 协议地址更新，手动页面更新
---
springboot-vue3/src/main/java/com/example/springboot/component/InitUtil.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/InitUtil.java b/springboot-vue3/src/main/java/com/example/springboot/component/InitUtil.java
index ac6e611..25bf381 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/InitUtil.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/InitUtil.java
@@ -8,8 +8,11 @@
import java.io.BufferedReader;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileReader;
import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -130,14 +133,12 @@
public static PlcParameterObject initwords(String jsonFilePath) {
- // File file=new File(jsonFilePath);
- // if (!file.exists()) {
- // System.out.println(jsonFilePath);
- // return null;
- // }
try {
- FileReader fileReader = new FileReader(jsonFilePath);
- BufferedReader bufferedReader = new BufferedReader(fileReader);
+ // FileReader fileReader = new FileReader(jsonFilePath);
+ // BufferedReader bufferedReader = new BufferedReader(fileReader);
+
+ InputStreamReader inputStreamReader = new InputStreamReader(new FileInputStream(jsonFilePath), StandardCharsets.UTF_8);
+ BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
StringBuilder content = new StringBuilder();
String line;
@@ -147,7 +148,7 @@
}
bufferedReader.close();
- fileReader.close();
+ // fileReader.close();
JSONObject jsonfileobj = new JSONObject(content.toString());
JSONArray jsonArray = jsonfileobj.getJSONArray("parameteInfor");
@@ -158,6 +159,8 @@
PlcParameterInfo plcParameterInfo = new PlcParameterInfo(jsonfileobj.getStr("plcAddressBegin")); //鍙傛暟瀹炰緥
String codeid = parameterObj.getStr("codeId");
plcParameterInfo.setCodeId(codeid);
+ plcParameterInfo.setName(parameterObj.getStr("name"));
+ plcParameterInfo.setusName(parameterObj.getStr("usname"));
// plcParameterInfo.setAddressIndex(Integer.valueOf(parameterObj.getStr("addressIndex")));
plcParameterInfo.setRatio(Integer.valueOf(parameterObj.getStr("ratio")));
plcParameterInfo.setUnit(parameterObj.getStr("unit"));
@@ -165,9 +168,6 @@
// plcParameterInfo.setUnit(parameterObj.getStr("unit"));
plcParameterObject.addPlcParameter(plcParameterInfo);
}
- // byte[] getplcvlues = {0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02};
- // byte[] getplcvlues = S7control.getinstance().ReadByte(plcParameterObject.getPlcAddressBegin(), plcParameterObject.getPlcAddressLength());
- // plcParameterObject.setPlcParameterList(getplcvlues);
return plcParameterObject;
} catch (IOException e) {
--
Gitblit v1.8.0