root/nl-acs3.0
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：设备缓存与自动填充/管理

Browse Source
This commit is contained in:
liyongde
2026-03-20 17:19:29 +08:00
parent 3f8193a593
commit 9900f4b007
19 changed files with 546 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
nl-web-app/src/test/java/org/nl/ApiTest.java
View File

@@ -6,7 +6,7 @@ import org.junit.runner.RunWith;
import org.nl.common.exception.CommonException;
import org.nl.iot.core.driver.DriverCustomFactory;
import org.nl.iot.core.driver.ProtocolType;
import org.nl.iot.core.driver.bo.DeviceBO;
import org.nl.iot.core.driver.bo.DeviceConnectionBO;
import org.nl.iot.core.driver.bo.SiteBO;
import org.nl.iot.core.driver.entity.RValue;
import org.nl.iot.core.driver.entity.WResponse;
@@ -23,7 +23,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
@@ -84,7 +83,7 @@ public class ApiTest {
System.out.println("数据类型: " + config.getDataType());
// 转换为DeviceBO
DeviceBO deviceBO = DeviceBO.builder()
DeviceConnectionBO deviceConnectionBO = DeviceConnectionBO.builder()
.id(String.valueOf(connect.getId()))
.code(connect.getCode())
.properties(connect.getProperties())
@@ -104,7 +103,7 @@ public class ApiTest {
.build();
// 调用驱动读取数据
RValue result = modBusProtocolDriver.read(deviceBO, siteBO);
RValue result = modBusProtocolDriver.read(deviceConnectionBO, siteBO);
System.out.println("读取成功!");
System.out.println("读取结果: " + result.getValue());
@@ -153,7 +152,7 @@ public class ApiTest {
System.out.println("数据类型: " + config.getDataType());
// 转换为DeviceBO
DeviceBO deviceBO = DeviceBO.builder()
DeviceConnectionBO deviceConnectionBO = DeviceConnectionBO.builder()
.id(String.valueOf(connect.getId()))
.code(connect.getCode())
.properties(connect.getProperties())
@@ -183,7 +182,7 @@ public class ApiTest {
System.out.println("写入值: " + writeValue);
// 调用驱动写入数据
Boolean result = modBusProtocolDriver.write(deviceBO, wValue);
Boolean result = modBusProtocolDriver.write(deviceConnectionBO, wValue);
if (result != null && result) {
System.out.println("写入成功!");
@@ -269,7 +268,7 @@ public class ApiTest {
System.out.println("连接信息: " + connect.getHost() + ":" + connect.getPort());
// 转换为DeviceBO
DeviceBO deviceBO = DeviceBO.builder()
DeviceConnectionBO deviceConnectionBO = DeviceConnectionBO.builder()
.id(String.valueOf(connect.getId()))
.code(connect.getCode())
.properties(connect.getProperties())
@@ -321,7 +320,7 @@ public class ApiTest {
}
// 调用驱动批量读取数据
List<RValue> result = modBusProtocolDriver.batchRead(deviceBO, siteBOList);
List<RValue> result = modBusProtocolDriver.batchRead(deviceConnectionBO, siteBOList);
System.out.println("批量读取成功!");
System.out.println("读取结果:");
@@ -401,7 +400,7 @@ public class ApiTest {
System.out.println("连接信息: " + connect.getHost() + ":" + connect.getPort());
// 转换为DeviceBO
DeviceBO deviceBO = DeviceBO.builder()
DeviceConnectionBO deviceConnectionBO = DeviceConnectionBO.builder()
.id(String.valueOf(connect.getId()))
.code(connect.getCode())
.properties(connect.getProperties())
@@ -458,7 +457,7 @@ public class ApiTest {
}
// 调用驱动批量写入数据
List<WResponse> result = modBusProtocolDriver.batchWrite(deviceBO, wValueList);
List<WResponse> result = modBusProtocolDriver.batchWrite(deviceConnectionBO, wValueList);
System.out.println("批量写入完成!");
System.out.println("写入结果:");
@@ -547,7 +546,7 @@ public class ApiTest {
System.out.println("插槽号: " + properties.getString("remote-slot"));
// 转换为DeviceBO
DeviceBO deviceBO = DeviceBO.builder()
DeviceConnectionBO deviceConnectionBO = DeviceConnectionBO.builder()
.id(String.valueOf(connect.getId()))
.code(connect.getCode())
.properties(connect.getProperties())
@@ -583,7 +582,7 @@ public class ApiTest {
.readonly(config2.getReadonly())
.build();
RValue result2 = plcS7ProtocolDriver.read(deviceBO, siteBO2);
RValue result2 = plcS7ProtocolDriver.read(deviceConnectionBO, siteBO2);
System.out.println("地址: " + config2.getRegisterAddress());
System.out.println("数据类型: " + config2.getDataType());
System.out.println("读取结果: " + result2.getValue());
@@ -677,7 +676,7 @@ public class ApiTest {
System.out.println("控制器类型: " + properties.getString("controller-type"));
// 转换为DeviceBO
DeviceBO deviceBO = DeviceBO.builder()
DeviceConnectionBO deviceConnectionBO = DeviceConnectionBO.builder()
.id(String.valueOf(connect.getId()))
.code(connect.getCode())
.properties(connect.getProperties())
@@ -721,7 +720,7 @@ public class ApiTest {
}
// 调用驱动批量读取数据
List<RValue> result = plcS7ProtocolDriver.batchRead(deviceBO, siteBOList);
List<RValue> result = plcS7ProtocolDriver.batchRead(deviceConnectionBO, siteBOList);
System.out.println("批量读取完成!");
System.out.println("读取结果:");
@@ -783,7 +782,7 @@ public class ApiTest {
System.out.println("数据类型: " + config.getDataType());
// 转换为DeviceBO
DeviceBO deviceBO = DeviceBO.builder()
DeviceConnectionBO deviceConnectionBO = DeviceConnectionBO.builder()
.id(String.valueOf(connect.getId()))
.code(connect.getCode())
.properties(connect.getProperties())
@@ -813,7 +812,7 @@ public class ApiTest {
System.out.println("写入值: " + writeValue);
// 调用驱动写入数据
Boolean result = plcS7ProtocolDriver.write(deviceBO, wValue);
Boolean result = plcS7ProtocolDriver.write(deviceConnectionBO, wValue);
if (result != null && result) {
System.out.println("写入成功!");
@@ -892,7 +891,7 @@ public class ApiTest {
System.out.println("控制器类型: " + properties.getString("controller-type"));
// 转换为DeviceBO
DeviceBO deviceBO = DeviceBO.builder()
DeviceConnectionBO deviceConnectionBO = DeviceConnectionBO.builder()
.id(String.valueOf(connect.getId()))
.code(connect.getCode())
.properties(connect.getProperties())
@@ -949,7 +948,7 @@ public class ApiTest {
}
// 调用驱动批量写入数据
List<WResponse> result = plcS7ProtocolDriver.batchWrite(deviceBO, wValueList);
List<WResponse> result = plcS7ProtocolDriver.batchWrite(deviceConnectionBO, wValueList);
System.out.println("批量写入完成!");
System.out.println("写入结果:");
@@ -1032,7 +1031,7 @@ public class ApiTest {
System.out.println("服务器路径: " + properties.getString("path"));
// 转换为DeviceBO
DeviceBO deviceBO = DeviceBO.builder()
DeviceConnectionBO deviceConnectionBO = DeviceConnectionBO.builder()
.id(String.valueOf(connect.getId()))
.code(connect.getCode())
.properties(connect.getProperties())
@@ -1071,7 +1070,7 @@ public class ApiTest {
.readonly(config2.getReadonly())
.build();
RValue result2 = opcUaProtocolDriver.read(deviceBO, siteBO2);
RValue result2 = opcUaProtocolDriver.read(deviceConnectionBO, siteBO2);
System.out.println("节点ID: " + config2.getRegisterAddress());
System.out.println("数据类型: " + config2.getDataType());
System.out.println("读取结果: " + result2.getValue());
@@ -1180,7 +1179,7 @@ public class ApiTest {
System.out.println("服务器路径: " + properties.getString("path"));
// 转换为DeviceBO
DeviceBO deviceBO = DeviceBO.builder()
DeviceConnectionBO deviceConnectionBO = DeviceConnectionBO.builder()
.id(String.valueOf(connect.getId()))
.code(connect.getCode())
.properties(connect.getProperties())
@@ -1232,7 +1231,7 @@ public class ApiTest {
}
// 调用驱动批量读取数据
List<RValue> result = opcUaProtocolDriver.batchRead(deviceBO, siteBOList);
List<RValue> result = opcUaProtocolDriver.batchRead(deviceConnectionBO, siteBOList);
System.out.println("批量读取完成!");
System.out.println("读取结果:");
@@ -1293,7 +1292,7 @@ public class ApiTest {
System.out.println("数据类型: " + config.getDataType());
// 转换为DeviceBO
DeviceBO deviceBO = DeviceBO.builder()
DeviceConnectionBO deviceConnectionBO = DeviceConnectionBO.builder()
.id(String.valueOf(connect.getId()))
.code(connect.getCode())
.properties(connect.getProperties())
@@ -1323,7 +1322,7 @@ public class ApiTest {
System.out.println("写入值: " + writeValue);
// 调用驱动写入数据
Boolean result = opcUaProtocolDriver.write(deviceBO, wValue);
Boolean result = opcUaProtocolDriver.write(deviceConnectionBO, wValue);
if (result != null && result) {
System.out.println("写入成功!");
@@ -1400,7 +1399,7 @@ public class ApiTest {
System.out.println("服务器路径: " + properties.getString("path"));
// 转换为DeviceBO
DeviceBO deviceBO = DeviceBO.builder()
DeviceConnectionBO deviceConnectionBO = DeviceConnectionBO.builder()
.id(String.valueOf(connect.getId()))
.code(connect.getCode())
.properties(connect.getProperties())
@@ -1457,7 +1456,7 @@ public class ApiTest {
}
// 调用驱动批量写入数据
List<WResponse> result = opcUaProtocolDriver.batchWrite(deviceBO, wValueList);
List<WResponse> result = opcUaProtocolDriver.batchWrite(deviceConnectionBO, wValueList);
System.out.println("批量写入完成!");
System.out.println("写入结果:");
@@ -1529,7 +1528,7 @@ public class ApiTest {
System.out.println("数据类型: " + config.getDataType());
// 转换为DeviceBO
DeviceBO deviceBO = DeviceBO.builder()
DeviceConnectionBO deviceConnectionBO = DeviceConnectionBO.builder()
.id(String.valueOf(connect.getId()))
.code(connect.getCode())
.properties(connect.getProperties())
@@ -1549,7 +1548,7 @@ public class ApiTest {
.build();
// 调用驱动读取数据
RValue result = opcDaProtocolDriver.read(deviceBO, siteBO);
RValue result = opcDaProtocolDriver.read(deviceConnectionBO, siteBO);
System.out.println("读取成功!");
System.out.println("读取结果: " + result.getValue());
@@ -1608,7 +1607,7 @@ public class ApiTest {
System.out.println("数据类型: " + config.getDataType());
// 转换为DeviceBO
DeviceBO deviceBO = DeviceBO.builder()
DeviceConnectionBO deviceConnectionBO = DeviceConnectionBO.builder()
.id(String.valueOf(connect.getId()))
.code(connect.getCode())
.properties(connect.getProperties())
@@ -1638,7 +1637,7 @@ public class ApiTest {
System.out.println("写入值: " + writeValue);
// 调用驱动写入数据
Boolean result = opcDaProtocolDriver.write(deviceBO, wValue);
Boolean result = opcDaProtocolDriver.write(deviceConnectionBO, wValue);
if (result != null && result) {
System.out.println("写入成功!");
@@ -1730,7 +1729,7 @@ public class ApiTest {
System.out.println("用户名: " + properties.getString("username"));
// 转换为DeviceBO
DeviceBO deviceBO = DeviceBO.builder()
DeviceConnectionBO deviceConnectionBO = DeviceConnectionBO.builder()
.id(String.valueOf(connect.getId()))
.code(connect.getCode())
.properties(connect.getProperties())
@@ -1782,7 +1781,7 @@ public class ApiTest {
}
// 调用驱动批量读取数据
List<RValue> result = opcDaProtocolDriver.batchRead(deviceBO, siteBOList);
List<RValue> result = opcDaProtocolDriver.batchRead(deviceConnectionBO, siteBOList);
System.out.println("批量读取完成!");
System.out.println("读取结果:");
@@ -1885,7 +1884,7 @@ public class ApiTest {
System.out.println("用户名: " + properties.getString("username"));
// 转换为DeviceBO
DeviceBO deviceBO = DeviceBO.builder()
DeviceConnectionBO deviceConnectionBO = DeviceConnectionBO.builder()
.id(String.valueOf(connect.getId()))
.code(connect.getCode())
.properties(connect.getProperties())
@@ -1942,7 +1941,7 @@ public class ApiTest {
}
// 调用驱动批量写入数据
List<WResponse> result = opcDaProtocolDriver.batchWrite(deviceBO, wValueList);
List<WResponse> result = opcDaProtocolDriver.batchWrite(deviceConnectionBO, wValueList);
System.out.println("批量写入完成!");
System.out.println("写入结果:");