From 9a0dd8244282d90b08b16d2c239683bbac62fab2 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 16 一月 2024 15:02:21 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/resources/config.properties | 40
CanadaMes-ui/src/views/Electrical/Positioning2.vue | 4
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java | 18
springboot-vue3/src/main/resources/JsonFile/PlcParameter.json | 610 +++++++
CanadaMes-ui/src/router/index.js | 6
springboot-vue3/src/main/java/com/example/springboot/component/PlcsignReview.java | 133 +
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 | 128 +
CanadaMes-ui/src/views/Electrical/InteractionState.vue | 313 +++
springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java | 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 | 12
CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue | 12
springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterObject.java | 169 +
springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java | 18
springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterInfo.java | 117 +
CanadaMes-ui/src/configuration/parameter2.json | 11
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1Review.java | 218 ++
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 | 55
CanadaMes-ui/src/views/Electrical/Sign.vue | 33
.vscode/settings.json | 3
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 4
springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcBitInfo.java | 74
CanadaMes-ui/src/views/Electrical/ManualonePosition.vue | 128 +
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 20
springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java | 2
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 38
springboot-vue3/.idea/uiDesigner.xml | 124 +
springboot-vue3/src/main/resources/JsonFile/PlcSign.json | 47
CanadaMes-ui/src/lang/locales/zh-CN.json | 68
springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcBitObject.java | 113 +
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 28
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/lang/locales/en-US.json | 3
CanadaMes-ui/src/views/Electrical/ManualJog.vue | 22
CanadaMes-ui/src/views/Electrical/ServoManualone.vue | 35
CanadaMes-ui/src/configuration/Sign.json | 886 ++++++++--
44 files changed, 4,681 insertions(+), 389 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index a760fd6..dcafc04 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,5 @@
{
"java.configuration.updateBuildConfiguration": "interactive",
- "java.debug.settings.onBuildFailureProceed": true
+ "java.debug.settings.onBuildFailureProceed": true,
+ "java.compile.nullAnalysis.mode": "automatic"
}
\ No newline at end of file
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 3401be1..f6857fd 100644
--- a/CanadaMes-ui/src/configuration/Sign.json
+++ b/CanadaMes-ui/src/configuration/Sign.json
@@ -5,442 +5,948 @@
"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"
- },
- {
- "name": "B01.SR out dec",
- "value": "1",
- "state": "1",
- "type": "1",
- "page": "1"
- },
- {
- "name": "B01.SR out 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",
+ "unit":"I11.7"
+ },
+ {
+ "name": "B01.SR out in pos",
+ "value": "1",
+ "state": "1",
+ "type": "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"
- },
- {
- "name": "B01.SR out safety",
- "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": "B02.SR out safety",
+ "name": "B01.SR out safety",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
- },
- {
- "name": "SB.start(+)",
- "value": "1",
- "state": "1",
- "type": "1",
- "page": "1"
- },
- {
- "name": "SB.stop(1)",
- "value": "1",
- "state": "1",
- "type": "1",
- "page": "1"
- },
- {
- "name": "SB.reset",
- "value": "1",
- "state": "1",
- "type": "1",
- "page": "1"
- },
- {
- "name": "SB.auto/manul",
- "value": "1",
- "state": "1",
- "type": "1",
- "page": "1"
- },
- {
- "name": "SB.pause",
- "value": "1",
- "state": "1",
- "type": "1",
- "page": "1"
- },
- {
- "name": "SB.emg",
- "value": "1",
- "state": "1",
- "type": "1",
- "page": "1"
- },
- {
- "name": "D01.SB.start",
- "value": "1",
- "state": "1",
- "type": "1",
- "page": "1"
- },
- {
- "name": "D06.SB.start",
- "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": "SAFETYDOOR.requset",
+ "name": "SB.start(+)",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I126.0"
},
{
- "name": "SAFETYDOOR.confirm",
+ "name": "SB.stop(1)",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"I126.1"
},
{
- "name": "SAFETYDOOR.reset",
+ "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",
+ "unit":"I126.3"
+ },
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I126.4"
+ },
+ {
+ "name": "SB.emg",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I126.5"
+ },
+ {
+ "name": "D01.SB.start",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I126.6"
+ },
+ {
+ "name": "D06.SB.start",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I126.7"
+ },
+ {
+ "name": "B02.SR out safety",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I127.0"
+ },
+ {
+ "name": "SafetyDoor.requset",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I127.1"
+ },
+ {
+ "name": "SafetyDoor.confirm",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I127.2"
+ },
+ {
+ "name": "SafetyDoor.reset",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I127.3"
+ },
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I127.4"
+ },
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I127.5"
+ },
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I127.6"
+ },
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I127.7"
+ },
+ {
+ "name": "A01.SR left dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I128.0"
+ },
+ {
+ "name": "A01.SR left in pos",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I128.1"
+ },
+ {
+ "name": "A01.SR left safety",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I128.2"
+ },
+ {
+ "name": "A01.SR right dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I128.3"
+ },
+ {
+ "name": "A01.SR right in pos",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I128.4"
+ },
+ {
+ "name": "A01.SR right safety",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I128.5"
+ },
+ {
+ "name": "A01.SR turn home",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I128.6"
+ },
+ {
+ "name": "A01.SR turn up",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I128.7"
+ },
+ {
+ "name": "A01.SR turn down",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I129.0"
+ },
+ {
+ "name": "A01.SR travel home",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I129.1"
+ },
+ {
+ "name": "A01.SR travel left dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I129.2"
+ },
+ {
+ "name": "A01.SR travel left limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I129.3"
+ },
+ {
+ "name": "A01.SR travel right dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I129.4"
+ },
+ {
+ "name": "A01.SR travel right limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I129.5"
+ },
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I129.6"
+ },
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I129.7"
+ }
+ ,
+ {
+ "name": "A02.SR left dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I130.0"
+ }
+ ,
+ {
+ "name": "A02.SR left in pos",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I130.1"
+ }
+ ,
+ {
+ "name": "A02.SR left safety",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I130.2"
+ }
+ ,
+ {
+ "name": "A02.SR right dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I130.3"
+ }
+ ,
+ {
+ "name": "A02.SR right in pos",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I130.4"
+ }
+ ,
+ {
+ "name": "A02.SR right safety",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I130.5"
+ }
+ ,
+ {
+ "name": "A02.SR turn home",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I130.6"
+ }
+ ,
+ {
+ "name": "A02.SR turn up",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I130.7"
+ }
+ ,
+ {
+ "name": "A02.SR turn down",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I131.0"
+ }
+ ,
+ {
+ "name": "A02.SR travel home",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I131.1"
+ }
+ ,
+ {
+ "name": "A02.SR travel left dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I131.2"
+ }
+ ,
+ {
+ "name": "A02.SR travel left limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I131.3"
+ }
+ ,
+ {
+ "name": "A02.SR travel right dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I131.4"
+ }
+ ,
+ {
+ "name": "A02.SR travel right limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I131.5"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I131.6"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I131.7"
+ }
+ ,
+ {
+ "name": "B01.SR origin",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I132.0"
+ }
+ ,
+ {
+ "name": "B01.SR left limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I132.1"
+ }
+ ,
+ {
+ "name": "B01.SR right limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I132.2"
+ }
+ ,
+ {
+ "name": "B02.SR origin",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I132.3"
+ }
+ ,
+ {
+ "name": "B02.SR left limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I132.4"
+ }
+ ,
+ {
+ "name": "B02.SR right limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I132.5"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I132.6"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"I132.7"
+ }
+ ,
{
"name": "LED.red",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
- },
+ "page": "1",
+ "unit":"Q4.0"
+ }
+ ,
{
"name": "LED.green",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
- },
+ "page": "1",
+ "unit":"Q4.1"
+ }
+ ,
{
"name": "LED.yellow",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
- },
+ "page": "1",
+ "unit":"Q4.2"
+ }
+ ,
{
"name": "D01.LED.green",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
- },
+ "page": "1",
+ "unit":"Q4.3"
+ }
+ ,
{
"name": "D06.LED.green",
"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"
+ }
+ ,
{
"name": "B01.YV.up down",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
- },
+ "page": "1",
+ "unit":"Q4.6"
+ }
+ ,
{
"name": "B01.YV.gassing",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
- },
+ "page": "1",
+ "unit":"Q4.7"
+ }
+ ,
{
"name": "B02.YV.turn",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
- },
+ "page": "1",
+ "unit":"Q5.0"
+ }
+ ,
{
"name": "B02.YV.up down",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
- },
+ "page": "1",
+ "unit":"Q5.1"
+ }
+ ,
{
"name": "B02.YV.gassing",
"value": "1",
"state": "1",
"type": "1",
- "page": "1"
- },
- {
- "name": "SAFETYDOOR.led",
- "value": "1",
- "state": "1",
- "type": "1",
- "page": "1"
- },
- {
- "name": "SAFETYDOOR.open",
- "value": "1",
- "state": "1",
- "type": "1",
- "page": "1"
- },
- {
- "name": "B01.SR origin",
- "value": "1",
- "state": "1",
- "type": "1",
- "page": "1"
- },
- {
- "name": "B01.SR left limit",
- "value": "1",
- "state": "1",
- "type": "1",
- "page": "1"
- },
- {
- "name": "B01.SR right limit",
- "value": "1",
- "state": "1",
- "type": "1",
- "page": "1"
- },
- {
- "name": "B02.SR origin",
- "value": "1",
- "state": "1",
- "type": "1",
- "page": "1"
- },
- {
- "name": "B02.SR left limit",
- "value": "1",
- "state": "1",
- "type": "1",
- "page": "1"
- },
- {
- "name": "B02.SR right limit",
- "value": "1",
- "state": "1",
- "type": "1",
- "page": "1"
+ "page": "1",
+ "unit":"Q5.2"
}
+ ,
+ {
+ "name": "SafetyDoor.Led",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"Q5.3"
+ }
+ ,
+ {
+ "name": "SafetyDoor.open",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"Q5.4"
+ }
+ ,
+ {
+ "name": "D01 SB.confirm",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"Q5.5"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"Q5.6"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"Q5.7"
+ }
+ ,
+ {
+ "name": "A01 oilPump",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"Q126.0"
+ }
+ ,
+ {
+ "name": "A01 motorCtr",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"Q126.1"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"Q126.2"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"Q126.3"
+ }
+ ,
+ {
+ "name": "A02 oilPump",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"Q127.0"
+ }
+ ,
+ {
+ "name": "A02 motorCtr",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"Q127.1"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"Q127.2"
+ },
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1",
+ "unit":"Q127.3"
+ }
+
+
],
"address": [
{
diff --git a/CanadaMes-ui/src/configuration/parameter2.json b/CanadaMes-ui/src/configuration/parameter2.json
index b181b8c..79f5ef3 100644
--- a/CanadaMes-ui/src/configuration/parameter2.json
+++ b/CanadaMes-ui/src/configuration/parameter2.json
@@ -395,6 +395,15 @@
}
- ]
+ ],
+ [
+ {
+ "button": {
+ "name": "杞�ュ仠",
+ "value":0,
+ "address":"DB10.0",
+ "type":"66"
+ }
+ }]
]
\ No newline at end of file
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 7bddf2b..c19f5e7 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -405,7 +405,8 @@
"鎬ュ仠鍚庝腑姝�/缁х画閫夋嫨": "Abort/ResumeTasks",
"A01缁堟/缁х画": "A01Abort/ResumeTasks",
"A02缁堟/缁х画": "A02Abort/ResumeTasks",
- "瀛樼墖绛夊緟寤舵椂": "Storage wait delay"
+ "瀛樼墖绛夊緟寤舵椂": "Storage wait delay",
+ "杞�ュ仠": "emgHMI"
},
"langPositioning1": {
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index fe11bd6..b86982f 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": "璁惧鐘舵��",
@@ -394,10 +394,10 @@
"D05.SR in pos": "D05.鍒颁綅浼犳劅鍣�",
"D06.SR dec": "D06.鍑忛�熶紶鎰熷櫒",
"D06.SR in pos": "D06.鍒颁綅浼犳劅鍣�",
- "B01.SR out dec": "B01.鍑虹墖鍑忛�熶紶鎰熷櫒",
- "B01.SR out in pos": "B01.鍑虹墖鍒颁綅浼犳劅鍣�",
"B01.SR in dec": "B01.杩涚墖鍑忛�熶紶鎰熷櫒",
"B01.SR in in pos": "B01.杩涚墖鍒颁綅浼犳劅鍣�",
+ "B01.SR out dec": "B01.鍑虹墖鍑忛�熶紶鎰熷櫒",
+ "B01.SR out in pos": "B01.鍑虹墖鍒颁綅浼犳劅鍣�",
"B01.SR turn on": "B01.缈昏浆涓婂埌浣嶄紶鎰熷櫒",
"B01.SR turn off": "B01.缈昏浆涓嬪埌浣嶄紶鎰熷櫒",
"B01.SR up": "B01.涓婂崌鍒颁綅浼犳劅鍣�",
@@ -410,21 +410,55 @@
"B02.SR turn off": "B02.缈昏浆涓嬪埌浣嶄紶鎰熷櫒",
"B02.SR up": "B02.涓婂崌鍒颁綅浼犳劅鍣�",
"B02.SR down": "B02.涓嬮檷鍒颁綅浼犳劅鍣�",
- "B01.SR out safety": "B01.鍑虹墖瀹夊叏浼犳劅鍣�",
"B01.SR in safety": "B01.杩涚墖瀹夊叏浼犳劅鍣�",
- "B02.SR out safety": "B02.鍑虹墖瀹夊叏浼犳劅鍣�",
+ "B01.SR out safety": "B01.鍑虹墖瀹夊叏浼犳劅鍣�",
+ "B02.SR in safety": "B02.杩涚墖瀹夊叏浼犳劅鍣�",
"SB.start(+)": "SB.鍚姩锛�+锛夋寜閽�",
"SB.stop(1)": "SB.鍋滄锛�-锛夋寜閽�",
"SB.reset": "SB.澶嶄綅鎸夐挳",
"SB.auto/manul": "SB.鎵�/鑷垏鎹㈡寜閽�",
- "SB.pause": "SB.鏆傚仠鎸夐挳",
+ "D01.SB.confirm": "鐜荤拑淇℃伅纭",
"SB.emg": "SB.鎬ュ仠鎸夐挳",
"D01.SB.start": "D01.鍚姩",
"D06.SB.start": "D06.鍚姩",
- "B02.SR in safety": "B02.杩涚墖瀹夊叏浼犳劅鍣�",
- "SAFETYDOOR.requset": "瀹夊叏闂ㄨ姹傝繘鍏�",
- "SAFETYDOOR.confirm": "瀹夊叏闂ㄧ‘璁�",
- "SAFETYDOOR.reset": "瀹夊叏闂ㄥ浣�",
+ "B02.SR out safety ": "B02.鍑虹墖瀹夊叏浼犳劅鍣�",
+ "SafetyDoor.requset": "瀹夊叏闂ㄨ姹傝繘鍏�",
+ "SafetyDoor.confirm": "瀹夊叏闂ㄧ‘璁�",
+ "SafetyDoor.reset": "瀹夊叏闂ㄥ浣�",
+ "A01.SR left dec":"A01宸﹂敭閫�",
+ "A01.SR left in pos":"A01宸﹀埌浣�",
+ "A01.SR left safety":"A01宸﹀畨鍏�",
+ "A01.SR right dec":"A01鍙抽敭閫�",
+ "A01.SR right in pos":"A01鍙冲埌浣�",
+ "A01.SR right safety":"A01鍙冲畨鍏�",
+ "A01.SR turn home":"A01缈昏浆鍘熺偣",
+ "A01.SR turn up":"A01缈昏浆涓婃瀬闄�",
+ "A01.SR turn down":"A01缈昏浆涓嬫瀬闄�",
+ "A01.SR travel home":"A01琛岃蛋鍘熺偣",
+ "A01.SR travel left dec":"A01琛岃蛋宸﹀噺閫�",
+ "A01.SR travel left limit":"A01琛岃蛋宸︽瀬闄�",
+ "A01.SR travel right dec":"A01琛岃蛋鍙冲噺閫�",
+ "A01.SR travel right limit":"A01琛岃蛋鍙虫瀬闄�",
+ "A02.SR left dec":"A02宸﹂敭閫�",
+ "A02.SR left in pos":"A02宸﹀埌浣�",
+ "A02.SR left safety":"A02宸﹀畨鍏�",
+ "A02.SR right dec":"A02鍙抽敭閫�",
+ "A02.SR right in pos":"A02鍙冲埌浣�",
+ "A02.SR right safety":"A02鍙冲畨鍏�",
+ "A02.SR turn home":"A02缈昏浆鍘熺偣",
+ "A02.SR turn up":"A02缈昏浆涓婃瀬闄�",
+ "A02.SR turn down":"A02缈昏浆涓嬫瀬闄�",
+ "A02.SR travel home":"A02琛岃蛋鍘熺偣",
+ "A02.SR travel left dec":"A02琛岃蛋宸﹀噺閫�",
+ "A02.SR travel left limit":"A02琛岃蛋宸︽瀬闄�",
+ "A02.SR travel right dec":"A02琛岃蛋鍙冲噺閫�",
+ "A02.SR travel right limit":"A02琛岃蛋鍙虫瀬闄�",
+ "B01.SR origin":"B01.鍘熺偣",
+ "B01.SR left limit":"B01.宸︽瀬闄�",
+ "B01.SR right limit":"B01.鍙虫瀬闄�",
+ "B02.SR origin":"B02.鍘熺偣",
+ "B02.SR left limit":"B02.宸︽瀬闄�",
+ "B02.SR right limit":"B02.鍙虫瀬闄�",
"LED.red": "涓夎壊鐏孩",
"LED.green": "涓夎壊鐏豢",
"LED.yellow": "涓夎壊鐏粍",
@@ -436,8 +470,15 @@
"B02.YV.turn": "B02.鐢电闃�缈昏浆",
"B02.YV.up down": "B02.鐢电闃�涓婂崌涓嬮檷",
"B02.YV.gassing": "B02.鐢电闃�鍚规皵",
- "SAFETYDOOR.led": "瀹夊叏闂ㄧ姸鎬佺伅",
- "SAFETYDOOR.open": "瀹夊叏闂ㄦ墦寮�"
+ "SafetyDoor.Led": "瀹夊叏闂ㄧ姸鎬佺伅",
+ "SafetyDoor.open": "瀹夊叏闂ㄦ墦寮�",
+ "D01 SB.confirm":"鐜荤拑淇℃伅纭鎸囩ず鐏�",
+ "A01 oilPump":"A01娉ㄦ补娉�",
+ "A01 motorCtr":"A01鐢垫満鎺у埗",
+ "A02 oilPump":"A02娉ㄦ补娉�",
+ "A02 motorCtr":"A02鐢垫満鎺у埗",
+ "space":"澶囩敤"
+
},
"Statelang": {
"D01.State": "D01.鐘舵��",
@@ -456,6 +497,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/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 c1831cb..053ff12 100644
--- a/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
+++ b/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
@@ -19,9 +19,9 @@
<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">{{
+ <!-- <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
$t('ManualJog')
- }}</router-link>
+ }}</router-link> -->
<router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{
$t('ManualonePosition')
@@ -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/ManualJog.vue b/CanadaMes-ui/src/views/Electrical/ManualJog.vue
index 9897ac8..e23ebb1 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualJog.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualJog.vue
@@ -1,22 +1,19 @@
<template>
<div class="app">
- <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
+ <!-- <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> -->
- <el-breadcrumb separator-class="el-icon-arrow-right" class="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">{{
@@ -30,24 +27,17 @@
<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>
- </el-breadcrumb>
+ </el-breadcrumb> -->
<el-row :gutter="40" >
<el-col :span="26" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
index 8d15a80..879c4c2 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
@@ -18,33 +18,34 @@
<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">{{
+ <!-- <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
$t('ManualJog')
- }}</router-link>
+ }}</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 v-if="hasPermission" to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">
+ {{ $t('Servomanualone') }}
+ </router-link>
+
- <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
+ <router-link v-if="hasPermission" 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">{{
+
+ <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>
@@ -93,6 +94,7 @@
<div class="container">
<component :is="embeddedComponent"></component>
+ <component :is="embeddedComponent2"></component>
</div>
<!-- <el-button @click="submitDataToBackend">鎻愪氦鏁版嵁鍒板悗绔�</el-button> -->
@@ -106,6 +108,10 @@
import data from '../../configuration/Manualoneposition'
import ManualonePosition2 from './ManualonePosition2.vue';
+import ManualJog from './ManualJog.vue';
+import {
+SelectPermissionByUserName, currentUsername
+} from "../../api/home";
// import { createWebSocket } from '../../api/websocket.js';
let socket;
export default {
@@ -116,6 +122,8 @@
jsonData: data,
language: this.$i18n.locale,
embeddedComponent: ManualonePosition2,
+ embeddedComponent2: ManualJog,
+ hasPermission: false // 榛樿娌℃湁鏉冮檺
// 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
}
@@ -129,7 +137,17 @@
this.replaceChineseWithEnglish();
}
this.$forceUpdate();
+ currentUsername().then(res => {
+ SelectPermissionByUserName(res.data).then(res => {
+ res.data.permission.forEach(item => {
+ if (item.permissionId == "36" && item.state == 1) {
+ this.hasPermission = true;
+ }
+
+ });
+ });
+ });
},
methods: {
@@ -191,6 +209,9 @@
console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
socket?.send(jsonString);
event.target.blur(); // 鍙栨秷杈撳叆妗嗙劍鐐�
+
+
+
},
A02start(event){
const data = [];
@@ -303,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);
}
@@ -323,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);
}
@@ -343,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);
}
@@ -363,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);
}
@@ -409,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);
}
@@ -433,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 5542c24..ddcf02d 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter2.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
@@ -48,13 +48,13 @@
active-class="blue-button"
>{{ $t("Automatic State") }}</router-link
>
- <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"
@@ -64,36 +64,25 @@
>{{ $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 v-if="hasPermission" to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">
+ {{ $t('Servomanualone') }}
+ </router-link>
+
+
+ <router-link v-if="hasPermission" to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
+ $t('Address parameter settings')
+ }}</router-link>
+
+ <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
- to="/Electrical/Positioning1"
+<router-link v-if="hasPermission"
+ to="/Electrical/InteractionState"
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
+ >{{ $t("InteractionState") }}</router-link
>
</el-breadcrumb>
@@ -140,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
>
@@ -162,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
>
@@ -209,6 +212,9 @@
<script>
import LanguageMixin from "../../lang/LanguageMixin";
import data from "../../configuration/parameter2";
+import {
+SelectPermissionByUserName, currentUsername
+} from "../../api/home";
// import { throttle } from 'lodash';
let socket;
@@ -226,6 +232,9 @@
jsonData: data,
inputValue: "",
language: this.$i18n.locale,
+
+
+ hasPermission: false // 榛樿娌℃湁鏉冮檺
// 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
};
@@ -240,6 +249,17 @@
this.replaceChineseWithEnglish();
}
this.$forceUpdate();
+ currentUsername().then(res => {
+ SelectPermissionByUserName(res.data).then(res => {
+ res.data.permission.forEach(item => {
+ if (item.permissionId == "36" && item.state == 1) {
+ this.hasPermission = true;
+ }
+
+ });
+ });
+
+ });
},
computed: {},
@@ -338,16 +358,27 @@
const jsonString2 = JSON.stringify(jsonObject2);
console.log("鎵�鏈塗ype涓�0鐨剉alue:", jsonString2);
socket?.send(jsonString2);
+
+ // 寤惰繜2绉掑彂閫佹寚瀹氬唴瀹�
+setTimeout(() => {
+ const jsonObject = { data: [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [], []] };
+ const jsonString = JSON.stringify(jsonObject);
+ console.log("鍙戦�佺殑鍐呭:", jsonString);
+ socket?.send(jsonString);
+}, 1000);
+
}
if (
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());
@@ -362,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
// )
@@ -432,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];
@@ -646,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 7b46cad..e777694 100644
--- a/CanadaMes-ui/src/views/Electrical/Positioning1.vue
+++ b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
@@ -48,13 +48,13 @@
active-class="blue-button"
>{{ $t("Automatic State") }}</router-link
>
- <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"
@@ -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/Positioning2.vue b/CanadaMes-ui/src/views/Electrical/Positioning2.vue
index 1212fc2..c8f65f9 100644
--- a/CanadaMes-ui/src/views/Electrical/Positioning2.vue
+++ b/CanadaMes-ui/src/views/Electrical/Positioning2.vue
@@ -19,9 +19,9 @@
<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">{{
+ <!-- <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
$t('ManualJog')
- }}</router-link>
+ }}</router-link> -->
<router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{
$t('ManualonePosition')
diff --git a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
index e2acb21..956ea14 100644
--- a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
+++ b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
@@ -43,13 +43,13 @@
active-class="blue-button"
>{{ $t("Automatic State") }}</router-link
>
- <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"
@@ -89,6 +89,14 @@
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>
@@ -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 cd03f42..a3fed75 100644
--- a/CanadaMes-ui/src/views/Electrical/Servomanual.vue
+++ b/CanadaMes-ui/src/views/Electrical/Servomanual.vue
@@ -20,33 +20,34 @@
<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">{{
+ <!-- <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
$t('ManualJog')
- }}</router-link>
+ }}</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 v-if="hasPermission" to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">
+ {{ $t('Servomanualone') }}
+ </router-link>
+
- <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
+ <router-link v-if="hasPermission" 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">{{
+
+ <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>
@@ -56,18 +57,36 @@
<script>
import LanguageMixin from '../../lang/LanguageMixin'
import data from '../../configuration/ServoManualone'
+import {
+SelectPermissionByUserName, currentUsername
+} from "../../api/home";
export default {
name: "Servomanual",
mixins: [LanguageMixin],
+
data () {
return {
- jsonData: data // 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
+ jsonData: data,
+
+ hasPermission: false // 榛樿娌℃湁鏉冮檺
}
},
created () {
// 閫氳繃璺敱璺宠浆鍒�/Electrical/Servomanualone椤甸潰
- this.$router.push('/Electrical/Servomanualone');
+ this.$router.push('/Electrical/Parameter2');
+
+ currentUsername().then(res => {
+ SelectPermissionByUserName(res.data).then(res => {
+ res.data.permission.forEach(item => {
+ if (item.permissionId == "36" && item.state == 1) {
+ this.hasPermission = true;
+ }
+
+ });
+ });
+
+ });
}
}
</script>
diff --git a/CanadaMes-ui/src/views/Electrical/Sign.vue b/CanadaMes-ui/src/views/Electrical/Sign.vue
index f5e3edd..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>
@@ -64,7 +69,13 @@
},
activated(){
this.init();
-
+ this.record.xyData = this.jsonData.sign;
+ const language = this.$i18n.locale;
+ if (language === 'zh-CN') {
+ this.replaceChineseWithEnglish();
+ } else {
+ this.localizedRoles = [...this.record.xyData];
+ }
},
methods: {
showdata () {
@@ -132,7 +143,7 @@
const language = this.$i18n.locale;
- if (language === 'en-US') {
+ if (language === 'zh-CN') {
this.replaceChineseWithEnglish();
} else {
this.localizedRoles = [...this.record.xyData];
@@ -157,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);
}
@@ -195,8 +206,8 @@
.kuai_sb {
text-align: center;
- width: 15%;
- margin-bottom: 15px;
+ width:18%;
+ margin-bottom: 5px;
}
.el-input {
@@ -209,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/PlcHold.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
index bfddeba..c2a8bac 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
@@ -29,7 +29,7 @@
// \\ TODO Auto-generated catch block
e.printStackTrace();
}
- if (S7control.getinstance().CheckConnected() == true) {
+ if (S7control.getinstance().CheckConnected() == false) {
spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
@@ -41,7 +41,7 @@
// // TODO Auto-generated catch block
// e.printStackTrace();
// }
- // spianService.selectAll("X12345610402GV");
+ spianService.selectAll("X21942610402GV");
// 鍑虹墖浠诲姟////////////////////////////////
List<Short> outlist = S7control.getinstance().ReadWord("DB106.20", 1); // 鍑虹墖杞︾姸鎬�
List<Short> outlist1 = S7control.getinstance().ReadWord("DB105.18", 1); // 鍑虹墖浠诲姟鏄惁鍚姩
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/PlcParameter1Review.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1Review.java
new file mode 100644
index 0000000..f3737e1
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1Review.java
@@ -0,0 +1,218 @@
+package com.example.springboot.component;
+
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import org.apache.commons.io.FileUtils;
+import org.apache.tomcat.jni.Lock;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReentrantLock;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
+
+import com.example.springboot.entity.device.PlcParameterObject;
+import com.example.springboot.entity.device.PlcParameterInfo;
+
+public class PlcParameter1Review extends Thread {
+
+ @Autowired
+ private ResourceLoader resourceLoader;
+ private volatile static PlcParameter1Review instance = null;
+
+ private PlcParameter1Review() {
+ init();
+ }
+
+ // 鍗曚緥妯″紡 绾跨▼瀹夊叏
+ public static PlcParameter1Review getInstance() {
+ if (instance == null) {
+ synchronized (PlcParameter1Review.class) {
+ if (instance == null) {
+ instance = new PlcParameter1Review();
+ }
+ }
+ }
+ 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();
+ }
+ 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");
+
+ plcParameterObject.getPlcParameterValues(addresses);
+
+ JSONObject jsonObject = new JSONObject();
+
+ jsonObject.append("params", plcParameterObject.getPlcParameterValues(addresses));
+ jsonObject.append("fanzhuan", plcParameterObject.getPlcParameter("conveyorVelocity(AutoFAST)").getValue());
+ jsonObject.append("xiaoche", plcParameterObject.getPlcParameter("").getValue());
+
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Parameter1");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+
+ webserver.sendMessage(jsonObject.toString());
+
+
+ if (webserver != null) {
+
+ List<String> messages = webserver.getMessages();
+ List<String> waddresses1 = new ArrayList<>();
+ waddresses1.add("DB100.0");
+ waddresses1.add("DB100.2");
+ waddresses1.add("DB100.4");
+ waddresses1.add("DB100.6");
+ waddresses1.add("DB100.26");
+ waddresses1.add("DB100.28");
+ waddresses1.add("DB100.30");
+ waddresses1.add("DB100.32");
+ waddresses1.add("DB100.34");
+ waddresses1.add("DB100.36");
+ waddresses1.add("DB100.38");
+ waddresses1.add("DB100.40");
+
+ String addressList2 = "DB100.8";
+ String addressList3 = "DB100.12";
+
+ if (!messages.isEmpty()) {
+ // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+ String lastMessage = messages.get(messages.size() - 1);
+ // System.out.println("lastMessage锛�" + lastMessage);
+ JSONArray messageArray = new JSONArray(lastMessage);
+
+ // 鏁村悎绗� 1 鍒� 3 涓暟缁勫苟鍘绘帀 null 鍏冪礌
+ List<Short> mergedList = new ArrayList<>();
+ for (int i = 0; i < 3; 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);
+ }
+ }
+ }
+ }
+
+ // 鍐欏叆绗竴涓湴鍧�
+ if (messageArray.getJSONArray(3).size() > 0) {
+ Object value = messageArray.getJSONArray(3).get(0);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ short sValue = Short.parseShort(cleanedValue.trim());
+ S7control.getinstance().WriteWord(addressList2, Arrays.asList(sValue));
+ System.out
+ .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList2);
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+
+ // 鍐欏叆绗簩涓湴鍧�
+ if (messageArray.getJSONArray(4).size() > 0) {
+ Object value = messageArray.getJSONArray(4).get(0);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ short sValue = Short.parseShort(cleanedValue.trim());
+ S7control.getinstance().WriteWord(addressList3, Arrays.asList(sValue));
+ System.out
+ .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList3);
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+
+ // 鍐欏叆绗笁涓湴鍧�
+ if (!mergedList.isEmpty()) {
+ S7control.getinstance().WriteWord(waddresses1, mergedList);
+ System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + waddresses1);
+ }
+
+ // 娓呯┖娑堟伅鍒楄〃
+ webserver.clearMessages();
+ }
+ }
+
+ }
+ }
+ }
+ }
+}
+
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 379ec1b..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
@@ -40,20 +40,13 @@
storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
// 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(","));
@@ -63,17 +56,11 @@
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);
// List<Long> TIME2 = Collections.singletonList(S7control.getinstance().readtime("DB100.194"));
@@ -187,7 +174,7 @@
if (!containsOne) {
//鍒ゆ柇id鏄惁鍖呭惈鏁板瓧
if (id.matches(".*\\d.*")) {
- //鍒ゆ柇娓呮id鏄惁true
+ //鍒ゆ柇娓呴櫎id鏄惁true
if (value) {
System.out.println(id);
switch (i) {
@@ -207,7 +194,7 @@
}
}
- }
+
// 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
if (!sValue.isEmpty()) {
@@ -215,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/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/Plcsign.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
index 2daeaf3..8329678 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
@@ -71,7 +71,7 @@
// System.out.println(PlcAddress);
// List<Boolean> plclist = S7control.getinstance().ReadBits(PlcAddress, Plccount);
- List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 64);
+ List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 112);
// Boolean[] values = { true, true, true, true, true, false, true, false,
// true, false, true, false, true, false,
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcsignReview.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcsignReview.java
new file mode 100644
index 0000000..7e9549e
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcsignReview.java
@@ -0,0 +1,133 @@
+package com.example.springboot.component;
+
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.example.springboot.entity.device.PlcBitObject;
+import com.example.springboot.entity.device.PlcBitInfo;
+
+public class PlcsignReview extends Thread {
+ String name = "";
+ Integer count = 0;
+ private volatile static PlcsignReview instance = null;
+
+ private PlcsignReview() {
+ init();
+ }
+
+ // 鍗曚緥妯″紡 绾跨▼瀹夊叏
+ public static PlcsignReview getInstance() {
+ if (instance == null) {
+ synchronized (PlcsignReview.class) {
+ if (instance == null) {
+ instance = new PlcsignReview();
+ }
+ }
+ }
+ return instance;
+ }
+
+ PlcBitObject plcBitObject = new PlcBitObject();//璇B鍖烘暟鎹疄渚�
+
+ private void init() {
+ try {
+ String jsonfilename = PlcsignReview.class.getResource("/JsonFile/PlcSign.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");
+ 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();
+ }
+ }
+
+
+ @Override
+ public void run() {
+ while (this != null) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ List<Boolean> getplcbits = S7control.getinstance().ReadBits(plcBitObject.getPlcAddressBegin(), plcBitObject.getPlcAddressLength());
+ plcBitObject.setPlcBitList(getplcbits);
+// this.readValue();
+// String PlcAddress = this.name;
+// Integer Plccount = this.count;
+ // System.out.println(PlcAddress);
+
+// List<Boolean> plclist = S7control.getinstance().ReadBits(PlcAddress, Plccount);
+ List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 64);
+
+// Boolean[] values = { true, true, true, true, true, false, true, false,
+// true, false, true, false, true, false,
+// true, false, true, false, true, false, true, false, true, false, true, false,
+// true, false, true, false, true,
+// false, true, false, true, false,
+// true, false, true, false, true, false, true, false, null,
+// true, false,
+// true, false, true, false, true, false,
+// true, false, true, false, true, };
+// List<Boolean> plclist = new ArrayList<>(Arrays.asList(values));
+
+ if (plclist != null) {
+ // 灏嗚幏鍙栫殑甯冨皵绫诲瀷杞崲涓烘暣鏁扮被鍨�
+ List<Integer> Intlist = new ArrayList<>();
+ for (Boolean value : plclist) {
+ if (value != null) {
+ Intlist.add(value == true ? 0 : 1);
+ }
+
+ }
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("sig", Intlist);
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Parameter1");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+
+ webserver.sendMessage(jsonObject.toString());
+
+
+ if (webserver != null) {
+ webserver.sendMessage(jsonObject.toString());
+ }
+ }
+
+ }
+ }
+ }
+ }
+}
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 834badb..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,25 +17,29 @@
//
System.out.println("鍚姩瀹屾垚");
- // new PlcHold().start();
+ // new PlcHold().start();
new Plchome().start();
- // new Plcalarm().start();
+ new Plcalarm().start();
- // new Plcsign().start();
+ new Plcsign().start();
- // new Plcstate().start();
- // new PlcPositioning1().start();
+ new Plcstate().start();
+ new PlcPositioning1().start();
- // new PlcParameter2().start();
+ new PlcParameter2().start();
- // new PLCAutomaticParameterSetting().start();
+ new PLCAutomaticParameterSetting().start();
- // new PlcManualonePosition().start();
- // new PlcManualonePosition2().start();
- // new PlcServoManualone().start();
- // new PLCManualJog().start();
- // new Plclog().start();
+ new PlcManualonePosition().start();
+ new PlcManualonePosition2().start();
+ 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/PlcBitInfo.java b/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcBitInfo.java
new file mode 100644
index 0000000..e3cf8d1
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcBitInfo.java
@@ -0,0 +1,74 @@
+package com.example.springboot.entity.device;
+
+import com.example.springboot.component.S7control;
+
+public class PlcBitInfo {
+
+ public PlcBitInfo(String startAddress) {
+ this.startAddress = startAddress;
+ }
+ private String startAddress;
+ // 鍙傛暟鏍囪瘑
+ private String codeId;
+
+ // 鍙傛暟鍚嶇О
+ private String name;
+
+ // 璇诲彇 鍙傛暟鍊�
+ private Boolean value;
+ // 鍙傛暟鍦板潃
+ private int addressIndex;
+
+ public String getCodeId() {
+ return this.codeId;
+ }
+
+ public void setCodeId(String codeId) {
+ this.codeId = codeId;
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Boolean getValue() {
+ return this.value;
+ }
+
+ public void setValue(Boolean value) {
+ this.value = value;
+ }
+
+
+ public int getAddressIndex() {
+ return this.addressIndex;
+ }
+ /**
+ * 鑾峰彇鍦板潃
+ *
+ * @param index 绱㈠紩鍦板潃
+ */
+ public String getAddress(int index) {
+ String[] stringdatas = this.startAddress.trim().split("\\.");
+ if (stringdatas.length < 2 )
+ return null;
+ int dbwindex = 0;
+ int bitindex = 0;
+ if (stringdatas.length == 3) {
+ dbwindex = Integer.parseInt(stringdatas[1]);
+ bitindex = Integer.parseInt(stringdatas[2]);
+ } else
+ return null;
+ dbwindex+=index/8;
+ bitindex+=index%8;
+ return stringdatas[0]+"."+dbwindex+"."+bitindex;
+ }
+
+ public void setAddressIndex(int addressindex) {
+ this.addressIndex = addressindex;
+ }
+ }
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcBitObject.java b/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcBitObject.java
new file mode 100644
index 0000000..643664b
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcBitObject.java
@@ -0,0 +1,113 @@
+package com.example.springboot.entity.device;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.List;
+
+public class PlcBitObject {
+
+ // 璇ユā鍧楁暟鎹被鍨嬶紝鏁版嵁璧峰浣嶇疆
+ private String plcAddressBegin;
+ // 鏁版嵁鍦板潃闀垮害锛氱涓�鍙傛暟鍒版渶鍚庝竴涓弬鏁扮殑闀垮害
+ private int plcAddressLength;
+ private ArrayList<PlcBitInfo> plcBitList;
+
+ /**
+ * @return 鏁版嵁鍖哄紑濮嬪湴鍧�
+ */
+ public String getPlcAddressBegin() {
+ return plcAddressBegin;
+ }
+
+ /**
+ * @param plcAddressBegin 璁剧疆鏁版嵁鍖哄紑濮嬪湴鍧�
+ */
+ public void setPlcAddressBegin(String plcAddressBegin) {
+ this.plcAddressBegin = plcAddressBegin;
+ }
+
+ /**
+ * @return 鏁版嵁鍖� 璇诲彇鎵�鏈夋暟鎹墍闇�鐨勯暱搴︼紙浠yte绫诲瀷涓哄熀鍑嗭級
+ */
+ public int getPlcAddressLength() {
+ return plcAddressLength;
+ }
+
+ /**
+ * @return 璁剧疆锛氭暟鎹尯 璇诲彇鎵�鏈夋暟鎹墍闇�鐨勯暱搴︼紙浠yte绫诲瀷涓哄熀鍑嗭級
+ */
+ public void setPlcAddressLength(int plcAddressLength) {
+ this.plcAddressLength = plcAddressLength;
+ }
+
+ /**
+ * @return 鑾峰彇鍙傛暟瀹炰緥闆嗗悎
+ */
+ public ArrayList<PlcBitInfo> getBitList() {
+ return plcBitList;
+ }
+
+ /**
+ * 鏍规嵁鍙傛暟鏍囪瘑 鑾峰彇鏌愪釜鍙傛暟瀹炰緥
+ *
+ * @param codeid 鍙傛暟鏍囪瘑
+ * @return 鑾峰彇鏌愪釜鍙傛暟瀹炰緥
+ */
+ public PlcBitInfo getPlcBit(String codeid) {
+ if (plcBitList != null) {
+ for (PlcBitInfo plcbitInfo : plcBitList) {
+ if (plcbitInfo.getCodeId().equals(codeid))
+ return plcbitInfo;
+ }
+ return null;
+ } else
+ return null;
+ }
+
+ /**
+ * 鏍规嵁鍙傛暟鏍囪瘑 鑾峰彇鏌愪釜鍙傛暟瀹炰緥
+ *
+ * @param codeid 鍙傛暟鏍囪瘑
+ * @return 鑾峰彇鏌愪釜鍙傛暟瀹炰緥
+ */
+ public List<Boolean> getPlcBitValues(List<String> codeids) {
+ List<Boolean> arrayList = new ArrayList();
+ if (plcBitList != null) {
+ for (PlcBitInfo plcbitInfo : plcBitList) {
+ if (codeids.contains(plcbitInfo.getCodeId().toString()))
+ arrayList.add(plcbitInfo.getValue());
+ }
+ }
+ return arrayList;
+ }
+
+ /**
+ * 娣诲姞鍙傛暟瀹炰緥
+ *
+ * @param param 鍙傛暟瀹炰緥
+ */
+ public void addPlcBit(PlcBitInfo param) {
+ if (plcBitList != null)
+ plcBitList.add(param);
+ else {
+ plcBitList = new ArrayList<PlcBitInfo>();
+ plcBitList.add(param);
+ }
+ }
+
+ /**
+ * 鏍规嵁PLC杩斿洖鐨勬暟鎹� 缁欏弬鏁板疄渚嬭祴鍊�
+ *
+ * @param plcValueArray PLC璇诲彇鍥炴潵鐨刡yte绫诲瀷鏁版嵁闆嗗悎
+ */
+ public void setPlcBitList(List<Boolean> plcValueArray) {
+ if (plcBitList != null) {
+ for (PlcBitInfo plcbitInfo : plcBitList) {
+ plcbitInfo.setValue(plcValueArray.get(plcbitInfo.getAddressIndex()));
+ }
+ }
+ }
+
+
+
+}
\ 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
new file mode 100644
index 0000000..1faf7c9
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterInfo.java
@@ -0,0 +1,117 @@
+package com.example.springboot.entity.device;
+public class PlcParameterInfo {
+ public PlcParameterInfo(String startAddress) {
+ this.startAddress = startAddress;
+ }
+ private String startAddress;
+ // 鍙傛暟鏍囪瘑
+ private String codeId;
+
+ // 鍙傛暟鍚嶇О
+ private String name;
+
+ // 璇诲彇 鍙傛暟鍊�
+ private String value;
+
+ // // 鍐欏叆 鍙傛暟鍊�
+ // private String writeValue;
+
+ // 鍙傛暟鍗曚綅
+ private String unit;
+
+ // 鍙傛暟鍊艰浆鎹㈢郴鏁�
+ private int ratio;
+
+ // 鍙傛暟鍦板潃
+ private int addressIndex;
+
+ // 鍙傛暟鍦板潃浣嶉暱搴�
+ private int addressLength;
+
+ public String getCodeId() {
+ return this.codeId;
+ }
+
+ public void setCodeId(String codeId) {
+ this.codeId = codeId;
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getValue() {
+ return this.value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ // public String getWriteValue() {
+ // return this.writeValue;
+ // }
+
+ // public void setWriteValue(String writeValue) {
+ // this.writeValue = writeValue;
+ // }
+
+ public String getUnit() {
+ return this.unit;
+ }
+
+ public void setUnit(String unit) {
+ this.unit = unit;
+ }
+
+ public int getAddressIndex() {
+ return this.addressIndex;
+ }
+
+ public void setAddressIndex(int addressindex) {
+ this.addressIndex = addressindex;
+ }
+
+ public int getAddressLength() {
+ return this.addressLength;
+ }
+
+ public void setAddressLength(int addresslength) {
+ this.addressLength = addresslength;
+ }
+
+ public int getRatio() {
+ return this.ratio;
+ }
+
+ public void setRatio(int ratio) {
+ this.ratio = ratio;
+ }
+
+ /**
+ * 鑾峰彇鍦板潃
+ *
+ * @param index 绱㈠紩鍦板潃
+ */
+ public String getAddress(int index) {
+ String[] stringdatas = this.startAddress.trim().split("\\.");
+ if (stringdatas.length < 2 )
+ return null;
+ int dbwindex = 0;
+ int bitindex = 0;
+ if (stringdatas.length == 2) {
+ dbwindex = Integer.parseInt(stringdatas[1]);
+ } else
+ return null;
+ return stringdatas[0]+"."+dbwindex+bitindex;
+ }
+
+ 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
new file mode 100644
index 0000000..56a0230
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterObject.java
@@ -0,0 +1,169 @@
+package com.example.springboot.entity.device;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.List;
+
+public class PlcParameterObject {
+
+ // 璇ユā鍧楁暟鎹被鍨嬶紝鏁版嵁璧峰浣嶇疆
+ private String plcAddressBegin;
+ // 鏁版嵁鍦板潃闀垮害锛氱涓�鍙傛暟鍒版渶鍚庝竴涓弬鏁扮殑闀垮害
+ private int plcAddressLength;
+ private ArrayList<PlcParameterInfo> plcParameterList;
+
+ /**
+ * @return 鏁版嵁鍖哄紑濮嬪湴鍧�
+ */
+ public String getPlcAddressBegin() {
+ return plcAddressBegin;
+ }
+
+ /**
+ * @param plcAddressBegin 璁剧疆鏁版嵁鍖哄紑濮嬪湴鍧�
+ */
+ public void setPlcAddressBegin(String plcAddressBegin) {
+ this.plcAddressBegin = plcAddressBegin;
+ }
+
+ /**
+ * @return 鏁版嵁鍖� 璇诲彇鎵�鏈夋暟鎹墍闇�鐨勯暱搴︼紙浠yte绫诲瀷涓哄熀鍑嗭級
+ */
+ public int getPlcAddressLength() {
+ return plcAddressLength;
+ }
+
+ /**
+ * @return 璁剧疆锛氭暟鎹尯 璇诲彇鎵�鏈夋暟鎹墍闇�鐨勯暱搴︼紙浠yte绫诲瀷涓哄熀鍑嗭級
+ */
+ public void setPlcAddressLength(int plcAddressLength) {
+ this.plcAddressLength = plcAddressLength;
+ }
+
+ /**
+ * @return 鑾峰彇鍙傛暟瀹炰緥闆嗗悎
+ */
+ public ArrayList<PlcParameterInfo> getPlcParameterList() {
+ return plcParameterList;
+ }
+
+ /**
+ * 鏍规嵁鍙傛暟鏍囪瘑 鑾峰彇鏌愪釜鍙傛暟瀹炰緥
+ *
+ * @param codeid 鍙傛暟鏍囪瘑
+ * @return 鑾峰彇鏌愪釜鍙傛暟瀹炰緥
+ */
+ public PlcParameterInfo getPlcParameter(String codeid) {
+ if (plcParameterList != null) {
+ for (PlcParameterInfo plcParameterInfo : plcParameterList) {
+ if (plcParameterInfo.getCodeId().equals(codeid))
+ return plcParameterInfo;
+ }
+ return null;
+ } else
+ return null;
+ }
+
+
+
+ /**
+ * 鏍规嵁鍙傛暟鏍囪瘑 鑾峰彇鏌愪釜鍙傛暟瀹炰緥
+ *
+ * @param codeid 鍙傛暟鏍囪瘑
+ * @return 鑾峰彇鏌愪釜鍙傛暟瀹炰緥
+ */
+ public List<String> getPlcParameterValues(List<String> codeids) {
+ List<String> arrayList = new ArrayList();
+ if (plcParameterList != null) {
+ for (PlcParameterInfo plcParameterInfo : plcParameterList) {
+ if (codeids.contains(plcParameterInfo.getCodeId().toString()))
+ arrayList.add(plcParameterInfo.getValue());
+ }
+ }
+ 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;
+ }
+
+
+
+ /**
+ * 娣诲姞鍙傛暟瀹炰緥
+ *
+ * @param param 鍙傛暟瀹炰緥
+ */
+ public void addPlcParameter(PlcParameterInfo param) {
+ if (plcParameterList != null)
+ plcParameterList.add(param);
+ else {
+ plcParameterList = new ArrayList<PlcParameterInfo>();
+ plcParameterList.add(param);
+ }
+ }
+
+ /**
+ * 鏍规嵁PLC杩斿洖鐨勬暟鎹� 缁欏弬鏁板疄渚嬭祴鍊�
+ *
+ * @param plcValueArray PLC璇诲彇鍥炴潵鐨刡yte绫诲瀷鏁版嵁闆嗗悎
+ */
+ public void setPlcParameterList(byte[] plcValueArray) {
+ if (plcParameterList != null) {
+ for (PlcParameterInfo plcParameterInfo : plcParameterList) {
+ byte[] valueList = new byte[plcParameterInfo.getAddressLength()];
+ for (int i = 0; i < plcParameterInfo.getAddressLength(); i++) {
+ Array.setByte(valueList, i, plcValueArray[plcParameterInfo.getAddressIndex() + i]);
+ }
+ if (plcParameterInfo.getAddressLength()==2) {
+ plcParameterInfo.setValue(String.valueOf(byte2short(valueList)));
+ }
+ else
+ {
+ String valuestr = new String(valueList);
+ plcParameterInfo.setValue(valuestr);
+ }
+ }
+ }
+ }
+ /**
+ * short绫诲瀷杞琤yte[]
+ *
+ * @param s short绫诲瀷鍊�
+ */
+ public static byte[] short2byte(short s){
+ byte[] b = new byte[2];
+ for(int i = 0; i < 2; i++){
+ int offset = 16 - (i+1)*8; //鍥犱负byte鍗�4涓瓧鑺傦紝鎵�浠ヨ璁＄畻鍋忕Щ閲�
+ b[i] = (byte)((s >> offset)&0xff); //鎶�16浣嶅垎涓�2涓�8浣嶈繘琛屽垎鍒瓨鍌�
+ }
+ return b;
+ }
+ /**
+ * byte[]绫诲瀷杞瑂hort
+ *
+ * @param b byte[]绫诲瀷鍊�
+ */
+ public static short byte2short(byte[] b){
+ short l = 0;
+ for (int i = 0; i < 2; i++) {
+ l<<=8; //<<=鍜屾垜浠殑 +=鏄竴鏍风殑锛屾剰鎬濆氨鏄� l = l << 8
+ l |= (b[i] & 0xff); //鍜屼笂闈篃鏄竴鏍风殑 l = l | (b[i]&0xff)
+ }
+ return l;
+ }
+
+
+}
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
index 93c9fe4..58fa75c 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
@@ -7,7 +7,6 @@
import java.util.List;
-import javax.print.DocFlavor.STRING;
@Mapper
@@ -15,10 +14,12 @@
// 鍒ゆ柇鐩搁偦绗煎瓙鏄惁鏈夌┖鏍�
@Select("select COUNT(if(a.state1=0,cell,0))as cell,ROUND(id/2)as id from (select *,max(state)as state1 from storage_cage a GROUP BY cage,cell)as a where (a.cage=#{cage1}-1 or a.cage=#{cage1}+1)and if(a.cage<6,a.cage>0 and a.cage<6,a.cage>5) and disabled=0 GROUP BY cage ORDER BY cell desc LIMIT 1")
int selectCage(int cage1);
- // 鑾峰彇璁㈠崟鍙锋帓搴忕殑绌鸿鍗曠瀛�
- @Select("select a.cage,FrameBarcode,COUNT(if(a.order_id=#{orderids},a.order_id,null))as orderid,b.shu,c.shu2,a.cell,min(a.state)as state1,disabled,FrameBarcode from storage_cage a left join (select COUNT(*)shu,cage from storage_cage where order_id=#{orderids} GROUP BY cage)as b on a.cage=b.cage left join(select cage ,COUNT(glass_id)as shu2 from storage_cage GROUP BY cage)c on a.cage=c.cage where (order_id=#{orderids} or ''='') GROUP BY cage,cell HAVING state1=0 ORDER BY (FrameBarcode=#{Fbarcode} or ''='') desc,shu desc,shu2,cage asc; ")
+ // 鑾峰彇绗煎瓙鍙疯鍗曞彿鎺掑簭鐨勭┖璁㈠崟绗煎瓙
+ @Select("select a.cage,FrameBarcode,COUNT(if(a.order_id=#{orderids},a.order_id,null))as orderid,b.shu,c.shu2,a.cell,min(a.state)as state1,max(a.state)as state2,disabled,FrameBarcode from storage_cage a left join (select COUNT(*)shu,cage from storage_cage where order_id=#{orderids} GROUP BY cage)as b on a.cage=b.cage left join(select cage ,COUNT(glass_id)as shu2 from storage_cage GROUP BY cage)c on a.cage=c.cage where (order_id=#{orderids} or ''='') GROUP BY cage,cell HAVING state1=0 ORDER BY (FrameBarcode=#{Fbarcode} or ''='') desc,shu desc,shu2,state2 asc,cage asc;")
List<StorageCage> selectAll(String orderids,String Fbarcode);
-
+ //浼樺厛鍒ゆ柇涓�娆℃槸鍚︽湁鍚岄摑妗嗙殑绌轰綅
+ @Select("select *,min(state) state1 from storage_cage GROUP BY cage,cell HAVING state1=0 and FrameBarcode=#{FrameBarcode} LIMIT 1;")
+ List<StorageCage> selectAllFbarcode(String Fbarcode);
// 鑾峰彇鍒ゆ柇璇ユ牸瀛愭槸鍚﹂渶瑕佹妸澶栫墖鎺ㄥ叆鍐呯墖浣嶇疆
@Select("select state from storage_cage where cage=#{cage} and cell=#{cell} and tier=1;")
int selectcell(int cage, int cell);
@@ -31,13 +32,16 @@
@Select("select COUNT(tier)as tier from storage_cage where cage=#{cage} and cell=#{cell} and state!=0 and state!=3;")
int selectsum(int cage, int cell);
- // 瀹屾垚杩涚墖涓殑鐜荤拑鐘舵��
+ // 瀹屾垚鍑虹墖涓殑鐜荤拑鐘舵��
@Update("update storage_cage set state=#{state} where glass_id=#{glassid} and state=3;")
void UpdateCageOver(String glassid, int state);
-
+ // 瀹屾垚杩涚墖涓殑鐜荤拑鐘舵��
@Update("update storage_cage set state=#{state} where glass_id=#{glassid} and state=2;")
void UpdateCageadd(String glassid, int state);
-
+ //鏌ヨ鏄惁鏈夎绫诲瀷鐨勪换鍔¤繕鏈畬鎴�
+ // 鍒ゆ柇鍑虹墖涓�1鏃讹紝鏄惁鍙洿鎺ュ嚭鐗�
+ @Select("select COUNT(state) from storage_cage where state=#{state}")
+ int SelectCageState(int state);
// 鑾峰彇鐜荤拑淇℃伅
@Select("select *,ordernumber ,glasslength_mm as glasslengthmm,glassheight_mm as glassheightmm,barcode,listnumber,boxnumber,glasslength,glassheight,FrameBarcode from north_glass_buffer1 where barcode=#{glassid}")
north_glass_buffer1 selectGlass(String glassid);
@@ -190,7 +194,7 @@
int Selectqueuestate();
// 鍒ゆ柇閾濇鍑虹墖琛ㄦ槸鍚︽湁鐜荤拑闇�瑕佸嚭
- @Select("SELECT glassid FROM `out_slice` where state=0 and framestate!=1 order by sequence,id limit 1;")
+ @Select("SELECT glassid FROM `out_slice` where state=0 order by sequence,id limit 1;")
String SelectOutSlice();
// 鍒ゆ柇閾濇鍑虹墖琛ㄦ槸鍚︽湁鐜荤拑姝ｅ湪鍑虹墖涓�
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
index b46dad5..7d4844b 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
@@ -29,12 +29,19 @@
double minwidth = 0;
north_glass_buffer1 glasslist = spianMapper.selectGlass(glassid); // 鑾峰彇鐜荤拑鍙傛暟
+ //濡傛灉娌℃湁姝d鏃�
if (glasslist == null) {
+ return (300);
+ }
+ //鍒ゆ柇鏄惁杩樻湁杩涚墖浠诲姟鏈畬鎴愮殑
+ int cagestate=spianMapper.SelectCageState(2);
+ //鏈夎繘鐗囦换鍔℃湭瀹屾垚鏃惰繑鍥炰笉杩涚墖
+ if(cagestate>0){
return (300);
}
double widths = glasslist.getglasslengthmm();
String orderids = glasslist.getordernumber();
- String FrameBarcode=glasslist.getFrameBarcode();
+ String FrameBarcode = glasslist.getFrameBarcode();
List<String> adddresslist = new ArrayList<>();
adddresslist.add("DB105.0");// 杩涚墖杞﹁捣濮嬩綅缃�
@@ -47,7 +54,11 @@
// String orderid="A001";
// 鑾峰彇璁㈠崟鐩稿叧搴︽渶楂樼殑绗煎瓙鎺掑簭
- List<StorageCage> storageCage = spianMapper.selectAll(orderids,FrameBarcode);
+ List<StorageCage> storageCage = spianMapper.selectAllFbarcode(FrameBarcode);
+ if (storageCage.size() == 0) {
+ storageCage = spianMapper.selectAll(orderids, FrameBarcode);
+ }
+
if (storageCage == null) {
return (400);
}
@@ -56,7 +67,7 @@
cage1 = storageCage2.getCage();
// 鍒ゆ柇璇ョ瀛愬彿鐩搁偦鏈�澶х殑绌烘牸鏁�
int cages = spianMapper.selectCage(cage1);
-
+
// 濡傛灉鐩搁偦绗煎瓙娌℃湁绌烘牸,鎴栬�呮湁姝ｅ湪鎵ц鐨勫嚭鐗囦换鍔℃椂杩斿洖400
if (cages == 0) {
return (400);
@@ -145,7 +156,6 @@
int cells;
double glasswidth = cageout.getGlassWidth();
-
// 鍒ゆ柇鐜荤拑鍐呭鐗�
if (tier == 2) {
int state = spianMapper.selectGlassState(cage, cell);// 鑾峰彇鏍煎瓙鏁伴噺
@@ -155,7 +165,7 @@
datas.add((short) 1000);
datas.add((short) state);
datas.add((short) 1);
- spianMapper.OverOutSlice(glassid.toString(), 1,0);// 鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓�
+ spianMapper.OverOutSlice(glassid.toString(), 1, 0);// 鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓�
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
spianMapper.UpdataGlassCageState(glassid.toString(), 3);// 鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
@@ -180,11 +190,11 @@
datas.add((short) 1000);
datas.add((short) 1);
datas.add((short) 1);
- spianMapper.OverOutSlice(glassid.toString(), 1,0);// 鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓�
+ spianMapper.OverOutSlice(glassid.toString(), 1, 0);// 鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓�
spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid, 1);// 鏂板浠诲姟
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
spianMapper.UpdataGlassCageState(glassid, 3);// 鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
-
+
System.out.println("鍑虹墖浠诲姟|" + datas);
outmesid(glassid, "DB105.34");// 娲惧彂鍑虹墖ID
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
@@ -194,7 +204,7 @@
} else {
// 鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙
if (cage < 6) {
- StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 0, 6,cell);
+ StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 0, 6, cell);
if (cagecell == null) {
return (300);
}
@@ -224,7 +234,7 @@
return (200); // 缁撴潫
} else {// 绗煎瓙鍙峰ぇ浜�5鏃�
- StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 5, 11,cell);
+ StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 5, 11, cell);
if (cagecell == null) {
return (300);
}
@@ -307,17 +317,17 @@
public void overtask(String glassid) {
spianMapper.UpdatetaskOut(glassid.toString());// 瀹屾垚涓婁竴娆� 鍑虹墖鎴栬�呰繘鐗囦换鍔�
- spianMapper.OverOutSlice(glassid.toString(), 2,1);// 瀹屾垚鍑虹墖闃熷垪浠诲姟
+ spianMapper.OverOutSlice(glassid.toString(), 2, 1);// 瀹屾垚鍑虹墖闃熷垪浠诲姟
spianMapper.UpdataGlassCage(glassid.toString(), 0);// 娓呴櫎鍑虹墖鏍煎瓙鐜荤拑淇℃伅
spianMapper.UpdateCageOver(glassid.toString(), 0);// 鏇存敼绗煎瓙琛ㄥ嚭鐗囩姸鎬�
spianMapper.UpdateCageadd(glassid.toString(), 1);// 鏇存敼绗煎瓙琛ㄨ繘鐗囩姸鎬�
String barcode = spianMapper.SelectBarcode(glassid.toString());// 鑾峰彇璇ョ幓鐠冪殑閾濇id
spianMapper.UpdateAddQueue(glassid.toString());// 鎶婅繘鐗囩殑鐜荤拑鏇存柊鍒板嚭鐗囬槦鍒椾腑
// if (barcode != null) {
- // int barcodeState = spianMapper.SelectOverState(barcode);// 鑾峰彇璇ラ摑妗嗙殑鐘舵��
- // if (barcodeState == 0) {// 褰撹閾濇鎵�鏈夌殑鐜荤拑閮芥槸瀹屾垚鐘舵�佹椂鍒犻櫎鍦ㄥ嚭鐗囬槦鍒楃殑鏁版嵁
- // spianMapper.DeleteQueue(barcode);
- // }
+ // int barcodeState = spianMapper.SelectOverState(barcode);// 鑾峰彇璇ラ摑妗嗙殑鐘舵��
+ // if (barcodeState == 0) {// 褰撹閾濇鎵�鏈夌殑鐜荤拑閮芥槸瀹屾垚鐘舵�佹椂鍒犻櫎鍦ㄥ嚭鐗囬槦鍒楃殑鏁版嵁
+ // spianMapper.DeleteQueue(barcode);
+ // }
// }
}
diff --git a/springboot-vue3/src/main/resources/JsonFile/PlcParameter.json b/springboot-vue3/src/main/resources/JsonFile/PlcParameter.json
new file mode 100644
index 0000000..8f15f47
--- /dev/null
+++ b/springboot-vue3/src/main/resources/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/src/main/resources/JsonFile/PlcSign.json b/springboot-vue3/src/main/resources/JsonFile/PlcSign.json
new file mode 100644
index 0000000..6a40941
--- /dev/null
+++ b/springboot-vue3/src/main/resources/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/resources/config.properties b/springboot-vue3/src/main/resources/config.properties
index 4e420c3..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
+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