From f49de44b69924fc3c4dfea159b13a412983b8f93 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 16 一月 2024 13:52:28 +0800
Subject: [PATCH] 增加交互状态界面 I/O标志缩小增加备注
---
springboot-vue3/src/main/resources/config.properties | 40
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java | 5
springboot-vue3/src/main/resources/JsonFile/PlcParameter.json | 238 ++++
CanadaMes-ui/src/router/index.js | 6
CanadaMes-ui/src/configuration/InteractionState.json | 414 +++++++
springboot-vue3/src/main/java/com/example/springboot/component/S7control.java | 35
CanadaMes-ui/src/views/Electrical/Parameter2.vue | 67 +
CanadaMes-ui/src/views/Electrical/InteractionState.vue | 313 +++++
CanadaMes-ui/src/layout/index.vue | 2
springboot-vue3/Dockerfile | 6
springboot-vue3/src/main/java/com/example/springboot/component/PlcInteractionState.java | 101 +
springboot-vue3/JsonFile/PlcSign.json | 47
CanadaMes-ui/src/views/Electrical/Positioning1.vue | 8
CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue | 8
springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterObject.java | 20
springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java | 18
springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterInfo.java | 9
CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue | 48
springboot-vue3/src/main/java/com/example/springboot/component/InitUtil.java | 97 +
CanadaMes-ui/src/views/Electrical/Servomanual.vue | 8
CanadaMes-ui/src/views/Electrical/Sign.vue | 23
CanadaMes-ui/src/views/Electrical/ManualonePosition.vue | 86 +
springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java | 2
springboot-vue3/.idea/uiDesigner.xml | 124 ++
CanadaMes-ui/src/lang/locales/zh-CN.json | 6
/dev/null | 347 ------
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 6
springboot-vue3/src/main/java/com/example/springboot/component/MessageHandler.java | 5
springboot-vue3/JsonFile/PlcParameter.json | 610 +++++++++++
springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview.java | 213 +++
CanadaMes-ui/src/views/Electrical/ServoManualone.vue | 31
CanadaMes-ui/src/configuration/Sign.json | 347 ++++--
32 files changed, 2,767 insertions(+), 523 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/InteractionState.json b/CanadaMes-ui/src/configuration/InteractionState.json
new file mode 100644
index 0000000..910b317
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/InteractionState.json
@@ -0,0 +1,414 @@
+[
+
+
+
+ [
+ {
+ "title": {
+ "name": "MES杩涚墖浠诲姟"
+
+ }, "type": "1"
+
+ },
+ {
+ "name": "杩涚墖杞﹁捣濮嬩綅",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "unit": "mm",
+ "value":"0",
+ "address":"DB100.48",
+ "count":10,
+ "min":0,
+ "max":22000
+ },
+ {
+ "name": "杩涚墖杞︾洰鏍囦綅",
+ "read": 11,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0" ,
+ "value":"0",
+ "min":0,
+ "max":22000
+ },
+ {
+ "name": "杩涚墖鐜荤拑闀垮害",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0" ,
+ "value":"0",
+ "min":0,
+ "max":22000
+ },
+ {
+ "name": "杩涚墖鐜荤拑瀹藉害",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0" ,
+ "value":"0",
+ "min":0,
+ "max":22000
+ },
+ {
+ "name": "杩涚墖绗肩幓鐠冩暟",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0" ,
+ "value":"0",
+ "min":0,
+ "max":22000
+ },
+ {
+ "name": "杩涚墖ID",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0" ,
+ "value":"0",
+ "min":0,
+ "max":22000
+ }
+
+
+
+ ],
+
+ [
+ {
+ "title": {
+ "name": "PLC杩涚墖浠诲姟"
+
+ },"type": "1",
+ "value":"0"
+ },
+ {
+ "name": "杩涚墖杞︾姸鎬�",
+ "read": 33,
+ "sending": 0,
+ "type": "0" ,
+ "unit": "mm",
+ "value":"0",
+ "address":"DB100.68",
+ "count":10,
+ "min":0,
+ "max":22000
+ },
+ {
+ "name": "杩涚墖杞﹀綋鍓嶄换鍔¤捣濮嬩綅",
+ "read": 11,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0" ,
+ "value":"0",
+ "min":0,
+ "max":22000
+ },
+ {
+ "name": "杩涚墖杞﹀綋鍓嶄换鍔＄粓鐐逛綅",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0" ,
+ "value":"0",
+ "min":0,
+ "max":22000
+ },
+ {
+ "name": "杩涚墖璇锋眰",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0" ,
+ "value":"0",
+ "min":0,
+ "max":22000
+ },
+ {
+ "name": "杩涚墖ID",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0" ,
+ "value":"0",
+ "min":0,
+ "max":22000
+ },
+ {
+ "name": "D01 ID",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0" ,
+ "value":"0",
+ "min":0,
+ "max":22000
+ },
+ {
+ "name": "D02 ID",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0" ,
+ "value":"0",
+ "min":0,
+ "max":22000
+ }
+
+
+ ],
+ [
+ {
+ "title": {
+ "name": "MES鍑虹墖浠诲姟"
+
+ }, "type": "1"
+ },
+ {
+ "name": "鍑虹墖杞﹁捣濮嬩綅",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "unit": "mm",
+ "address":"DB100.0",
+ "count":3,
+ "value":"0",
+ "min":0,
+ "max":9999
+ },
+ {
+ "name": "鍑虹墖杞︾洰鏍囦綅",
+ "read": 11,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
+ },
+ {
+ "name": "鍑虹墖绗肩幓鐠冩暟",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
+ },
+ {
+ "name": "杩涚墖浠诲姟鍚姩",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
+ },
+ {
+ "name": "鍑虹墖浠诲姟鍚姩",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
+ },
+ {
+ "name": "鍑虹墖ID",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
+ }
+
+
+
+ ],
+
+ [
+ {
+ "title": {
+ "name": "PLC鍑虹墖浠诲姟"
+
+ }, "type": "1"
+ },
+ {
+ "name": "鍑虹墖杞︾姸鎬�",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
+ },
+ {
+ "name": "鍑虹墖杞﹀綋鍓嶄换鍔¤捣濮嬩綅",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
+ },
+ {
+ "name": "鍑虹墖杞﹀綋鍓嶄换鍔＄粓鐐逛綅",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
+ },
+ {
+ "name": "A02 ID1",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
+ }
+
+
+
+ ],
+ [
+ {
+ "title": {
+ "name": "MES浠诲姟淇℃伅"
+
+ }, "type": "1"
+ },
+ {
+ "name": "B01姹囨姤搴旂瓟",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
+ },
+ {
+ "name": "B02姹囨姤搴旂瓟",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
+ },
+ {
+ "name": "B01灏忚溅褰撳墠浠诲姟浣�",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
+ },
+ {
+ "name": "B01灏忚溅浠诲姟鐘舵��",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
+ },
+ {
+ "name": "B02灏忚溅褰撳墠浣嶇疆",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
+ },
+ {
+ "name": "B02灏忚溅浠诲姟鐘舵��",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
+ },
+ {
+ "name": "A01 ID1",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
+ },
+ {
+ "name": "A01 ID2",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
+ },
+ {
+ "name": "A02 ID1",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
+ },
+ {
+ "name": "B01 ID1",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
+ },
+ {
+ "name": "B02 ID1",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
+ }
+
+
+
+ ]
+
+
+
+ ]
+
+
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/Sign.json b/CanadaMes-ui/src/configuration/Sign.json
index dc57259..f6857fd 100644
--- a/CanadaMes-ui/src/configuration/Sign.json
+++ b/CanadaMes-ui/src/configuration/Sign.json
@@ -5,448 +5,515 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I10.0"
},
{
"name": "D01.SR in pos",
"value": "0",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I10.1"
},
{
"name": "D02.SR dec",
"value": "0",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I10.2"
+
},
{
"name": "D02.SR in pos",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I10.3"
},
{
"name": "D03.SR into",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I10.4"
},
{
"name": "D03.SR dec",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I10.5"
},
{
"name": "D03.SR in pos",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I10.6"
},
{
"name": "D04.SR dec",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I10.7"
},
{
"name": "D04.SR in pos",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I11.0"
+
},
{
"name": "D05.SR dec",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I11.1"
},
{
"name": "D05.SR in pos",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I11.2"
},
{
"name": "D06.SR dec",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I11.3"
},
{
"name": "D06.SR in pos",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I11.4"
},
{
"name": "B01.SR in dec",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I11.5"
},
{
"name": "B01.SR in in pos",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I11.6"
},
{
"name": "B01.SR out dec",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I11.7"
},
{
"name": "B01.SR out in pos",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I124.0"
+
},
{
"name": "B01.SR turn on",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I124.1"
},
{
"name": "B01.SR turn off",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I124.2"
},
{
"name": "B01.SR up",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I124.3"
},
{
"name": "B01.SR down",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I124.4"
},
{
"name": "B02.SR out dec",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I124.5"
},
{
"name": "B02.SR out in pos",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I124.6"
},
{
"name": "B02.SR in dec",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I124.7"
},
{
"name": "B02.SR in in pos",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I125.0"
},
{
"name": "B02.SR turn on",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I125.1"
},
{
"name": "B02.SR turn off",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I125.2"
},
{
"name": "B02.SR up",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I125.3"
},
{
"name": "B02.SR down",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I125.4"
},
{
"name": "B01.SR in safety",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I125.5"
},
{
"name": "B01.SR out safety",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I125.6"
},
{
"name": "B02.SR in safety",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I125.7"
},
{
"name": "SB.start(+)",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I126.0"
},
{
"name": "SB.stop(1)",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I126.1"
},
{
"name": "SB.reset",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I126.2"
},
{
"name": "SB.auto/manul",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I126.3"
},
{
"name": "space",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I126.4"
},
{
"name": "SB.emg",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I126.5"
},
{
"name": "D01.SB.start",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I126.6"
},
{
"name": "D06.SB.start",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I126.7"
},
{
"name": "B02.SR out safety",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I127.0"
},
{
"name": "SafetyDoor.requset",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I127.1"
},
{
"name": "SafetyDoor.confirm",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I127.2"
},
{
"name": "SafetyDoor.reset",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I127.3"
},
{
- "name": "Sspace",
+ "name": "space",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I127.4"
},
{
- "name": "Sspce",
+ "name": "space",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I127.5"
},
{
- "name": "Sspce",
+ "name": "space",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I127.6"
},
{
- "name": "Sspce",
+ "name": "space",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I127.7"
},
{
"name": "A01.SR left dec",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I128.0"
},
{
"name": "A01.SR left in pos",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I128.1"
},
{
"name": "A01.SR left safety",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I128.2"
},
{
"name": "A01.SR right dec",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I128.3"
},
{
"name": "A01.SR right in pos",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I128.4"
},
{
"name": "A01.SR right safety",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I128.5"
},
{
"name": "A01.SR turn home",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I128.6"
},
{
"name": "A01.SR turn up",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I128.7"
},
{
"name": "A01.SR turn down",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I129.0"
},
{
"name": "A01.SR travel home",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I129.1"
},
{
"name": "A01.SR travel left dec",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I129.2"
},
{
"name": "A01.SR travel left limit",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I129.3"
},
{
"name": "A01.SR travel right dec",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I129.4"
},
{
"name": "A01.SR travel right limit",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I129.5"
},
{
"name": "space",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I129.6"
},
{
"name": "space",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I129.7"
}
,
{
@@ -454,7 +521,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I130.0"
}
,
{
@@ -462,7 +530,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I130.1"
}
,
{
@@ -470,7 +539,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I130.2"
}
,
{
@@ -478,7 +548,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I130.3"
}
,
{
@@ -486,7 +557,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I130.4"
}
,
{
@@ -494,7 +566,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I130.5"
}
,
{
@@ -502,7 +575,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I130.6"
}
,
{
@@ -510,7 +584,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I130.7"
}
,
{
@@ -518,7 +593,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I131.0"
}
,
{
@@ -526,7 +602,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I131.1"
}
,
{
@@ -534,7 +611,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I131.2"
}
,
{
@@ -542,7 +620,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I131.3"
}
,
{
@@ -550,7 +629,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I131.4"
}
,
{
@@ -558,7 +638,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I131.5"
}
,
{
@@ -566,7 +647,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I131.6"
}
,
{
@@ -574,7 +656,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I131.7"
}
,
{
@@ -582,7 +665,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I132.0"
}
,
{
@@ -590,7 +674,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I132.1"
}
,
{
@@ -598,7 +683,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I132.2"
}
,
{
@@ -606,7 +692,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I132.3"
}
,
{
@@ -614,7 +701,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I132.4"
}
,
{
@@ -622,7 +710,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I132.5"
}
,
{
@@ -630,7 +719,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I132.6"
}
,
{
@@ -638,7 +728,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I132.7"
}
,
{
@@ -646,7 +737,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q4.0"
}
,
{
@@ -654,7 +746,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q4.1"
}
,
{
@@ -662,7 +755,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q4.2"
}
,
{
@@ -670,7 +764,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q4.3"
}
,
{
@@ -678,14 +773,16 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q4.4"
},
{
"name": "B01.YV.turn",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q4.5"
}
,
{
@@ -693,7 +790,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q4.6"
}
,
{
@@ -701,7 +799,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q4.7"
}
,
{
@@ -709,7 +808,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q5.0"
}
,
{
@@ -717,7 +817,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q5.1"
}
,
{
@@ -725,7 +826,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q5.2"
}
,
{
@@ -733,7 +835,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q5.3"
}
,
{
@@ -741,7 +844,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q5.4"
}
,
{
@@ -749,7 +853,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q5.5"
}
,
{
@@ -757,7 +862,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q5.6"
}
,
{
@@ -765,7 +871,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q5.7"
}
,
{
@@ -773,7 +880,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q126.0"
}
,
{
@@ -781,7 +889,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q126.1"
}
,
{
@@ -789,7 +898,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q126.2"
}
,
{
@@ -797,7 +907,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q126.3"
}
,
{
@@ -805,7 +916,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q127.0"
}
,
{
@@ -813,7 +925,8 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q127.1"
}
,
{
@@ -821,14 +934,16 @@
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q127.2"
},
{
"name": "space",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q127.3"
}
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index cc0008c..5be54d1 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -166,7 +166,7 @@
"B02 OUT pos error": "B02 OUT pos 閿欒"
},
"Electrical": "璁惧绠＄悊",
- "Parameter": "鍙傛暟涓嬪彂",
+ "Parameter": "鍙傛暟璁剧疆",
"Action": "寮�鍏虫帶鍒�",
"Sign": "IO鐘舵��",
"State": "璁惧鐘舵��",
@@ -420,7 +420,6 @@
"SafetyDoor.requset": "瀹夊叏闂ㄨ姹傝繘鍏�",
"SafetyDoor.confirm": "瀹夊叏闂ㄧ‘璁�",
"SafetyDoor.reset": "瀹夊叏闂ㄥ浣�",
- "Sspce":"澶囩敤",
"A01.SR left dec":"A01宸﹂敭閫�",
"A01.SR left in pos":"A01宸﹀埌浣�",
"A01.SR left safety":"A01宸﹀畨鍏�",
@@ -493,6 +492,7 @@
"ManualonePosition":"鎵嬪姩瀹氫綅",
"Servomanualone":"鍗婅嚜鍔�",
"Address parameter settings":"鍦板潃鍙傛暟璁剧疆",
- "Speed parameter settings":"閫熷害鍙傛暟璁剧疆"
+ "Speed parameter settings":"閫熷害鍙傛暟璁剧疆",
+ "InteractionState":"浜や簰鐘舵��"
}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/layout/index.vue b/CanadaMes-ui/src/layout/index.vue
index 244d977..0347ea6 100644
--- a/CanadaMes-ui/src/layout/index.vue
+++ b/CanadaMes-ui/src/layout/index.vue
@@ -340,7 +340,7 @@
},
1000
);
- if (this.reset == false) {
+ if (this.reset == false&&this.EmergencyStop == false) {
this.dialogFormCountDown = true;
}
},
diff --git a/CanadaMes-ui/src/router/index.js b/CanadaMes-ui/src/router/index.js
index 594f4db..d65b7da 100644
--- a/CanadaMes-ui/src/router/index.js
+++ b/CanadaMes-ui/src/router/index.js
@@ -122,9 +122,13 @@
{
path: '/Electrical/ManualJog',
component: () => import('../views/Electrical/ManualJog')
+ },
+ {
+ path: '/Electrical/InteractionState',
+ component: () => import('../views/Electrical/InteractionState')
}
-
+
]
}
diff --git a/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue b/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
index c2b94f9..053ff12 100644
--- a/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
+++ b/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
@@ -46,6 +46,14 @@
<router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
$t('Speed parameter settings')
}}</router-link>
+
+<router-link
+ to="/Electrical/InteractionState"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("InteractionState") }}</router-link
+ >
</el-breadcrumb>
diff --git a/CanadaMes-ui/src/views/Electrical/InteractionState.vue b/CanadaMes-ui/src/views/Electrical/InteractionState.vue
new file mode 100644
index 0000000..940ab9d
--- /dev/null
+++ b/CanadaMes-ui/src/views/Electrical/InteractionState.vue
@@ -0,0 +1,313 @@
+<template>
+ <div class="app">
+ <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
+ <router-link
+ to="/Electrical/alarm"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("Alarm") }}</router-link
+ >
+ <router-link
+ to="/Electrical/State"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("State") }}</router-link
+ >
+ <!-- <router-link
+ to="/Electrical/Action"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("Action") }}</router-link
+ > -->
+ <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
+ }}</router-link> -->
+ <router-link
+ to="/Electrical/Sign"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("Sign") }}</router-link
+ >
+ <router-link
+ to="/Electrical/Servomanual"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("Parameter") }}</router-link
+ >
+ </el-breadcrumb>
+
+ <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
+ <router-link
+ to="/Electrical/Parameter2"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("Automatic State") }}</router-link
+ >
+ <!-- <router-link
+ to="/Electrical/ManualJog"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("ManualJog") }}</router-link
+ > -->
+
+ <router-link
+ to="/Electrical/ManualonePosition"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("ManualonePosition") }}</router-link
+ >
+
+ <router-link
+ to="/Electrical/Servomanualone"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("Servomanualone") }}</router-link
+ >
+ <!-- <router-link
+ to="/Electrical/Parameter1"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("Parameter1") }}</router-link
+ > -->
+
+ <router-link
+ to="/Electrical/Positioning1"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("Address parameter settings") }}</router-link
+ >
+ <!-- <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
+ $t('Positioning2')
+ }}</router-link> -->
+
+ <!-- <router-link
+ to="/Electrical/ManualonePosition2"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("ManualonePosition2") }}</router-link
+ > -->
+ <router-link
+ to="/Electrical/AutomaticParameterSetting"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("Speed parameter settings") }}</router-link
+ >
+ <router-link
+ to="/Electrical/InteractionState"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("InteractionState") }}</router-link
+ >
+
+
+ </el-breadcrumb>
+
+ <el-row :gutter="30" class="card">
+ <el-col
+ :span="6"
+ v-for="(dataGroup, groupIndex) in jsonData"
+ :key="groupIndex"
+ >
+ <el-card class="json-block" style="width: 300px; margin-bottom: 2px;height:500px" >
+ <div
+ class="button-row"
+ style="display: flex; justify-content: space-between"
+ >
+ <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
+ <span
+ v-if="item.title"
+ :name="item.title.name"
+ class="action-button"
+ >{{ item.title.name }}</span
+ >
+ </div>
+ </div>
+ <div
+ v-for="(item, itemIndex) in dataGroup"
+ :key="itemIndex"
+ class="item-container"
+ >
+ <div class="item-row">
+ <span class="name" style="width: 150px">{{ item.name }}</span>
+ <el-input
+ v-if="item.type === '0'"
+ v-model="item.value"
+ class="input-box"
+ readonly="readonly" style="width: 200px"
+ ></el-input>
+
+
+ <!-- <el-button
+ v-if="item.type === '0' && item.name !== '鏍煎瓙闂磋窛' && item.name !== '鍑虹墖鎺ョ墖鍦板潃' && item.name !== '瀛樼墖鎺ョ墖鍦板潃'"
+ class="input-box" @click="submitDataToBackend();">鍙栧湴鍧�</el-button> -->
+ </div>
+ </div>
+ </el-card>
+ </el-col>
+ </el-row>
+ <!-- <el-button @click="submitDataToBackend">鎻愪氦鏁版嵁鍒板悗绔�</el-button> -->
+ </div>
+</template>
+
+<script>
+let socket;
+import LanguageMixin from "../../lang/LanguageMixin";
+import data from "../../configuration/InteractionState";
+
+export default {
+ name: "InteractionState",
+ mixins: [LanguageMixin],
+ data() {
+ return {
+ jsonData: data, // 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
+ };
+ },
+ activated() {
+ this.initWebSocket();
+ const language = this.$i18n.locale;
+ console.log(language);
+ if (language === "en-US") {
+ this.replaceChineseWithEnglish();
+ }
+ this.$forceUpdate();
+ },
+ methods: {
+
+
+ initWebSocket() {
+ let viewname = "InteractionState";
+
+ if (typeof WebSocket === "undefined") {
+ console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
+ } else {
+ let socketUrl =
+ "ws://" +
+ this.$t("ip") +
+ ":8888" +
+ "/springboot-vue3/api/talk/" +
+ viewname;
+
+ if (socket != null) {
+ socket.close();
+ socket = null;
+ }
+
+ // 寮�鍚竴涓獁ebsocket鏈嶅姟
+ socket = new WebSocket(socketUrl);
+
+ // 鎵撳紑浜嬩欢
+ socket.onopen = function () {
+ console.log("websocket宸叉墦寮�");
+ };
+
+
+
+socket.onmessage = (msg) => {
+ if (!msg.data) {
+ return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
+ }
+
+
+ let obj = JSON.parse(msg.data);
+ const jsondata2 = this.jsonData;
+
+ const zuhe1=obj.zuhe1;
+
+
+ if(obj.zuhe1){
+
+//console.log(obj);
+
+ for (let i = 0; i < jsondata2.length; i++) {
+ const item = jsondata2[i];
+ for (let j = 1; j < item.length; j++) {
+ const subitem = item[j];
+ if (subitem.type === '0' ) {
+ if (j - 1 < zuhe1[i].length) {
+ subitem.value = zuhe1[i][j - 1];
+ } else {
+ subitem.value = 'N/A';
+ }
+ }
+ }
+}
+
+
+ }
+};
+
+
+ // 鍏抽棴浜嬩欢
+ socket.onclose = function () {
+ console.log("websocket宸插叧闂�");
+ };
+
+ // 鍙戠敓閿欒浜嬩欢
+ socket.onerror = function () {
+ console.log("websocket鍙戠敓浜嗛敊璇�");
+ };
+ this.$router.afterEach(function () {
+ socket.close();
+ });
+ }
+ },
+ //璇█鏇挎崲
+ replaceChineseWithEnglish() {
+ const nameMap = this.$t("langPositioning1");
+ this.jsonData = this.jsonData.map((item) => {
+ return item.map((obj) => {
+ if (obj.name) {
+ const newName = nameMap[obj.name] || obj.name;
+ return { ...obj, name: newName };
+ } else if (obj.button && obj.button.name) {
+ const newName = nameMap[obj.button.name] || obj.button.name;
+ return { ...obj, button: { ...obj.button, name: newName } };
+ } else if (obj.title && obj.title.name) {
+ const newName = nameMap[obj.title.name] || obj.title.name;
+ return { ...obj, title: { ...obj.title, name: newName } };
+ } else {
+ return obj;
+ }
+ });
+ });
+
+ // console.log(this.jsonData)
+ },
+ send() {
+ socket?.send(JSON.stringify(this.messagepack));
+ },
+ },
+};
+</script>
+
+<style scoped>
+.item-row {
+ display: flex;
+ align-items: center;
+ margin-bottom: 5px;
+ /* 璋冩暣姣忎釜椤圭洰涔嬮棿鐨勯棿璺� */
+}
+
+.action-button {
+ margin-right: 30px;
+ background: #66b1ff;
+ color: #fff;
+}
+
+.blue-button {
+ background-color: skyblue;
+}
+</style>
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
index bde607c..879c4c2 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
@@ -38,6 +38,14 @@
<router-link v-if="hasPermission" to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
$t('Speed parameter settings')
}}</router-link>
+
+<router-link v-if="hasPermission"
+ to="/Electrical/InteractionState"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("InteractionState") }}</router-link
+ >
</el-breadcrumb>
@@ -201,6 +209,9 @@
console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
socket?.send(jsonString);
event.target.blur(); // 鍙栨秷杈撳叆妗嗙劍鐐�
+
+
+
},
A02start(event){
const data = [];
@@ -313,6 +324,18 @@
const jsonString = JSON.stringify(jsonObject);
console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
socket?.send(jsonString);
+ setTimeout(() => {
+ const reversedData = data.map(values => values.map(value => {
+ return (!value || value === 1) ? 0 : 0 ;
+ }));
+
+ const reversedJsonObject = { data: reversedData };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const reversedJsonString = JSON.stringify(reversedJsonObject);
+ console.log('鍙嶈浆鍚�:', reversedJsonString);
+ socket?.send(reversedJsonString);
+ }, 1000);
}
@@ -333,6 +356,18 @@
const jsonString = JSON.stringify(jsonObject);
console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
socket?.send(jsonString);
+ setTimeout(() => {
+ const reversedData = data.map(values => values.map(value => {
+ return (!value || value === 1) ? 0 : 0 ;
+ }));
+
+ const reversedJsonObject = { data: reversedData };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const reversedJsonString = JSON.stringify(reversedJsonObject);
+ console.log('鍙嶈浆鍚�:', reversedJsonString);
+ socket?.send(reversedJsonString);
+ }, 1000);
}
@@ -353,6 +388,18 @@
const jsonString = JSON.stringify(jsonObject);
console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
socket?.send(jsonString);
+ setTimeout(() => {
+ const reversedData = data.map(values => values.map(value => {
+ return (!value || value === 1) ? 0 : 0 ;
+ }));
+
+ const reversedJsonObject = { data: reversedData };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const reversedJsonString = JSON.stringify(reversedJsonObject);
+ console.log('鍙嶈浆鍚�:', reversedJsonString);
+ socket?.send(reversedJsonString);
+ }, 1000);
}
@@ -373,6 +420,18 @@
const jsonString = JSON.stringify(jsonObject);
console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
socket?.send(jsonString);
+ setTimeout(() => {
+ const reversedData = data.map(values => values.map(value => {
+ return (!value || value === 1) ? 0 : 0 ;
+ }));
+
+ const reversedJsonObject = { data: reversedData };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const reversedJsonString = JSON.stringify(reversedJsonObject);
+ console.log('鍙嶈浆鍚�:', reversedJsonString);
+ socket?.send(reversedJsonString);
+ }, 1000);
}
@@ -419,9 +478,18 @@
const jsonString2 = JSON.stringify(jsonObject2);
console.log('鎵�鏈夊浣嶇殑value:', jsonString2);
socket?.send(jsonString2);
- // setTimeout(() =>
- // window.location.reload(), 2000
- // )
+ setTimeout(() => {
+ const reversedData = data2.map(values => values.map(value => {
+ return (!value || value === 1) ? 0 : 0 ;
+ }));
+
+ const reversedJsonObject = { data: reversedData };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const reversedJsonString = JSON.stringify(reversedJsonObject);
+ console.log('鍙嶈浆鍚�:', reversedJsonString);
+ socket?.send(reversedJsonString);
+ }, 1000);
}
@@ -443,6 +511,18 @@
const jsonString2 = JSON.stringify(jsonObject2);
console.log('鎵�鏈夊洖闆剁殑value:', jsonString2);
socket?.send(jsonString2);
+ setTimeout(() => {
+ const reversedData = data2.map(values => values.map(value => {
+ return (!value || value === 1) ? 0 : 0 ;
+ }));
+
+ const reversedJsonObject = { data: reversedData };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const reversedJsonString = JSON.stringify(reversedJsonObject);
+ console.log('鍙嶈浆鍚�:', reversedJsonString);
+ socket?.send(reversedJsonString);
+ }, 1000);
// setTimeout(() =>
// window.location.reload(), 2000
// )
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
index 636b9d0..db1e2fe 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
@@ -201,6 +201,18 @@
const jsonString = JSON.stringify(jsonObject);
console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
socket?.send(jsonString);
+ setTimeout(() => {
+ const reversedData = data.map(values => values.map(value => {
+ return (!value || value === 1) ? 0 : 0 ;
+ }));
+
+ const reversedJsonObject = { data: reversedData };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const reversedJsonString = JSON.stringify(reversedJsonObject);
+ console.log('鍙嶈浆鍚�:', reversedJsonString);
+ socket?.send(reversedJsonString);
+ }, 1000);
}
@@ -221,6 +233,18 @@
const jsonString = JSON.stringify(jsonObject);
console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
socket?.send(jsonString);
+ setTimeout(() => {
+ const reversedData = data.map(values => values.map(value => {
+ return (!value || value === 1) ? 0 : 0 ;
+ }));
+
+ const reversedJsonObject = { data: reversedData };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const reversedJsonString = JSON.stringify(reversedJsonObject);
+ console.log('鍙嶈浆鍚�:', reversedJsonString);
+ socket?.send(reversedJsonString);
+ }, 1000);
}
@@ -267,6 +291,18 @@
const jsonString2 = JSON.stringify(jsonObject2);
console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString2);
socket?.send(jsonString2);
+ setTimeout(() => {
+ const reversedData = data2.map(values => values.map(value => {
+ return (!value || value === 1) ? 0 : 0 ;
+ }));
+
+ const reversedJsonObject = { data: reversedData };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const reversedJsonString = JSON.stringify(reversedJsonObject);
+ console.log('鍙嶈浆鍚�:', reversedJsonString);
+ socket?.send(reversedJsonString);
+ }, 1000);
}
@@ -288,6 +324,18 @@
const jsonString2 = JSON.stringify(jsonObject2);
console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString2);
socket?.send(jsonString2);
+ setTimeout(() => {
+ const reversedData = data2.map(values => values.map(value => {
+ return (!value || value === 1) ? 0 : 0 ;
+ }));
+
+ const reversedJsonObject = { data: reversedData };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const reversedJsonString = JSON.stringify(reversedJsonObject);
+ console.log('鍙嶈浆鍚�:', reversedJsonString);
+ socket?.send(reversedJsonString);
+ }, 1000);
}
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter2.vue b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
index b22cce4..ddcf02d 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter2.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
@@ -76,6 +76,14 @@
<router-link v-if="hasPermission" to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
$t('Speed parameter settings')
}}</router-link>
+
+<router-link v-if="hasPermission"
+ to="/Electrical/InteractionState"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("InteractionState") }}</router-link
+ >
</el-breadcrumb>
<el-row :gutter="40">
@@ -121,8 +129,15 @@
item.button.value === 2 && item.button.name !== 'Clear ID',
'yellow-button':
item.button.value === 1 && item.button.name !== 'Clear ID',
- id:
+ 'id':
item.button.value === 1 && item.button.name === 'Clear ID',
+ 'A01jiting':item.button.value === 0 && item.button.name === 'A01Abort/ResumeTasks',
+ 'A02jiting':item.button.value === 0 && item.button.name === 'A02Abort/ResumeTasks',
+ 'emgHMI':item.button.value === 0 && item.button.name === 'emgHMI',
+ 'GA01jiting':item.button.value ===1 && item.button.name === 'A01Abort/ResumeTasks',
+ 'GA02jiting':item.button.value === 1 && item.button.name === 'A02Abort/ResumeTasks',
+ 'GemgHMI':item.button.value === 1 && item.button.name === 'emgHMI'
+
}"
>{{ item.button.name }}</el-button
>
@@ -143,7 +158,14 @@
item.button.value === 2 && item.button.name !== '娓呴櫎ID',
'yellow-button':
item.button.value === 1 && item.button.name !== '娓呴櫎ID',
- id: item.button.value === 1 && item.button.name === '娓呴櫎ID',
+ 'id': item.button.value === 1 && item.button.name === '娓呴櫎ID',
+ 'A01jiting':item.button.value === 0 && item.button.name === 'A01缁堟/缁х画',
+ 'A02jiting':item.button.value === 0 && item.button.name === 'A02缁堟/缁х画',
+ 'emgHMI':item.button.value === 0 && item.button.name === '杞�ュ仠',
+ 'GA01jiting':item.button.value === 1 && item.button.name === 'A01缁堟/缁х画',
+ 'GA02jiting':item.button.value === 1 && item.button.name === 'A02缁堟/缁х画',
+ 'GemgHMI':item.button.value === 1 && item.button.name === '杞�ュ仠'
+
}"
>{{ item.button.name }}</el-button
>
@@ -343,7 +365,7 @@
const jsonString = JSON.stringify(jsonObject);
console.log("鍙戦�佺殑鍐呭:", jsonString);
socket?.send(jsonString);
-}, 2000);
+}, 1000);
}
@@ -351,10 +373,12 @@
currentButtonName === "A01Abort/ResumeTasks" ||
currentButtonName === "A01缁堟/缁х画" ||
currentButtonName === "A02Abort/ResumeTasks" ||
- currentButtonName === "A02缁堟/缁х画"
+ currentButtonName === "A02缁堟/缁х画" ||
+ currentButtonName === "杞�ュ仠" ||
+ currentButtonName === "emgHMI"
) {
const data3 = [];
- const resetButtonValues3 = [this.jsonData[13][0].button.value2,this.jsonData[14][0].button.value2];
+ const resetButtonValues3 = [this.jsonData[13][0].button.value2,this.jsonData[14][0].button.value2,this.jsonData[16][0].button.value2];
// 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
data3.push(resetButtonValues3.flat());
@@ -369,6 +393,16 @@
const jsonString3 = JSON.stringify(jsonObject3);
console.log("鎬ュ仠鍚庝腑姝�/缁х画閫夋嫨:", jsonString3);
socket?.send(jsonString3);
+
+ setTimeout(() => {
+ const jsonObject = { data: [ [],[0, 0, 0], []] };
+ const jsonString = JSON.stringify(jsonObject);
+ console.log("鍙戦�佺殑鍥炲脊鍐呭:", jsonString);
+ socket?.send(jsonString);
+}, 1000);
+
+
+
// setTimeout(()=>
// window.location.reload(),2000
// )
@@ -439,6 +473,7 @@
//鎬ュ仠鎸夐挳
jsonData2[13][0].button.value = obj.jiting[0][0];
jsonData2[14][0].button.value = obj.jiting[0][1];
+ jsonData2[16][0].button.value = obj.jiting[0][2];
@@ -653,4 +688,26 @@
.id {
background-color: green;
}
+.A02jiting{
+
+ background-color: #66b1ff;
+}
+.A01jiting{
+
+background-color: #66b1ff;
+}
+.emgHMI{
+
+ background-color: #66b1ff;
+}
+.GA02jiting{
+
+ background-color: green;
+}
+.GA01jiting{
+ background-color: green;
+}
+.GemgHMI{
+ background-color: green;
+}
</style>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/Positioning1.vue b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
index 10b4905..e777694 100644
--- a/CanadaMes-ui/src/views/Electrical/Positioning1.vue
+++ b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
@@ -104,6 +104,14 @@
active-class="blue-button"
>{{ $t("Speed parameter settings") }}</router-link
>
+
+ <router-link
+ to="/Electrical/InteractionState"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("InteractionState") }}</router-link
+ >
</el-breadcrumb>
<el-row :gutter="18" class="card">
diff --git a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
index 8244745..956ea14 100644
--- a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
+++ b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
@@ -90,6 +90,14 @@
active-class="blue-button"
>{{ $t("Speed parameter settings") }}</router-link
>
+
+ <router-link
+ to="/Electrical/InteractionState"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("InteractionState") }}</router-link
+ >
</el-breadcrumb>
<el-row :gutter="26">
@@ -502,7 +510,7 @@
}
if (currentButtonName === "鍥為浂" || currentButtonName === "Home") {
- const data3 = [];
+
const resetButtonValues3 = this.jsonData
.map((item) => {
const buttonItem3 = item.find(
@@ -515,14 +523,14 @@
.filter((value) => value !== null);
// 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
- data3.push(resetButtonValues3.flat());
+ data.push(resetButtonValues3.flat());
// 鍦� data3 鏁扮粍鍓嶉潰娣诲姞涓や釜绌烘暟缁�
- data3.unshift([], [], []);
- data3.push([], [], [], []);
+ data.unshift([], [], []);
+ data.push([], [], [], []);
// 鍒涘缓 jsonObject3 瀵硅薄锛屽苟娣诲姞 data3 灞炴��
- jsonObject = { data: data3 };
+ jsonObject = { data };
}
if (
currentButtonName === "A01鍗婅嚜鍔�" ||
@@ -657,6 +665,19 @@
const jsonString = JSON.stringify(jsonObject);
console.log("鎵�鏈塗ype涓�0鐨剉alue:", jsonString);
socket?.send(jsonString);
+
+ setTimeout(() => {
+ const reversedData = data.map(values => values.map(value => {
+ return (!value || value === 0) ? 0 : 0 ;
+ }));
+
+ const reversedJsonObject = { data: reversedData };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const reversedJsonString = JSON.stringify(reversedJsonObject);
+ console.log('鍙嶈浆鍚�:', reversedJsonString);
+ socket?.send(reversedJsonString);
+ }, 1000);
},
initWebSocket() {
diff --git a/CanadaMes-ui/src/views/Electrical/Servomanual.vue b/CanadaMes-ui/src/views/Electrical/Servomanual.vue
index d64d9ea..a3fed75 100644
--- a/CanadaMes-ui/src/views/Electrical/Servomanual.vue
+++ b/CanadaMes-ui/src/views/Electrical/Servomanual.vue
@@ -40,6 +40,14 @@
<router-link v-if="hasPermission" to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
$t('Speed parameter settings')
}}</router-link>
+
+<router-link v-if="hasPermission"
+ to="/Electrical/InteractionState"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("InteractionState") }}</router-link
+ >
</el-breadcrumb>
diff --git a/CanadaMes-ui/src/views/Electrical/Sign.vue b/CanadaMes-ui/src/views/Electrical/Sign.vue
index 4c0108f..5dc1d7d 100644
--- a/CanadaMes-ui/src/views/Electrical/Sign.vue
+++ b/CanadaMes-ui/src/views/Electrical/Sign.vue
@@ -21,7 +21,12 @@
<div style="padding-right: 30px;display: flex;flex-wrap: wrap;" class="neir">
<div class="kuai_sb" v-for="item in record.xyData" :key="item.name">
<el-col class="deng" :class="getStatusClass(item.value)"></el-col>
- <el-input v-model="item.name" style="width: 100%;" class="in_mc"></el-input>
+ <span style="width: 100%;" class="in_mc">{{
+ item.unit
+ }}</span>
+ <span style="width: 100%;" class="in_mc">{{
+ item.name
+ }}</span>
</div>
@@ -163,7 +168,7 @@
const translation = this.$t('Signlang');
if (translation != null) {
- this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value }; });
+ this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value,unit:item.unit }; });
//console.log(translation);
}
@@ -201,8 +206,8 @@
.kuai_sb {
text-align: center;
- width: 15%;
- margin-bottom: 15px;
+ width:18%;
+ margin-bottom: 5px;
}
.el-input {
@@ -215,19 +220,17 @@
}
.in_mc {
- .el-input__inner {
- border: none;
- }
+ font-size: 13px;
}
.deng {
- margin-left: 40%;
+ margin-left: 1%;
display: inline-block;
background: #A0A0A0;
border: 0.1875em solid white;
border-radius: 50%;
- height: 4em;
- width: 4em;
+ height: 2em;
+ width: 2em;
box-shadow: 0.375em 0.375em 0 0 rgba(214, 214, 214, 0.125);
}
diff --git a/springboot-vue3/.idea/uiDesigner.xml b/springboot-vue3/.idea/uiDesigner.xml
new file mode 100644
index 0000000..b93ac08
--- /dev/null
+++ b/springboot-vue3/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Palette2">
+ <group name="Swing">
+ <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+ </item>
+ <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+ <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+ <initial-values>
+ <property name="text" value="Button" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="RadioButton" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="CheckBox" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="Label" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+ <preferred-size width="-1" height="20" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+ </item>
+ </group>
+ </component>
+</project>
\ No newline at end of file
diff --git a/springboot-vue3/Dockerfile b/springboot-vue3/Dockerfile
new file mode 100644
index 0000000..e9d7112
--- /dev/null
+++ b/springboot-vue3/Dockerfile
@@ -0,0 +1,6 @@
+FROM openjdk:8-jdk-alpine
+VOLUME /tmp
+ARG JAR_FILE
+COPY ${JAR_FILE} springboot-vue3-0.0.1-SNAPSHOT.jar
+EXPOSE 8888
+ENTRYPOINT ["java","-jar","/springboot-vue3-0.0.1-SNAPSHOT.jar"]
\ No newline at end of file
diff --git a/springboot-vue3/JsonFile/PlcParameter.json b/springboot-vue3/JsonFile/PlcParameter.json
new file mode 100644
index 0000000..8f15f47
--- /dev/null
+++ b/springboot-vue3/JsonFile/PlcParameter.json
@@ -0,0 +1,610 @@
+{
+ "plcAddressBegin":"DB100.0",
+ "plcAddressLenght":"86",
+ "dataType":"word",
+ "parameteInfor":[
+ {
+ "codeId": "conveyorVelocity(Max)",
+ "addressIndex":"0",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"m/min"
+ },
+ {
+ "codeId": "conveyorVelocity(AutoFAST)",
+ "addressIndex":"2",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"m/min"
+ },
+ {
+ "codeId": "conveyorVelocity(AutoSLOW)",
+ "addressIndex":"4",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"m/min"
+ },
+ {
+ "codeId": "conveyorVelocity(Manual)",
+ "addressIndex":"6",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm/S"
+ },
+ {
+ "codeId": "A01A02TURNJOGVelocity",
+ "addressIndex":"8",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm/S"
+ },
+ {
+ "codeId": "A01A02TRAVELJOGVelocity",
+ "addressIndex":"10",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm/S"
+ },
+ {
+ "codeId": "B01B02TRAVELJOGVelocity",
+ "addressIndex":"12",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm/S"
+ },
+ {
+ "codeId": "A01A02TURNPOSVelocityAUTO",
+ "addressIndex":"14",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm/S"
+ },
+ {
+ "codeId": "A01TURNPOSVelocitymanual",
+ "addressIndex":"16",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm/S"
+ },
+ {
+ "codeId": "A01A02TRAVELPOSVelocityAUTO",
+ "addressIndex":"18",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm/S"
+ },
+ {
+ "codeId": "A01TRAVELPOSVelocitymanual",
+ "addressIndex":"20",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm/S"
+ },
+ {
+ "codeId": "B01B02TRAVELPOSVelocityAUTO",
+ "addressIndex":"22",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm/S"
+ },
+ {
+ "codeId": "B01TRAVELPOSVelocitymanual",
+ "addressIndex":"24",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm/S"
+ },
+ {
+ "codeId": "A01A02conveyorVelocity(Max)",
+ "addressIndex":"26",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"m/min"
+ },
+ {
+ "codeId": "A01A02conveyorVelocity(AutoFAST)",
+ "addressIndex":"28",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"m/min"
+ },
+ {
+ "codeId": "A01A02conveyorVelocity(AutoSLOW)",
+ "addressIndex":"30",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"m/min"
+ },
+ {
+ "codeId": "B01B02conveyorVelocity(Manual)",
+ "addressIndex":"32",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"m/min"
+ },
+ {
+ "codeId": "B01B02conveyorVelocity(Max)",
+ "addressIndex":"34",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"m/min"
+ },
+ {
+ "codeId": "B01B02conveyorVelocity(AutoFAST)",
+ "addressIndex":"36",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"m/min"
+ },
+ {
+ "codeId": "B01B02conveyorVelocity(AutoSLOW)",
+ "addressIndex":"38",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"m/min"
+ },
+ {
+ "codeId": "B01B02conveyorVelocity(Manual)",
+ "addressIndex":"40",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"m/min"
+ },
+ {
+ "codeId": "gridspacing",
+ "addressIndex":"42",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A01Spliceaddresssetting",
+ "addressIndex":"44",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A02Spliceaddresssetting",
+ "addressIndex":"46",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A011#gridaddress",
+ "addressIndex":"48",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A0122#gridaddress",
+ "addressIndex":"50",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A0143#gridaddress",
+ "addressIndex":"52",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A0164#gridaddress",
+ "addressIndex":"54",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A0185#gridaddress",
+ "addressIndex":"56",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A01106#gridaddress",
+ "addressIndex":"58",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A01127#gridaddress",
+ "addressIndex":"60",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A01148#gridaddress",
+ "addressIndex":"62",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A01169#gridaddress",
+ "addressIndex":"64",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A01190#gridaddress",
+ "addressIndex":"66",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A021#gridaddress",
+ "addressIndex":"68",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A0222#gridaddress",
+ "addressIndex":"70",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A0243#gridaddress",
+ "addressIndex":"72",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A0264#gridaddress",
+ "addressIndex":"74",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A0285#gridaddress",
+ "addressIndex":"76",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A02106#gridaddress",
+ "addressIndex":"78",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A02127#gridaddress",
+ "addressIndex":"80",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A02148#gridaddress",
+ "addressIndex":"82",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A02169#gridaddress",
+ "addressIndex":"84",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A02190#gridaddress",
+ "addressIndex":"86",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "B011#gridaddress",
+ "addressIndex":"88",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "B0122#gridaddress",
+ "addressIndex":"90",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "B0143#gridaddress",
+ "addressIndex":"92",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "B0164#gridaddress",
+ "addressIndex":"94",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "B0185#gridaddress",
+ "addressIndex":"96",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "B02106#gridaddress",
+ "addressIndex":"98",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "B02127#gridaddress",
+ "addressIndex":"100",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "B02148#gridaddress",
+ "addressIndex":"102",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "B02169#gridaddress",
+ "addressIndex":"104",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "B02190#gridaddress",
+ "addressIndex":"106",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"mm"
+ },
+ {
+ "codeId": "A01Targetgrid(Manual)",
+ "addressIndex":"108",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": " A02Targetgrid(Manual)",
+ "addressIndex":"110",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "B01Targetgrid(Manual)",
+ "addressIndex":"112",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "B02Targetgrid(Manual)",
+ "addressIndex":"114",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "A01turnTargetAngle(Manual)",
+ "addressIndex":"116",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"掳"
+ },
+ {
+ "codeId": "A02turnTargetAngle(Manual)",
+ "addressIndex":"118",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"掳"
+ },
+ {
+ "codeId": "A01turnAngle1",
+ "addressIndex":"120",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"掳"
+ },
+ {
+ "codeId": "A01turnAngle2",
+ "addressIndex":"122",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"掳"
+ },
+ {
+ "codeId": "A01turnAngle3",
+ "addressIndex":"124",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"掳"
+ },
+ {
+ "codeId": "A01turnAngle4",
+ "addressIndex":"126",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"掳"
+ },
+ {
+ "codeId": "A02turnAngle1",
+ "addressIndex":"128",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"掳"
+ },
+ {
+ "codeId": "A02turnAngle2",
+ "addressIndex":"130",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"掳"
+ },
+ {
+ "codeId": "A02turnAngle3",
+ "addressIndex":"132",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"掳"
+ },
+ {
+ "codeId": "A02turnAngle4",
+ "addressIndex":"134",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"掳"
+ },
+ {
+ "codeId": "Minimumglasslength",
+ "addressIndex":"136",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "Minimumglassheight",
+ "addressIndex":"138",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "Maximumglasslength",
+ "addressIndex":"140",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "Maximumglassheight",
+ "addressIndex":"142",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "A01cellsGlassNum",
+ "addressIndex":"144",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "A02cellsGlassNum",
+ "addressIndex":"146",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "A01ID",
+ "addressIndex":"148",
+ "addressLenght":"14",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "A02ID",
+ "addressIndex":"162",
+ "addressLenght":"14",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "A02TRAVELPOSVelocitymanual",
+ "addressIndex":"176",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "B02TRAVELPOSVelocitymanual",
+ "addressIndex":"178",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "Startingpositionofthefeedca",
+ "addressIndex":"180",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "Targetpositionofthefeedcar",
+ "addressIndex":"182",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "Lengthofincomingglass",
+ "addressIndex":"184",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "Widthofincomingglass",
+ "addressIndex":"186",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "Startingpositionoftheexitcar",
+ "addressIndex":"188",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ }, {
+ "codeId": "Exitcartargetposition",
+ "addressIndex":"190",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ }
+ , {
+ "codeId": "A02TURNPOSVelocitymanual",
+ "addressIndex":"192",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ }
+ , {
+ "codeId": "A01delayTime",
+ "addressIndex":"194",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ }
+
+
+ ]
+}
diff --git a/springboot-vue3/JsonFile/PlcSign.json b/springboot-vue3/JsonFile/PlcSign.json
new file mode 100644
index 0000000..6a40941
--- /dev/null
+++ b/springboot-vue3/JsonFile/PlcSign.json
@@ -0,0 +1,47 @@
+{
+ "plcAddressBegin":"DB100.0.0",
+ "plcAddressLenght":"20",
+ "dataType":"bit",
+ "parameteInfor":[
+ {
+ "codeId": "D01.SRdec",
+ "addressIndex":"0"
+ },
+ {
+ "codeId": "conveyorVelocity(AutoSLOW)",
+ "addressIndex":"1"
+ },
+ {
+ "codeId": "conveyorVelocity(Manual)",
+ "addressIndex":"2"
+ },
+ {
+ "codeId": "A01A02TURNJOGVelocity",
+ "addressIndex":"3"
+ },
+ {
+ "codeId": "A01A02TRAVELJOGVelocity",
+ "addressIndex":"4"
+ },
+ {
+ "codeId": "B01B02TRAVELJOGVelocity",
+ "addressIndex":"5"
+ },
+ {
+ "codeId": "A01A02TURNPOSVelocityAUTO",
+ "addressIndex":"12"
+ },
+ {
+ "codeId": "A01A02TURNPOSVelocitymanual",
+ "addressIndex":"14"
+ },
+ {
+ "codeId": "A01A02TRAVELPOSVelocityAUTO",
+ "addressIndex":"16"
+ },
+ {
+ "codeId": "DO1id",
+ "addressIndex":"18"
+ }
+ ]
+}
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
new file mode 100644
index 0000000..af6748e
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/InitUtil.java
@@ -0,0 +1,97 @@
+package com.example.springboot.component;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import com.example.springboot.entity.device.PlcBitInfo;
+import com.example.springboot.entity.device.PlcBitObject;
+import com.example.springboot.entity.device.PlcParameterInfo;
+import com.example.springboot.entity.device.PlcParameterObject;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class InitUtil {
+ public static PlcParameterObject initword(String jsonFilePath) {
+ try {
+ FileReader fileReader = new FileReader(jsonFilePath);
+ BufferedReader bufferedReader = new BufferedReader(fileReader);
+
+ StringBuilder content = new StringBuilder();
+ String line;
+
+ while ((line = bufferedReader.readLine()) != null) {
+ content.append(line);
+ }
+
+ bufferedReader.close();
+ fileReader.close();
+
+ JSONObject jsonfileobj = new JSONObject(content.toString());
+ JSONArray jsonArray = jsonfileobj.getJSONArray("parameteInfor");
+ PlcParameterObject plcParameterObject = new PlcParameterObject();
+ plcParameterObject.setPlcAddressBegin(jsonfileobj.getStr("plcAddressBegin"));//璁剧疆璧峰浣嶅湴鍧�
+ plcParameterObject.setPlcAddressLength(Integer.valueOf(jsonfileobj.getStr("plcAddressLenght")));//璁剧疆鍦板潃闀垮害
+
+ for (int i = 0; i < jsonArray.size(); i++) {
+ JSONObject parameterObj = jsonArray.getJSONObject(i);
+ PlcParameterInfo plcParameterInfo = new PlcParameterInfo(jsonfileobj.getStr("plcAddressBegin")); //鍙傛暟瀹炰緥
+ String codeid = parameterObj.getStr("codeId");
+ plcParameterInfo.setCodeId(codeid);
+ plcParameterInfo.setAddressIndex(Integer.valueOf(parameterObj.getStr("addressIndex")));
+ plcParameterInfo.setRatio(Integer.valueOf(parameterObj.getStr("ratio")));
+ plcParameterInfo.setAddressLength(Integer.valueOf(parameterObj.getStr("addressLenght")));
+ plcParameterInfo.setUnit(parameterObj.getStr("unit"));
+ plcParameterObject.addPlcParameter(plcParameterInfo);
+ }
+ return plcParameterObject;
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ public static PlcBitObject initbit(String jsonFilePath) {
+ PlcBitObject plcBitObject = new PlcBitObject();
+
+ try {
+ FileReader fileReader = new FileReader(jsonFilePath);
+ BufferedReader bufferedReader = new BufferedReader(fileReader);
+
+ StringBuilder content = new StringBuilder();
+ String line;
+
+ while ((line = bufferedReader.readLine()) != null) {
+ content.append(line);
+ }
+
+ bufferedReader.close();
+ fileReader.close();
+
+ JSONObject jsonfileobj = new JSONObject(content.toString());
+ JSONArray jsonArray = jsonfileobj.getJSONArray("parameteInfor");
+ plcBitObject.setPlcAddressBegin(jsonfileobj.getStr("plcAddressBegin"));//璁剧疆璧峰浣嶅湴鍧�
+ plcBitObject.setPlcAddressLength(Integer.valueOf(jsonfileobj.getStr("plcAddressLenght")));//璁剧疆鍦板潃闀垮害
+
+ for (int i = 0; i < jsonArray.size(); i++) {
+ JSONObject parameterObj = jsonArray.getJSONObject(i);
+
+ PlcBitInfo plcBitInfo = new PlcBitInfo(jsonfileobj.getStr("plcAddressBegin")); //鍙傛暟瀹炰緥
+ String codeid = parameterObj.getStr("codeId");
+ plcBitInfo.setCodeId(codeid);
+ plcBitInfo.setAddressIndex(Integer.valueOf(parameterObj.getStr("addressIndex")));
+
+ plcBitObject.addPlcBit(plcBitInfo);
+ }
+ System.out.println("");
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return plcBitObject;
+ }
+
+
+
+}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/MessageHandler.java b/springboot-vue3/src/main/java/com/example/springboot/component/MessageHandler.java
index 36e26f5..0e02e97 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/MessageHandler.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/MessageHandler.java
@@ -24,6 +24,11 @@
}
}
+
+
+
+
+
//鍐欏叆bit
public void writeBitToPLC(JSONArray messageArray, List<String> addresses, int index) {
try {
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
index 3532c83..c1cc9db 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
@@ -38,12 +38,9 @@
List<Short> dache1 = S7control.getinstance().ReadWord("DB100.18", 1);
List<Short> xiaoche1 = S7control.getinstance().ReadWord("DB100.22", 1);
List<Short> fanzhuan1 = S7control.getinstance().ReadWord("DB100.14", 1);
-
List<String> addresses = Arrays.asList(config.getProperty("Auto.addresses").split(","));
-
List<Short> arraylist2 = S7control.getinstance().readWords(addresses);
//System.out.println("lastMessage锛�" + arraylist2);
-
//缈昏浆
List<Short> fanzhuan2 = S7control.getinstance().ReadWord("DB100.8", 1);
List<Short> xiaoche2 = S7control.getinstance().ReadWord("DB100.12", 1);
@@ -117,15 +114,10 @@
System.out.println(messageArray);
// 鍐欏叆绗竴涓湴鍧�
customS7Control.WriteWordsToPLC(messageArray, addressList2,2);
-
// 鍐欏叆绗簩涓湴鍧�
customS7Control.WriteWordsToPLC(messageArray, addressList3,3);
-
-
// 鍐欏叆绗笁涓湴鍧�
customS7Control.WriteWordsToPLC(messageArray, addressList4,4);
-
-
// 鍐欏叆绗洓涓湴鍧�
if (!mergedList.isEmpty()) {
S7control.getinstance().WriteWord(addressList1, mergedList);
@@ -133,15 +125,10 @@
}
List<String> waddresses1 = Arrays.asList(config.getProperty("Auto.shusong").split(","));
-
-
String addressList22 = "DB100.8";
String addressList33 = "DB100.12";
-
if (!messages.isEmpty()) {
// 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
-
-
// 鏁村悎绗� 1 鍒� 3 涓暟缁勫苟鍘绘帀 null 鍏冪礌
List<Short> mergedList2 = new ArrayList<>();
for (int i = 5; i < 8; i++) {
@@ -163,18 +150,13 @@
// 鍐欏叆绗紞涓湴鍧�
customS7Control.WriteWordsToPLC(messageArray, addressList22,8);
-
-
// 鍐欏叆绗叚涓湴鍧�
customS7Control.WriteWordsToPLC(messageArray, addressList33,9);
-
// 鍐欏叆绗竷涓湴鍧�
if (!mergedList2.isEmpty()) {
S7control.getinstance().WriteWord(waddresses1, mergedList2);
System.out.println("messageValue锛�" + mergedList2 + " written to PLC at address " + waddresses1);
}
-
-
// 娓呯┖娑堟伅鍒楄〃
webserver.clearMessages();
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview.java
new file mode 100644
index 0000000..c9d5b49
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview.java
@@ -0,0 +1,213 @@
+package com.example.springboot.component;
+
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import com.example.springboot.service.StorageCageService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import com.example.springboot.entity.device.PlcParameterObject;
+import com.example.springboot.entity.device.PlcBitObject;
+
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Component
+public class PLCAutomaticParameterSettingReview extends Thread {
+
+ private StorageCageService storageCageService = new StorageCageService();
+ private final PlcParameterObject plcParameterObject;
+ private final PlcBitObject plcBitObject;
+ MessageHandler customS7Control = new MessageHandler();
+ @Autowired
+ public PLCAutomaticParameterSettingReview() {
+ this.storageCageService = storageCageService;
+ this.plcParameterObject = new PlcParameterObject();
+ this.plcBitObject = new PlcBitObject();
+ String jsonFilePath = "JsonFile/PlcParameter.json";
+ InitUtil.initword(jsonFilePath); // 鍒濆鍖� PlcParameterObject
+ String jsonFilePath2 = "JsonFile/PlcSign.json";
+ InitUtil.initbit(jsonFilePath2); // 鍒濆鍖� PlcSign
+
+
+ }
+
+ // 鍗曚緥妯″紡 绾跨▼瀹夊叏
+ public static PLCAutomaticParameterSettingReview getInstance(StorageCageService storageCageService) {
+ return new PLCAutomaticParameterSettingReview();
+ }
+
+ @Override
+ public void run() {
+ while (!Thread.currentThread().isInterrupted()) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ e.printStackTrace();
+ }
+
+
+
+
+ List<String> addresses = new ArrayList<>();
+ addresses.add("A01turnAngle1");
+ addresses.add("A01turnAngle2");
+ addresses.add("A01turnAngle3");
+ addresses.add("A01turnAngle4");
+ addresses.add("A02turnAngle2");
+ addresses.add("A02turnAngle3");
+ addresses.add("A02turnAngle4");
+ addresses.add("Minimumglasslength");
+
+
+ //Auto.addresses=DB100.0,DB100.2,DB100.4,DB100.6,DB100.26,DB100.28,DB100.30,DB100.32,DB100.34,DB100.36,DB100.38,DB100.40
+ List<String> Autoaddresses = new ArrayList<>();
+ Autoaddresses.add("conveyorVelocity(Max)");
+ Autoaddresses.add("conveyorVelocity(AutoFAST)");
+ Autoaddresses.add("conveyorVelocity(AutoSLOW)");
+ Autoaddresses.add("conveyorVelocity(Manual)");
+ Autoaddresses.add("A01A02conveyorVelocity(Max)");
+ Autoaddresses.add("A01A02conveyorVelocity(AutoFAST)");
+ Autoaddresses.add("A01A02conveyorVelocity(AutoSLOW)");
+ Autoaddresses.add("B01B02conveyorVelocity(Manual)");
+
+ Autoaddresses.add("B01B02conveyorVelocity(Max)");
+ Autoaddresses.add("B01B02conveyorVelocity(AutoFAST)");
+ Autoaddresses.add("B01B02conveyorVelocity(AutoSLOW)");
+ Autoaddresses.add("B01B02conveyorVelocity(Manual)");
+
+
+
+
+
+
+
+ String addressList1 = "DB100.120";
+ String addressList2 = "DB100.18";
+ String addressList3 = "DB100.22";
+ String addressList4 = "DB100.14";
+
+
+
+
+
+
+
+ // List<Short> dache1 = S7control.getinstance().ReadWord("DB100.18", 1);
+ // List<Short> xiaoche1 = S7control.getinstance().ReadWord("DB100.22", 1);
+ // List<Short> fanzhuan1 = S7control.getinstance().ReadWord("DB100.14", 1);
+ // List<String> addresses = Arrays.asList(config.getProperty("Auto.addresses").split(","));
+ // List<Short> arraylist2 = S7control.getinstance().readWords(addresses);
+ //System.out.println("lastMessage锛�" + arraylist2);
+//缈昏浆
+ //List<Short> fanzhuan2 = S7control.getinstance().ReadWord("DB100.8", 1);
+ // List<Short> xiaoche2 = S7control.getinstance().ReadWord("DB100.12", 1);
+ JSONObject jsonObject = new JSONObject();
+ // new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
+ // new short[]{0,0, 0, 0, 0, 0, 0, 0, 0, 0}
+
+ jsonObject.append("params", plcParameterObject.getPlcParameterValues(addresses));
+ jsonObject.append("dache1", plcParameterObject.getPlcParameter("A01A02TRAVELPOSVelocityAUTO").getValue());
+ jsonObject.append("xiaoche", plcParameterObject.getPlcParameter("B01B02TRAVELPOSVelocityAUTO").getValue());
+ jsonObject.append("fanzhuan", plcParameterObject.getPlcParameter("A01A02TURNPOSVelocityAUTO").getValue());
+ jsonObject.append("params2", plcParameterObject.getPlcParameterValues(Autoaddresses));
+ jsonObject.append("fanzhuan2", plcParameterObject.getPlcParameter("A01A02TURNJOGVelocity").getValue());
+ jsonObject.append("xiaoche2", plcParameterObject.getPlcParameter("B01B02TRAVELJOGVelocity").getValue());
+
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ webserver.sendMessage(jsonObject.toString());
+
+// WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
+ if (webserver != null) {
+ List<String> messages = webserver.getMessages();
+
+
+ if (!messages.isEmpty()) {
+ // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+ String lastMessage = messages.get(messages.size() - 1);
+ // System.out.println("lastMessage锛�" + lastMessage);
+ JSONArray messageArray = new JSONArray(lastMessage);
+
+ // 鏁村悎绗� 1 鍒� 2 涓暟缁勫苟鍘绘帀 null 鍏冪礌
+ List<Short> mergedList = new ArrayList<>();
+ for (int i = 0; i < 2; i++) {
+ JSONArray sublist = messageArray.getJSONArray(i);
+ for (int j = 0; j < sublist.size(); j++) {
+ Object value = sublist.get(j);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ short sValue = Short.parseShort(cleanedValue.trim());
+ mergedList.add(sValue);
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ }
+ System.out.println(messageArray);
+ // 鍐欏叆绗竴涓湴鍧�
+ customS7Control.WriteWordsToPLC(messageArray, addressList2,2);
+ // 鍐欏叆绗簩涓湴鍧�
+ customS7Control.WriteWordsToPLC(messageArray, addressList3,3);
+ // 鍐欏叆绗笁涓湴鍧�
+ customS7Control.WriteWordsToPLC(messageArray, addressList4,4);
+ // 鍐欏叆绗洓涓湴鍧�
+ if (!mergedList.isEmpty()) {
+ S7control.getinstance().WriteWord(addressList1, mergedList);
+ System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList1);
+ }
+
+ //List<String> waddresses1 = Arrays.asList(config.getProperty("Auto.shusong").split(","));
+ String addressList22 = "DB100.8";
+ String addressList33 = "DB100.12";
+ if (!messages.isEmpty()) {
+ // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+ // 鏁村悎绗� 1 鍒� 3 涓暟缁勫苟鍘绘帀 null 鍏冪礌
+ List<Short> mergedList2 = new ArrayList<>();
+ for (int i = 5; i < 8; i++) {
+ JSONArray sublist = messageArray.getJSONArray(i);
+ for (int j = 0; j < sublist.size(); j++) {
+ Object value = sublist.get(j);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ short sValue = Short.parseShort(cleanedValue.trim());
+ mergedList2.add(sValue);
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ }
+
+ // 鍐欏叆绗紞涓湴鍧�
+ customS7Control.WriteWordsToPLC(messageArray, addressList22,8);
+ // 鍐欏叆绗叚涓湴鍧�
+ customS7Control.WriteWordsToPLC(messageArray, addressList33,9);
+ // 鍐欏叆绗竷涓湴鍧�
+ // plcParameterObject.getPlcParameter("conveyorVelocity(AutoFAST)").getAddress(index)
+ if (!mergedList2.isEmpty()) {
+ //S7control.getinstance().WriteWord(plcParameterObject.getPlcParameter(Autoaddresses), mergedList2);
+ // System.out.println("messageValue锛�" + mergedList2 + " written to PLC at address " + waddresses1);
+ }
+ // 娓呯┖娑堟伅鍒楄〃
+ webserver.clearMessages();
+ }
+ }
+ }
+
+ }
+ }
+
+
+ }
+ }
+}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcInteractionState.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcInteractionState.java
new file mode 100644
index 0000000..216a4a5
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcInteractionState.java
@@ -0,0 +1,101 @@
+package com.example.springboot.component;
+
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class PlcInteractionState extends Thread {
+ private Configuration config;
+
+ public PlcInteractionState() throws IOException {
+ config = new Configuration("config.properties");
+ }
+
+
+ // 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
+ MessageHandler customS7Control = new MessageHandler();
+
+
+
+
+
+ @Override
+ public void run() {
+ while (this != null) {
+ try {
+ Thread.sleep(500);
+
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ // this.readValue();
+ // String PlcAddress = this.name;
+ // Integer Plccount = this.count;
+
+
+
+ List<String> addresses = Arrays.asList(config.getProperty("PlcInteractionState.MESImporttask").split(","));
+
+ List<String> arraylist = S7control.getinstance().readStringsandword(addresses);
+ // System.out.println(arraylist);
+ List<String> addresses2 = Arrays.asList(config.getProperty("PlcInteractionState.PLCImporttask").split(","));
+
+ List<String> arraylist2 = S7control.getinstance().readStringsandword(addresses2);
+
+ List<String> addresses3 = Arrays.asList(config.getProperty("PlcInteractionState.MESProductiontask").split(","));
+
+ List<String> arraylist3 = S7control.getinstance().readStringsandword(addresses3);
+
+
+ List<String> addresses4 = Arrays.asList(config.getProperty("PlcInteractionState.PLCProductiontask").split(","));
+
+ List<String> arraylist4 = S7control.getinstance().readStringsandword(addresses4);
+
+
+ List<String> addresses5 = Arrays.asList(config.getProperty("PlcInteractionState.MEStaskinformation").split(","));
+ List<String> arraylist5 = S7control.getinstance().readStringsandword(addresses5);
+
+
+// String[] values = { ".x11","x21 ","x21 ","x21 ","x21 ","x21"};
+// List<String> arraylist = new ArrayList<>(Arrays.asList(values));
+// String[] values2 = { ".x11 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 "};
+// List<String> arraylist2 = new ArrayList<>(Arrays.asList(values2));
+// String[] values3 = { ".x11 ","x21 ","x21 ","x21 ","x21 ","x21 "};
+// List<String> arraylist3 = new ArrayList<>(Arrays.asList(values3));
+// String[] values4 = { ".x11 ","x21 ","x21 ","x21 "};
+// List<String> arraylist4 = new ArrayList<>(Arrays.asList(values4));
+// String[] values5 = { ".x11 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 "};
+// List<String> arraylist5 = new ArrayList<>(Arrays.asList(values5));
+
+
+ JSONObject jsonObject = new JSONObject();
+ // System.out.println(arraylist6);
+ JSONArray jsonArray = new JSONArray();
+ jsonArray.put(arraylist);
+ jsonArray.put(arraylist2);
+ jsonArray.put(arraylist3);
+ jsonArray.put(arraylist4);
+ jsonArray.put(arraylist5);
+ jsonObject.put("zuhe1", jsonArray);
+
+
+// WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
+// if (sendwServer != null) {
+// sendwServer.sendMessage(jsonObject.toString());
+// }
+
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("InteractionState");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ webserver.sendMessage(jsonObject.toString());
+
+
+ }
+ }
+ }
+ }
+}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
index 85d5d78..766cc49 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
@@ -174,7 +174,7 @@
if (!containsOne) {
//鍒ゆ柇id鏄惁鍖呭惈鏁板瓧
if (id.matches(".*\\d.*")) {
- //鍒ゆ柇娓呮id鏄惁true
+ //鍒ゆ柇娓呴櫎id鏄惁true
if (value) {
System.out.println(id);
switch (i) {
@@ -194,7 +194,7 @@
}
}
- }
+
// 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
if (!sValue.isEmpty()) {
@@ -202,6 +202,7 @@
S7control.getinstance().WriteBit(addressList0, sValue);
System.out.println("Values " + sValue + " written to PLC at address " + addressList0);
}
+ }
}
}
} catch (Exception e) {
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2Review.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2Review.java
deleted file mode 100644
index fed001a..0000000
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2Review.java
+++ /dev/null
@@ -1,347 +0,0 @@
-package com.example.springboot.component;
-
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
-import com.example.springboot.service.StorageCageService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import com.example.springboot.entity.device.PlcParameterObject;
-import com.example.springboot.entity.device.PlcParameterInfo;
-import org.springframework.core.io.ResourceLoader;
-
-
-public class PlcParameter2Review extends Thread {
-
- @Autowired
-
- StorageCageService storageCageService;
- private ResourceLoader resourceLoader;
- private volatile static PlcParameter2Review instance = null;
-
- private PlcParameter2Review() {
- init();
- }
-
- // 鍗曚緥妯″紡 绾跨▼瀹夊叏
- public static PlcParameter2Review getInstance() {
- if (instance == null) {
- synchronized (PlcParameter1Review.class) {
- if (instance == null) {
- instance = new PlcParameter2Review();
- }
- }
- }
- return instance;
- }
-
- PlcParameterObject plcParameterObject = new PlcParameterObject();//璇B鍖烘暟鎹疄渚�
-
- private void init() {
- try {
- String jsonfilename = PlcParameter1Review.class.getResource("/JsonFile/PlcParameter.json").getFile();
- FileReader fileReader = new FileReader(jsonfilename);
- BufferedReader bufferedReader = new BufferedReader(fileReader);
-
- StringBuilder content = new StringBuilder();
- String line;
-
- while ((line = bufferedReader.readLine()) != null) {
- content.append(line);
- }
-
- bufferedReader.close();
- fileReader.close();
-
- JSONObject jsonfileobj = new JSONObject(content.toString());
- JSONArray jsonArray = jsonfileobj.getJSONArray("parameteInfor");
- plcParameterObject.setPlcAddressBegin(jsonfileobj.getStr("plcAddressBegin"));//璁剧疆璧峰浣嶅湴鍧�
- plcParameterObject.setPlcAddressLength(Integer.valueOf(jsonfileobj.getStr("plcAddressLenght")));//璁剧疆鍦板潃闀垮害
-
-
- for (int i = 0; i < jsonArray.size(); i++) {
- JSONObject parameterObj = jsonArray.getJSONObject(i);
-
- PlcParameterInfo plcParameterInfo = new PlcParameterInfo(jsonfileobj.getStr("plcAddressBegin")); //鍙傛暟瀹炰緥
- String codeid = parameterObj.getStr("codeId");
- plcParameterInfo.setCodeId(codeid);
- plcParameterInfo.setAddressIndex(Integer.valueOf(parameterObj.getStr("addressIndex")));
- plcParameterInfo.setRatio(Integer.valueOf(parameterObj.getStr("ratio")));
- plcParameterInfo.setAddressLength(Integer.valueOf(parameterObj.getStr("addressLenght")));
- plcParameterInfo.setUnit(parameterObj.getStr("unit"));
- plcParameterObject.addPlcParameter(plcParameterInfo);
- }
- System.out.println("");
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- }
- @Override
- public void run() {
- while (this != null) {
- try {
- Thread.sleep(1000);
-
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
-
- byte[] getplcvlues = S7control.getinstance().ReadByte(plcParameterObject.getPlcAddressBegin(), plcParameterObject.getPlcAddressLength());
- plcParameterObject.setPlcParameterList(getplcvlues);
- int index = plcParameterObject.getPlcParameter("conveyorVelocity(AutoFAST)").getAddressIndex();
- S7control.getinstance().WriteWord(plcParameterObject.getPlcParameter("conveyorVelocity(AutoFAST)").getAddress(index), (short) 100);
-
- List<String> addresses = new ArrayList<>();
- addresses.add("conveyorVelocity(AutoFAST)");
- addresses.add("conveyorVelocity(AutoSLOW)");
- addresses.add("conveyorVelocity(Manual)");
- addresses.add("A01A02TURNJOGVelocity");
- addresses.add("A01A02TRAVELJOGVelocity");
- // id
-// List<String> addressList1 = Arrays.asList(config.getProperty("Parameter2.id").split(","));
-// List<String> paramlist = S7control.getinstance().readStrings(addressList1);
-// // System.out.println(paramlist);
-// //鎵嬪姩鐘舵��
-// List<String> addresses = Arrays.asList(config.getProperty("Parameter2.state").split(","));
-// List<Short> data = S7control.getinstance().readWords(addresses);
-// //娓呴櫎id
-// List<String> addressList0 = Arrays.asList(config.getProperty("Parameter2.cleanid").split(","));
-// // 鎵爜鏋�
-// List<Boolean> data2 = S7control.getinstance().readBits(addressList0);
-// List<String> addressList3 = Arrays.asList(config.getProperty("Parameter2.scanner").split(","));
-//
-////鎬ュ仠鎸夐挳
-// List<String> niuanaddressList3 = Arrays.asList(config.getProperty("Parameter2.stop").split(","));
-// List<String> timeout = Arrays.asList(config.getProperty("Parameter2.timeout").split(","));
-// String timeout2 = config.getProperty("Parameter2.timeout");
-//
-// Long readtimeout = S7control.getinstance().readtime(timeout2);
-// List<Boolean> anniuread = S7control.getinstance().readBits(niuanaddressList3);
-// List<String> data3 = S7control.getinstance().readStrings(addressList3);
-//// A01 A02 B01 B02
-// List<String> addresses4 = Arrays.asList(config.getProperty("Parameter2.Currentcell").split(","));
-// List<Short> data4 = S7control.getinstance().readWords(addresses4);
- //System.out.println(data);
-
-
-
- //
-
-
-//
-// String[] values6 = { ".x1 ","x2 ","x3",";;x4","x5","x6","x7","x8","x9","x10","x11"};
-// List<String> paramlist = new ArrayList<>(Arrays.asList(values6));
-// Short[] values1 = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1};
-// List<Short> data = new ArrayList<>(Arrays.asList(values1));
-// Boolean[] value4 = { false, false, false, false, false, false, false, false, false,
-// false};
-// List<Boolean> data2 = new ArrayList<>(Arrays.asList(value4));
-// String[] values3 = { ".x11 ","x21 "};
-// List<String> data3 = new ArrayList<>(Arrays.asList(values3));
-// Short[] values4 = { 2,2,3,4};
-// List<Short> data4 = new ArrayList<>(Arrays.asList(values4));
-//
-//
-// JSONObject jsonObject = new JSONObject();
-// short[] params = new short[data2.size()];
-// for (int i = 0; i < data2.size(); i++) {
-// boolean value = data2.get(i);
-// params[i] = value ? (short) 1 : (short) 0;
-// }
-////
-// short[] anniuparams = new short[anniuread.size()];
-// for (int i = 0; i < anniuread.size(); i++) {
-// boolean value = anniuread.get(i);
-// anniuparams[i] = value ? (short) 1 : (short) 0;
-// }
- //boolean杞负0 1
-// short[] params = customS7Control.convertBooleanListToShortArray(data2);
-// short[] anniuparams = customS7Control.convertBooleanListToShortArray(anniuread);
-// JSONObject jsonObject = new JSONObject();
-// jsonObject.append("params", params);
-// jsonObject.append("params", paramlist);
-// jsonObject.append("params", data);
-// jsonObject.append("params", data3);
-// jsonObject.append("params", data4);
-// jsonObject.append("jiting", anniuparams);
-// jsonObject.append("timeout", readtimeout);
-
-
-// WebSocketServer sendwServer = WebSocketServer.getWebSocketServer("Parameter2");
-// if (sendwServer != null) {
-// JSONObject jsonObject = new JSONObject();
-// jsonObject.set("message", "Hello, Parameter2!");
-// sendwServer.sendMessage(jsonObject.toString());
-// }
-// HomeController controller = new HomeController();
-// ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Parameter2");
-// if (sendwServer != null) {
-// for (WebSocketServer webserver : sendwServer) {
-//
-// webserver.sendMessage(jsonObject.toString());
-//
-//
-// if (webserver != null) {
-//
-// List<String> messages = webserver.getMessages();
-//
-// if (!messages.isEmpty()) {
-// // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
-// String lastMessage = messages.get(messages.size() - 1);
-//// System.out.println("lastMessage锛�" + lastMessage);
-// JSONArray messageArray = new JSONArray(lastMessage);
-// //娓呴櫎ID
-// // customS7Control.writeBitToPLC(messageArray, addressList0, 0);
-//
-//
-// try {
-// // 妫�鏌ョ储寮曟槸鍚︽湁鏁�
-// if (messageArray.getJSONArray(0).size() > 0) {
-// // 鑾峰彇娑堟伅鏁扮粍
-// JSONArray jsonArray = messageArray.getJSONArray(0);
-// // 鍒涘缓涓�涓竷灏斿�煎垪琛�
-// List<Boolean> sValue = new ArrayList<>();
-// // 閬嶅巻娑堟伅鏁扮粍
-// for (int i = 0; i < jsonArray.size(); i++) {
-// // 鑾峰彇娑堟伅鏁扮粍涓殑鍊�
-// Object value = jsonArray.get(i);
-// // 妫�鏌ュ�兼槸鍚︽湁鏁�
-// if (value != null && !value.toString().equals("null")) {
-// try {
-// // 绉婚櫎闈炴暟瀛楀拰鏁板瓧瀛楃
-// String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
-// // 瑙ｆ瀽涓哄竷灏斿��
-// boolean val = "1".equals(cleanedValue.trim());
-// // 灏嗗竷灏斿�兼坊鍔犲埌甯冨皵鍊煎垪琛ㄤ腑
-// sValue.add(val);
-// System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
-//
-//
-// } catch (NumberFormatException e) {
-// // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
-// System.err.println("Could not parse value: " + value);
-// }
-// }
-// }
-////瀹屾垚鍑虹墖
-// boolean containsOne = data.stream().anyMatch(number -> number == 1);
-// for (int i = 1; i <= 5; i++) {
-// boolean value = sValue.get(i);
-// String id = paramlist.get(i);
-// //鍒ゆ柇鏄惁鑷姩鐘舵��
-// if (!containsOne) {
-// //鍒ゆ柇id鏄惁鍖呭惈鏁板瓧
-// if (id.matches(".*\\d.*")) {
-// //鍒ゆ柇娓呮id鏄惁true
-// if (value) {
-// System.out.println(id);
-// switch (i) {
-// case 1:
-// storageCageService.UpdateTask(2, 0, paramlist.get(i));
-// break;
-// case 2:
-// case 3:
-// case 4:
-// case 5:
-// storageCageService.UpdateTask(3, 0, paramlist.get(i));
-// break;
-// default:
-// // 澶勭悊绱㈠紩鍊间笉鍦ㄨ寖鍥村唴鐨勬儏鍐�
-// break;
-// }
-// }
-// }
-//
-// }
-// // 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
-// if (!sValue.isEmpty()) {
-//
-// // 璋冪敤 S7control.getinstance().WriteBit 鏂规硶灏嗗竷灏斿�煎垪琛ㄥ啓鍏ュ湴鍧�鍒楄〃
-// S7control.getinstance().WriteBit(addressList0, sValue);
-// System.out.println("Values " + sValue + " written to PLC at address " + addressList0);
-// }
-// }
-// }
-// } catch (Exception e) {
-// System.err.println("An error occurred while writing bit to PLC: " + e.getMessage());
-// }
-//
-//
-// //鎬ュ仠
-//// customS7Control.writeBitToPLC(messageArray, niuanaddressList3, 1);
-//
-// try {
-// // 妫�鏌ョ储寮曟槸鍚︽湁鏁�
-// if (messageArray.getJSONArray(1).size() > 0) {
-// // 鑾峰彇娑堟伅鏁扮粍
-// JSONArray jsonArray = messageArray.getJSONArray(1);
-// // 鍒涘缓涓�涓竷灏斿�煎垪琛�
-// List<Boolean> sValue = new ArrayList<>();
-// // 閬嶅巻娑堟伅鏁扮粍
-// for (int i = 0; i < jsonArray.size(); i++) {
-// // 鑾峰彇娑堟伅鏁扮粍涓殑鍊�
-// Object value = jsonArray.get(i);
-// // 妫�鏌ュ�兼槸鍚︽湁鏁�
-// if (value != null && !value.toString().equals("null")) {
-// try {
-// // 绉婚櫎闈炴暟瀛楀拰鏁板瓧瀛楃
-// String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
-// // 瑙ｆ瀽涓哄竷灏斿��
-// boolean val = "1".equals(cleanedValue.trim());
-// // 灏嗗竷灏斿�兼坊鍔犲埌甯冨皵鍊煎垪琛ㄤ腑
-// sValue.add(val);
-// System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
-//
-//
-// } catch (NumberFormatException e) {
-// // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
-// System.err.println("Could not parse value: " + value);
-// }
-// }
-// }
-//// 缁堟杩涚墖浠诲姟
-// boolean Value1 = sValue.get(0);
-// boolean Value2 = sValue.get(1);
-//
-// if (Value1) {
-// storageCageService.EndTask(0);
-//
-// }
-// if (Value2) {
-// storageCageService.EndTask(1);
-//
-// }
-// // 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
-// if (!sValue.isEmpty()) {
-//
-// // 璋冪敤 S7control.getinstance().WriteBit 鏂规硶灏嗗竷灏斿�煎垪琛ㄥ啓鍏ュ湴鍧�鍒楄〃
-// S7control.getinstance().WriteBit(niuanaddressList3, sValue);
-// System.out.println("Values " + sValue + " written to PLC at address " + niuanaddressList3);
-// }
-// }
-// } catch (Exception e) {
-// System.err.println("An error occurred while writing bit to PLC: " + e.getMessage());
-// }
-//
-//
-// //瀛樼墖绛夊緟寤惰繜
-// customS7Control.Writetime(messageArray, timeout2, 2);
-//
-//
-// // 娓呯┖娑堟伅鍒楄〃
-// webserver.clearMessages();
-// }
-// }
-// }
-// }
- }
- }
-}
-
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
index 4de113f..2d0c98d 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
@@ -28,7 +28,7 @@
FileInputStream fileInputStream;
try {
// 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
- fileInputStream = new FileInputStream("D:/code/canadames/Alarm.json");
+ fileInputStream = new FileInputStream("D:/canadames/Alarm.json");
// 璇诲彇 fileInputStream 涓瓧鑺傚苟灏嗗叾瑙ｇ爜涓哄瓧绗�
InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
// 鎻愰珮璇诲彇鏁堢巼锛屽湪 BufferedReader 鍐呭寘瑁� InputStreamReader
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
index e0a5353..ce4f674 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
@@ -289,6 +289,41 @@
}
+
+
+
+ public List<String> readStringsandword(List<String> addressList) {
+ if (s7PLC == null) {
+ return null;
+ }
+ List<String> result = new ArrayList<>();
+ for (String address : addressList) {
+ try {
+ if (address.contains("-")) {
+ address = address.substring(0, address.indexOf("-"));
+
+ byte[] bytes = s7PLC.readByte(address, 14);
+ if (bytes != null) {
+ String str = new String(bytes, StandardCharsets.UTF_8);
+ result.add(str);
+ }
+
+ } else {
+ Short value = s7PLC.readInt16(address);
+ result.add(value.toString());
+
+ }
+ } catch (Exception e) {
+ System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
+ result.add(null);
+ }
+ }
+
+ return result;
+ }
+
+
+
//涓嶈繛缁湴鍧�鍐欏叆Word
public void WriteWord(List<String> address, List<Short> datas) {
if (s7PLC == null)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index d64b920..f913657 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -17,7 +17,7 @@
//
System.out.println("鍚姩瀹屾垚");
- new PlcHold().start();
+ // new PlcHold().start();
new Plchome().start();
@@ -37,5 +37,9 @@
new PlcServoManualone().start();
new PLCManualJog().start();
new Plclog().start();
+
+ new PlcInteractionState().start();
+
+ // new PLCAutomaticParameterSettingReview().start();
}
}
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterInfo.java b/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterInfo.java
index ff39eba..1faf7c9 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterInfo.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterInfo.java
@@ -108,5 +108,10 @@
} else
return null;
return stringdatas[0]+"."+dbwindex+bitindex;
- }
- }
\ No newline at end of file
+ }
+
+ public int getPlcAddress() {
+
+ return addressIndex;
+ }
+}
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterObject.java b/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterObject.java
index 163c45e..56a0230 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterObject.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterObject.java
@@ -64,6 +64,8 @@
return null;
}
+
+
/**
* 鏍规嵁鍙傛暟鏍囪瘑 鑾峰彇鏌愪釜鍙傛暟瀹炰緥
*
@@ -80,6 +82,24 @@
}
return arrayList;
}
+
+
+ public List<String> getPlcAddressList(String codeid) {
+ List<String> addressList = new ArrayList<>();
+ if (plcParameterList != null) {
+ for (PlcParameterInfo plcParameterInfo : plcParameterList) {
+ if (plcParameterInfo.getCodeId().equals(codeid)) {
+ int plcAddress = plcParameterInfo.getPlcAddress();
+ if (!addressList.contains(plcAddress)) {
+ addressList.add(String.valueOf(plcAddress));
+ }
+ }
+ }
+ }
+ return addressList;
+ }
+
+
/**
* 娣诲姞鍙傛暟瀹炰緥
diff --git a/springboot-vue3/src/main/resources/JsonFile/PlcParameter.json b/springboot-vue3/src/main/resources/JsonFile/PlcParameter.json
index a64126e..8f15f47 100644
--- a/springboot-vue3/src/main/resources/JsonFile/PlcParameter.json
+++ b/springboot-vue3/src/main/resources/JsonFile/PlcParameter.json
@@ -340,47 +340,271 @@
"unit":"mm"
},
{
- "codeId": "A0243#gridaddress",
+ "codeId": "B0185#gridaddress",
"addressIndex":"96",
"addressLenght":"2",
"ratio":"1",
"unit":"mm"
},
{
- "codeId": "A0243#gridaddress",
+ "codeId": "B02106#gridaddress",
"addressIndex":"98",
"addressLenght":"2",
"ratio":"1",
"unit":"mm"
},
{
- "codeId": "A0243#gridaddress",
+ "codeId": "B02127#gridaddress",
"addressIndex":"100",
"addressLenght":"2",
"ratio":"1",
"unit":"mm"
},
{
- "codeId": "A0243#gridaddress",
+ "codeId": "B02148#gridaddress",
"addressIndex":"102",
"addressLenght":"2",
"ratio":"1",
"unit":"mm"
},
{
- "codeId": "A0243#gridaddress",
+ "codeId": "B02169#gridaddress",
"addressIndex":"104",
"addressLenght":"2",
"ratio":"1",
"unit":"mm"
},
{
- "codeId": "A0243#gridaddress",
+ "codeId": "B02190#gridaddress",
"addressIndex":"106",
"addressLenght":"2",
"ratio":"1",
"unit":"mm"
+ },
+ {
+ "codeId": "A01Targetgrid(Manual)",
+ "addressIndex":"108",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": " A02Targetgrid(Manual)",
+ "addressIndex":"110",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "B01Targetgrid(Manual)",
+ "addressIndex":"112",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "B02Targetgrid(Manual)",
+ "addressIndex":"114",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "A01turnTargetAngle(Manual)",
+ "addressIndex":"116",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"掳"
+ },
+ {
+ "codeId": "A02turnTargetAngle(Manual)",
+ "addressIndex":"118",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"掳"
+ },
+ {
+ "codeId": "A01turnAngle1",
+ "addressIndex":"120",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"掳"
+ },
+ {
+ "codeId": "A01turnAngle2",
+ "addressIndex":"122",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"掳"
+ },
+ {
+ "codeId": "A01turnAngle3",
+ "addressIndex":"124",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"掳"
+ },
+ {
+ "codeId": "A01turnAngle4",
+ "addressIndex":"126",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"掳"
+ },
+ {
+ "codeId": "A02turnAngle1",
+ "addressIndex":"128",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"掳"
+ },
+ {
+ "codeId": "A02turnAngle2",
+ "addressIndex":"130",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"掳"
+ },
+ {
+ "codeId": "A02turnAngle3",
+ "addressIndex":"132",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"掳"
+ },
+ {
+ "codeId": "A02turnAngle4",
+ "addressIndex":"134",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"掳"
+ },
+ {
+ "codeId": "Minimumglasslength",
+ "addressIndex":"136",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "Minimumglassheight",
+ "addressIndex":"138",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "Maximumglasslength",
+ "addressIndex":"140",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "Maximumglassheight",
+ "addressIndex":"142",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "A01cellsGlassNum",
+ "addressIndex":"144",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "A02cellsGlassNum",
+ "addressIndex":"146",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "A01ID",
+ "addressIndex":"148",
+ "addressLenght":"14",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "A02ID",
+ "addressIndex":"162",
+ "addressLenght":"14",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "A02TRAVELPOSVelocitymanual",
+ "addressIndex":"176",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "B02TRAVELPOSVelocitymanual",
+ "addressIndex":"178",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "Startingpositionofthefeedca",
+ "addressIndex":"180",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "Targetpositionofthefeedcar",
+ "addressIndex":"182",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "Lengthofincomingglass",
+ "addressIndex":"184",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "Widthofincomingglass",
+ "addressIndex":"186",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ },
+ {
+ "codeId": "Startingpositionoftheexitcar",
+ "addressIndex":"188",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ }, {
+ "codeId": "Exitcartargetposition",
+ "addressIndex":"190",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ }
+ , {
+ "codeId": "A02TURNPOSVelocitymanual",
+ "addressIndex":"192",
+ "addressLenght":"2",
+ "ratio":"1"
+
+ }
+ , {
+ "codeId": "A01delayTime",
+ "addressIndex":"194",
+ "addressLenght":"2",
+ "ratio":"1"
+
}
- ]
+
+ ]
}
diff --git a/springboot-vue3/src/main/resources/config.properties b/springboot-vue3/src/main/resources/config.properties
index d84493a..1c82dd2 100644
--- a/springboot-vue3/src/main/resources/config.properties
+++ b/springboot-vue3/src/main/resources/config.properties
@@ -100,7 +100,7 @@
#鎵爜鏋�
Parameter2.scanner=DB103.256,DB103.270
#鎬ュ仠
-Parameter2.stop=DB101.10.4,DB101.11.2,DB101.DBX11.3
+Parameter2.stop=DB101.10.4,DB101.11.2,DB101.11.3
Parameter2.timeout=DB100.194
#褰撳墠鏍煎瓙
@@ -207,4 +207,42 @@
+#----------------------------PlcInteractionState
+#杩涚墖
+PlcInteractionState.MESImporttask=DB105.0,DB105.2,DB105.4,DB105.6,DB105.8,DB105.20-33
+
+PlcInteractionState.PLCImporttask=DB106.8,DB106.4,DB106.6,DB106.24,DB106.26-39,DB103.40-57,DB103.58-71
+#鍑虹墖浠诲姟
+PlcInteractionState.MESProductiontask=DB105.10,DB105.12,DB105.14,DB105.16,DB105.18,DB105.34-47
+
+PlcInteractionState.PLCProductiontask=DB106.20,DB106.16,DB106.18,DB103.156-169
+
+#浠诲姟淇℃伅
+PlcInteractionState.MEStaskinformation=DB105.48,DB105.50,DB106.42,DB106.48,DB106.50,DB106.58,DB103.128-141,DB103.142-155,DB103.156-169,DB103.184-197,DB103.212-225
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--
Gitblit v1.8.0