From 560303799978bd141dc1e9553b7607012591fb42 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 17 六月 2025 17:02:53 +0800
Subject: [PATCH] 1.json文件优化 增加配置项：【1.触发点；2.逻辑线程时间间隔】 2.优化处理代码 【1.去除多余日志输出点；2.两个设备json文件进行根据codeId进行关联；3.调整代码先后顺序】 3.json文件路径提出jar包外，可在设备表上配置上配置路径。因原方式修改地址json 后需重新打包，实际调试中传递jar包比较浪费时间
---
ShangHaiMesParent/moduleService/plcConnectModule/src/test/java/com/mes/plcConnectModuleApplicationTest.java | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/ShangHaiMesParent/moduleService/plcConnectModule/src/test/java/com/mes/plcConnectModuleApplicationTest.java b/ShangHaiMesParent/moduleService/plcConnectModule/src/test/java/com/mes/plcConnectModuleApplicationTest.java
index 2819180..7eeaf0b 100644
--- a/ShangHaiMesParent/moduleService/plcConnectModule/src/test/java/com/mes/plcConnectModuleApplicationTest.java
+++ b/ShangHaiMesParent/moduleService/plcConnectModule/src/test/java/com/mes/plcConnectModuleApplicationTest.java
@@ -43,16 +43,7 @@
String s="鐧界幓";
log.info(s);
}
- @Test
- public void testReadJson() {
- try {
- LogicConfig logicConfig=JsonConversion.jsonToObjectByJackson(ReadFile.readJson("shelfLogic.json").toString(), LogicConfig.class);
- PlcParameters plcParameters=JsonConversion.jsonToObjectByJackson(ReadFile.readJson("shelf.json").toString(), PlcParameters.class);
- log.info("{},{}",logicConfig,plcParameters);
- }catch (Exception e) {
- }
- }
@Test
public void testReadS7Old() throws IOException {
S7PLC s7PLC = new S7PLC(EPlcType.S1500, "10.153.19.191", 102, 0, 0);
@@ -135,13 +126,17 @@
// log.info("{}",resultView);
// 绀轰緥 璋冪敤testProcedure瀛樺偍杩囩▼
-// Map<String, Object> params = new HashMap<>();
-// params.put("dataParmars", "娴嬭瘯鏁版嵁"); // 杈撳叆鍙傛暟锛屽搴斿瓨鍌ㄨ繃绋嬩腑鐨処N鍙傛暟
-// Map<String, Object> outParams = new HashMap<>();
-// outParams.put("messagedate", Types.VARCHAR); // 杈撳嚭鍙傛暟锛屽搴斿瓨鍌ㄨ繃绋嬩腑鐨凮UT鍙傛暟
-// String[] resultProcedure = api.procedureAPI("testProcedure", params, outParams);
-// // 鎵撳嵃鎵ц缁撴灉
-// log.info("{}瀛樺偍杩囩▼鎵ц缁撴灉:{}",params,resultProcedure);
+ Map<String, Object> params = new HashMap<>();// 鍙傛暟
+ Map<String, Object> inParams = new HashMap<>();// 杈撳叆鍙傛暟
+ Map<String, Object> outParams = new HashMap<>();// 杈撳嚭鍙傛暟
+ inParams.put("dataParsers", "娴嬭瘯鏁版嵁");
+ outParams.put("messageDate", Types.VARCHAR);
+ outParams.put("messageDate2", Types.VARCHAR);
+ params.put("inParams", inParams);
+ params.put("outParams", outParams);
+ List<String> resultProcedure = api.procedureAPI("testProcedure", params);
+ // 鎵撳嵃鎵ц缁撴灉
+ log.info("{}瀛樺偍杩囩▼鎵ц缁撴灉:{}",params,resultProcedure);
}
@Test
public void testMainThread() {
--
Gitblit v1.8.0