From 12ae82141c1d6ed1a55922aae128ccfefb5b35dd Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 24 一月 2024 13:34:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview2.java | 63 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview2.java
index f9e253f..9b41787 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview2.java
@@ -45,48 +45,49 @@
e.printStackTrace();
}
- String jsonFilePath = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcMes.json").getPath();
-
- // String jsonFilePath2 =
- // PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcSign.json")
- // .getPath();
- // String jsonFilePath4 =
- // PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcState.json")
- // .getPath();
- // System.out.println(jsonFilePath4);
+ String jsonFilePath = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcParameter.json").getPath();
+ String jsonFilePath2 = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcSign.json").getPath();
+ String jsonFilePath4 = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcState.json").getPath();
+ //System.out.println(jsonFilePath4);
+
// 璋冪敤initword鏂规硶
- PlcParameterObject plcParameterObject = initUtil.initword(jsonFilePath);
- // PlcParameterObject plcStateObject = initUtil.initword(jsonFilePath4);
+ PlcParameterObject plcParameterObject = initUtil.initword(jsonFilePath);
+ PlcParameterObject plcStateObject = initUtil.initword(jsonFilePath4);
// 璋冪敤initbit鏂规硶
- // PlcBitObject plcBitObject = initUtil.initbit(jsonFilePath2);
- // readAndUpdateBitValues(plcBitObject);
- readAndUpdateWordValues(plcParameterObject);
-
- // readAndUpdateWordValues(plcStateObject);
- int index = plcParameterObject.getPlcParameter("A01A02conveyorVelocity(Max)").getAddressIndex();
- System.out.println(index);
- plcParameterObject.getPlcParameter("A01A02conveyorVelocity(Max)").getAddress(index);
- System.out.println(plcParameterObject.getPlcParameter("A01A02conveyorVelocity(Max)").getAddress(index));
- // S7control.getinstance().WriteWord(plcParameterObject.getPlcParameter("conveyorVelocity(AutoFAST)").getAddress(index),
- // (short) 100);
- List<String> addresses = new ArrayList<>();
- addresses.add("conveyorVelocity(AutoFAST)");
- addresses.add("A02ID");
- System.out.println(plcParameterObject.getPlcParameterValues(addresses));
+ PlcBitObject plcBitObject = initUtil.initbit(jsonFilePath2);
+ readAndUpdateBitValues(plcBitObject);
+ readAndUpdateWordValues(plcParameterObject);
+ readAndUpdateWordValues(plcStateObject);
+ // int index = plcParameterObject.getPlcParameter("A01A02conveyorVelocity(Max)").getAddressIndex();
+ // System.out.println(index);
+ // plcParameterObject.getPlcParameter("A01A02conveyorVelocity(Max)").getAddress(index);
+ // System.out.println(plcParameterObject.getPlcParameter("A01A02conveyorVelocity(Max)").getAddress(index));
+ // S7control.getinstance().WriteWord(plcParameterObject.getPlcParameter("conveyorVelocity(AutoFAST)").getAddress(index), (short) 100);
+ List<String> addresses = new ArrayList<>();
+ addresses.add("conveyorVelocity(AutoFAST)");
+ addresses.add("A02ID");
+System.out.println(plcParameterObject.getPlcParameterValues(addresses));
List<String> addresses2 = new ArrayList<>();
addresses2.add("conveyorVelocity(AutoSLOW)");
addresses2.add("D01.SRdec");
- // System.out.println(plcBitObject.getPlcBitValues(addresses2));
- // int index2 = plcBitObject.getPlcBit("DO1id").getAddressIndex();
- // System.out.println(index2);
- // plcBitObject.getPlcBit("DO1id").getAddress(index2);
- // System.out.println(plcBitObject.getPlcBit("DO1id").getAddress(index2));
+ System.out.println(plcBitObject.getPlcBitValues(addresses2));
+ int index2 = plcBitObject.getPlcBit("DO1id").getAddressIndex();
+ System.out.println(index2);
+
+ plcBitObject.getPlcBit("DO1id").getAddress(index2);
+ System.out.println(plcBitObject.getPlcBit("DO1id").getAddress(index2));
+
+
+ List<String> addresses3 = new ArrayList<>();
+ addresses3.add("A02ID1");
+ addresses3.add("A01CurrentGrid");
+ System.out.println(plcStateObject.getPlcParameterValues(addresses3));
}
}
}
--
Gitblit v1.8.0