From e52744716da77be232ac6ecc7573a2ef2294e65c Mon Sep 17 00:00:00 2001 From: czw <selecti@yeah.net> Date: 星期五, 27 六月 2025 16:18:20 +0800 Subject: [PATCH] 1 --- S7/Devices/PlcConfig | 424 +++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 365 insertions(+), 59 deletions(-) diff --git a/S7/Devices/PlcConfig b/S7/Devices/PlcConfig index 88dba4d..56b7903 100644 --- a/S7/Devices/PlcConfig +++ b/S7/Devices/PlcConfig @@ -1651,7 +1651,7 @@ "Brand": "Siemens", "Model": "S7_1500", "Comm": "S7Net", - "IP": "10.221.55.110[0,1][v1.0]", + "IP": "10.221.55.110:102[0,1][v1.0]", "RedisQueueName": "缁村笇灏旀姄鑷�Queue", "IsSimulate": false, "Reserve1": "", @@ -2059,7 +2059,7 @@ "Brand": "Siemens", "Model": "S7_1500", "Comm": "S7Net", - "IP": "10.221.55.120[0,1][v1.0]", + "IP": "10.221.55.120:102[0,1][v1.0]", "RedisQueueName": "缁村笇灏旀姄鑷�Queue", "IsSimulate": false, "Reserve1": "", @@ -2079,7 +2079,7 @@ "Address": "M0", "AddrType": "", "Length": 1, - "Desc": "宸︿晶鍏夋爡杩涘叆鐢宠", + "Desc": "宸︿晶灞忚斀鍏夋爡", "Trigger": false, "Reserve1": "", "Reserve2": "", @@ -2096,7 +2096,7 @@ "Address": "M1", "AddrType": "", "Length": 1, - "Desc": "鍙充晶鍏夋爡杩涘叆鐢宠", + "Desc": "鍙充晶灞忚斀鍏夋爡", "Trigger": false, "Reserve1": "", "Reserve2": "", @@ -2113,7 +2113,7 @@ "Address": "M2", "AddrType": "", "Length": 1, - "Desc": "agv 鍒拌揪宸﹁竟鏂欏彴", + "Desc": "宸︿晶寮�惎鍏夋爡", "Trigger": false, "Reserve1": "", "Reserve2": "", @@ -2130,7 +2130,7 @@ "Address": "M3", "AddrType": "", "Length": 1, - "Desc": "agv 鍒拌揪鍙宠竟鏂欏彴", + "Desc": "鍙充晶寮�惎鍏夋爡", "Trigger": false, "Reserve1": "", "Reserve2": "", @@ -2147,7 +2147,7 @@ "Address": "M4", "AddrType": "", "Length": 1, - "Desc": "AGV宸﹁竟鎵樼洏宸叉斁濂�, + "Desc": "宸︿晶鎵樼洏鍒颁綅", "Trigger": false, "Reserve1": "", "Reserve2": "", @@ -2164,7 +2164,7 @@ "Address": "M5", "AddrType": "", "Length": 1, - "Desc": "AGV鍙宠竟鎵樼洏宸叉斁濂�, + "Desc": "鍙充晶鎵樼洏鍒颁綅", "Trigger": false, "Reserve1": "", "Reserve2": "", @@ -2181,7 +2181,7 @@ "Address": "M6", "AddrType": "", "Length": 1, - "Desc": "AGV宸茬寮�乏杈规枡鍙�, + "Desc": "agv 涓诲姩鎶ヨ", "Trigger": false, "Reserve1": "", "Reserve2": "", @@ -2198,7 +2198,7 @@ "Address": "M7", "AddrType": "", "Length": 1, - "Desc": "AGV宸茬寮�彸杈规枡鍙�, + "Desc": "", "Trigger": false, "Reserve1": "", "Reserve2": "", @@ -2215,7 +2215,7 @@ "Address": "M32", "AddrType": "", "Length": 1, - "Desc": "M0鍏佽", + "Desc": "宸︿晶鍏夋爡鐘舵�", "Trigger": false, "Reserve1": "", "Reserve2": "", @@ -2232,7 +2232,7 @@ "Address": "M33", "AddrType": "", "Length": 1, - "Desc": "M1", + "Desc": "鍙充晶鍏夋爡鐘舵�", "Trigger": false, "Reserve1": "", "Reserve2": "", @@ -2249,7 +2249,7 @@ "Address": "M34", "AddrType": "", "Length": 1, - "Desc": "M2", + "Desc": "宸︿晶鍏佽鍙栫┖", "Trigger": false, "Reserve1": "", "Reserve2": "", @@ -2266,7 +2266,7 @@ "Address": "M35", "AddrType": "", "Length": 1, - "Desc": "M3", + "Desc": "鍙充晶鍏佽鍙栫┖", "Trigger": false, "Reserve1": "", "Reserve2": "", @@ -2283,7 +2283,7 @@ "Address": "M36", "AddrType": "", "Length": 1, - "Desc": "M4", + "Desc": "鏈哄櫒浜烘殏鍋滅姸鎬�, "Trigger": false, "Reserve1": "", "Reserve2": "", @@ -2300,7 +2300,7 @@ "Address": "M37", "AddrType": "", "Length": 1, - "Desc": "M5", + "Desc": "", "Trigger": false, "Reserve1": "", "Reserve2": "", @@ -2317,7 +2317,7 @@ "Address": "M38", "AddrType": "", "Length": 1, - "Desc": "M6", + "Desc": "", "Trigger": false, "Reserve1": "", "Reserve2": "", @@ -2334,7 +2334,7 @@ "Address": "M39", "AddrType": "", "Length": 1, - "Desc": "M7", + "Desc": "", "Trigger": false, "Reserve1": "", "Reserve2": "", @@ -2351,7 +2351,7 @@ "Address": "M40", "AddrType": "", "Length": 1, - "Desc": "宸﹁竟鎵樼洏鎷嗗灈瀹屾垚锛屽厑璁窤GV宸﹁竟鍙栨墭鐩�, + "Desc": "", "Trigger": false, "Reserve1": "", "Reserve2": "", @@ -2368,7 +2368,7 @@ "Address": "M41", "AddrType": "", "Length": 1, - "Desc": "鍙宠竟鎵樼洏鎷嗗灈瀹屾垚锛屽厑璁窤GV鍙宠竟鍙栨墭鐩�, + "Desc": "", "Trigger": false, "Reserve1": "", "Reserve2": "", @@ -2382,7 +2382,7 @@ "Brand": "Melsec", "Model": "Q10UDEH", "Comm": "MXComponent", - "IP": "127.0.0.1", + "IP": "1", "RedisQueueName": "鎹风灛鎶撹噦1Queue", "IsSimulate": false, "Reserve1": "", @@ -2392,7 +2392,7 @@ { "ParamList": [ { - "Id": "20250411091128147", + "Id": "20250417142024140", "Order": 1, "Name": "M0", "FullName": "鎹风灛鎶撹噦2.M0", @@ -2402,14 +2402,14 @@ "Address": "M0", "AddrType": "", "Length": 1, - "Desc": "宸︿晶鍏夋爡杩涘叆鐢宠", + "Desc": "宸︿晶灞忚斀鍏夋爡", "Trigger": false, "Reserve1": "", "Reserve2": "", "Reserve3": "" }, { - "Id": "20250411091128163", + "Id": "20250417142024155", "Order": 2, "Name": "M1", "FullName": "鎹风灛鎶撹噦2.M1", @@ -2419,14 +2419,14 @@ "Address": "M1", "AddrType": "", "Length": 1, - "Desc": "鍙充晶鍏夋爡杩涘叆鐢宠", + "Desc": "鍙充晶灞忚斀鍏夋爡", "Trigger": false, "Reserve1": "", "Reserve2": "", "Reserve3": "" }, { - "Id": "20250411091128179", + "Id": "20250417142024170", "Order": 3, "Name": "M2", "FullName": "鎹风灛鎶撹噦2.M2", @@ -2436,14 +2436,14 @@ "Address": "M2", "AddrType": "", "Length": 1, - "Desc": "agv 鍒拌揪宸﹁竟鏂欏彴", + "Desc": "宸︿晶寮�惎鍏夋爡", "Trigger": false, "Reserve1": "", "Reserve2": "", "Reserve3": "" }, { - "Id": "20250411091128194", + "Id": "20250417142024186", "Order": 4, "Name": "M3", "FullName": "鎹风灛鎶撹噦2.M3", @@ -2453,14 +2453,14 @@ "Address": "M3", "AddrType": "", "Length": 1, - "Desc": "agv 鍒拌揪鍙宠竟鏂欏彴", + "Desc": "鍙充晶寮�惎鍏夋爡", "Trigger": false, "Reserve1": "", "Reserve2": "", "Reserve3": "" }, { - "Id": "20250411091128209", + "Id": "20250417142024201", "Order": 5, "Name": "M4", "FullName": "鎹风灛鎶撹噦2.M4", @@ -2470,14 +2470,14 @@ "Address": "M4", "AddrType": "", "Length": 1, - "Desc": "AGV宸﹁竟鎵樼洏宸叉斁濂�, + "Desc": "宸︿晶鎵樼洏鍒颁綅", "Trigger": false, "Reserve1": "", "Reserve2": "", "Reserve3": "" }, { - "Id": "20250411091128225", + "Id": "20250417142024217", "Order": 6, "Name": "M5", "FullName": "鎹风灛鎶撹噦2.M5", @@ -2487,14 +2487,14 @@ "Address": "M5", "AddrType": "", "Length": 1, - "Desc": "AGV鍙宠竟鎵樼洏宸叉斁濂�, + "Desc": "鍙充晶鎵樼洏鍒颁綅", "Trigger": false, "Reserve1": "", "Reserve2": "", "Reserve3": "" }, { - "Id": "20250411091128240", + "Id": "20250417142024232", "Order": 7, "Name": "M6", "FullName": "鎹风灛鎶撹噦2.M6", @@ -2504,14 +2504,14 @@ "Address": "M6", "AddrType": "", "Length": 1, - "Desc": "AGV宸茬寮�乏杈规枡鍙�, + "Desc": "agv 涓诲姩鎶ヨ", "Trigger": false, "Reserve1": "", "Reserve2": "", "Reserve3": "" }, { - "Id": "20250411091128255", + "Id": "20250417142024248", "Order": 8, "Name": "M7", "FullName": "鎹风灛鎶撹噦2.M7", @@ -2521,14 +2521,14 @@ "Address": "M7", "AddrType": "", "Length": 1, - "Desc": "AGV宸茬寮�彸杈规枡鍙�, + "Desc": "", "Trigger": false, "Reserve1": "", "Reserve2": "", "Reserve3": "" }, { - "Id": "20250411091128270", + "Id": "20250417142024263", "Order": 9, "Name": "M32", "FullName": "鎹风灛鎶撹噦2.M32", @@ -2538,14 +2538,14 @@ "Address": "M32", "AddrType": "", "Length": 1, - "Desc": "M0鍏佽", + "Desc": "宸︿晶鍏夋爡鐘舵�", "Trigger": false, "Reserve1": "", "Reserve2": "", "Reserve3": "" }, { - "Id": "20250411091128286", + "Id": "20250417142024279", "Order": 10, "Name": "M33", "FullName": "鎹风灛鎶撹噦2.M33", @@ -2555,14 +2555,14 @@ "Address": "M33", "AddrType": "", "Length": 1, - "Desc": "M1", + "Desc": "鍙充晶鍏夋爡鐘舵�", "Trigger": false, "Reserve1": "", "Reserve2": "", "Reserve3": "" }, { - "Id": "20250411091128301", + "Id": "20250417142024295", "Order": 11, "Name": "M34", "FullName": "鎹风灛鎶撹噦2.M34", @@ -2572,14 +2572,14 @@ "Address": "M34", "AddrType": "", "Length": 1, - "Desc": "M2", + "Desc": "宸︿晶鍏佽鍙栫┖", "Trigger": false, "Reserve1": "", "Reserve2": "", "Reserve3": "" }, { - "Id": "20250411091128317", + "Id": "20250417142024311", "Order": 12, "Name": "M35", "FullName": "鎹风灛鎶撹噦2.M35", @@ -2589,14 +2589,14 @@ "Address": "M35", "AddrType": "", "Length": 1, - "Desc": "M3", + "Desc": "鍙充晶鍏佽鍙栫┖", "Trigger": false, "Reserve1": "", "Reserve2": "", "Reserve3": "" }, { - "Id": "20250411091128332", + "Id": "20250417142024326", "Order": 13, "Name": "M36", "FullName": "鎹风灛鎶撹噦2.M36", @@ -2606,14 +2606,14 @@ "Address": "M36", "AddrType": "", "Length": 1, - "Desc": "M4", + "Desc": "鏈哄櫒浜烘殏鍋滅姸鎬�, "Trigger": false, "Reserve1": "", "Reserve2": "", "Reserve3": "" }, { - "Id": "20250411091128348", + "Id": "20250417142024341", "Order": 14, "Name": "M37", "FullName": "鎹风灛鎶撹噦2.M37", @@ -2623,14 +2623,14 @@ "Address": "M37", "AddrType": "", "Length": 1, - "Desc": "M5", + "Desc": "", "Trigger": false, "Reserve1": "", "Reserve2": "", "Reserve3": "" }, { - "Id": "20250411091128364", + "Id": "20250417142024357", "Order": 15, "Name": "M38", "FullName": "鎹风灛鎶撹噦2.M38", @@ -2640,14 +2640,14 @@ "Address": "M38", "AddrType": "", "Length": 1, - "Desc": "M6", + "Desc": "", "Trigger": false, "Reserve1": "", "Reserve2": "", "Reserve3": "" }, { - "Id": "20250411091128379", + "Id": "20250417142024372", "Order": 16, "Name": "M39", "FullName": "鎹风灛鎶撹噦2.M39", @@ -2657,14 +2657,14 @@ "Address": "M39", "AddrType": "", "Length": 1, - "Desc": "M7", + "Desc": "", "Trigger": false, "Reserve1": "", "Reserve2": "", "Reserve3": "" }, { - "Id": "20250411091128394", + "Id": "20250417142024388", "Order": 17, "Name": "M40", "FullName": "鎹风灛鎶撹噦2.M40", @@ -2674,14 +2674,14 @@ "Address": "M40", "AddrType": "", "Length": 1, - "Desc": "宸﹁竟鎵樼洏鎷嗗灈瀹屾垚锛屽厑璁窤GV宸﹁竟鍙栨墭鐩�, + "Desc": "", "Trigger": false, "Reserve1": "", "Reserve2": "", "Reserve3": "" }, { - "Id": "20250411091128410", + "Id": "20250417142024403", "Order": 18, "Name": "M41", "FullName": "鎹风灛鎶撹噦2.M41", @@ -2691,7 +2691,7 @@ "Address": "M41", "AddrType": "", "Length": 1, - "Desc": "鍙宠竟鎵樼洏鎷嗗灈瀹屾垚锛屽厑璁窤GV鍙宠竟鍙栨墭鐩�, + "Desc": "", "Trigger": false, "Reserve1": "", "Reserve2": "", @@ -2705,8 +2705,314 @@ "Brand": "Melsec", "Model": "Q10UDEH", "Comm": "MXComponent", - "IP": "127.0.0.1", + "IP": "2", "RedisQueueName": "鎹风灛鎶撹噦2Queue", + "IsSimulate": false, + "Reserve1": "", + "Reserve2": "", + "Reserve3": "" + }, + { + "ParamList": [ + { + "Id": "20250417170750831", + "Order": 1, + "Name": "Param1", + "FullName": "PLC3.Param1", + "DataType": "System.UInt16", + "DataValue": "", + "SetValue": "", + "Address": "M0", + "AddrType": "04", + "Length": 1, + "Desc": "", + "Trigger": false, + "Reserve1": "", + "Reserve2": "", + "Reserve3": "" + }, + { + "Id": "20250417170818158", + "Order": 2, + "Name": "Param2", + "FullName": "PLC3.Param2", + "DataType": "System.UInt16", + "DataValue": "", + "SetValue": "", + "Address": "M1", + "AddrType": "04", + "Length": 1, + "Desc": "", + "Trigger": false, + "Reserve1": "", + "Reserve2": "", + "Reserve3": "" + }, + { + "Id": "20250417170818315", + "Order": 3, + "Name": "Param3", + "FullName": "PLC3.Param3", + "DataType": "System.UInt16", + "DataValue": "", + "SetValue": "", + "Address": "M2", + "AddrType": "04", + "Length": 1, + "Desc": "", + "Trigger": false, + "Reserve1": "", + "Reserve2": "", + "Reserve3": "" + }, + { + "Id": "20250417170818484", + "Order": 4, + "Name": "Param4", + "FullName": "PLC3.Param4", + "DataType": "System.UInt16", + "DataValue": "", + "SetValue": "", + "Address": "M3", + "AddrType": "04", + "Length": 1, + "Desc": "", + "Trigger": false, + "Reserve1": "", + "Reserve2": "", + "Reserve3": "" + }, + { + "Id": "20250417170832254", + "Order": 5, + "Name": "Param5", + "FullName": "PLC3.Param5", + "DataType": "System.UInt16", + "DataValue": "", + "SetValue": "", + "Address": "M32", + "AddrType": "04", + "Length": 1, + "Desc": "", + "Trigger": false, + "Reserve1": "", + "Reserve2": "", + "Reserve3": "" + }, + { + "Id": "20250417170832400", + "Order": 6, + "Name": "Param6", + "FullName": "PLC3.Param6", + "DataType": "System.UInt16", + "DataValue": "", + "SetValue": "", + "Address": "M33", + "AddrType": "04", + "Length": 1, + "Desc": "", + "Trigger": false, + "Reserve1": "", + "Reserve2": "", + "Reserve3": "" + }, + { + "Id": "20250417170832568", + "Order": 7, + "Name": "Param7", + "FullName": "PLC3.Param7", + "DataType": "System.UInt16", + "DataValue": "", + "SetValue": "", + "Address": "M36", + "AddrType": "04", + "Length": 1, + "Desc": "", + "Trigger": false, + "Reserve1": "", + "Reserve2": "", + "Reserve3": "" + }, + { + "Id": "20250417171011198", + "Order": 8, + "Name": "Param8", + "FullName": "PLC3.Param8", + "DataType": "System.UInt16", + "DataValue": "", + "SetValue": "", + "Address": "0x0001", + "AddrType": "04", + "Length": 1, + "Desc": "", + "Trigger": false, + "Reserve1": "", + "Reserve2": "", + "Reserve3": "" + }, + { + "Id": "20250417171011393", + "Order": 9, + "Name": "Param9", + "FullName": "PLC3.Param9", + "DataType": "System.Boolean", + "DataValue": "", + "SetValue": "", + "Address": "1", + "AddrType": "04", + "Length": 1, + "Desc": "", + "Trigger": false, + "Reserve1": "", + "Reserve2": "", + "Reserve3": "" + }, + { + "Id": "20250418103545732", + "Order": 10, + "Name": "Param10", + "FullName": "PLC3.Param10", + "DataType": "System.UInt16", + "DataValue": "", + "SetValue": "", + "Address": "1", + "AddrType": "04", + "Length": 1, + "Desc": "", + "Trigger": false, + "Reserve1": "", + "Reserve2": "", + "Reserve3": "" + } + ], + "GroupList": [], + "Id": "0000003", + "Name": "PLC3", + "Desc": "", + "Brand": "AB", + "Model": "AB", + "Comm": "MODBUSTCP", + "IP": "10.221.50.200:3000", + "RedisQueueName": "PLC3Queue", + "IsSimulate": false, + "Reserve1": "", + "Reserve2": "", + "Reserve3": "" + }, + { + "ParamList": [ + { + "Id": "20250418104411735", + "Order": 1, + "Name": "Param1", + "FullName": "PLC4.Param1", + "DataType": "System.UInt16", + "DataValue": "", + "SetValue": "", + "Address": "M0", + "AddrType": "", + "Length": 1, + "Desc": "", + "Trigger": false, + "Reserve1": "", + "Reserve2": "", + "Reserve3": "" + }, + { + "Id": "20250418104411883", + "Order": 2, + "Name": "Param2", + "FullName": "PLC4.Param2", + "DataType": "System.UInt16", + "DataValue": "", + "SetValue": "", + "Address": "M1", + "AddrType": "", + "Length": 1, + "Desc": "", + "Trigger": false, + "Reserve1": "", + "Reserve2": "", + "Reserve3": "" + }, + { + "Id": "20250418104412027", + "Order": 3, + "Name": "Param3", + "FullName": "PLC4.Param3", + "DataType": "System.UInt16", + "DataValue": "", + "SetValue": "", + "Address": "0x0001", + "AddrType": "", + "Length": 1, + "Desc": "", + "Trigger": false, + "Reserve1": "", + "Reserve2": "", + "Reserve3": "" + }, + { + "Id": "20250418104412140", + "Order": 4, + "Name": "Param4", + "FullName": "PLC4.Param4", + "DataType": "System.UInt16", + "DataValue": "", + "SetValue": "", + "Address": "1", + "AddrType": "", + "Length": 1, + "Desc": "", + "Trigger": false, + "Reserve1": "", + "Reserve2": "", + "Reserve3": "" + }, + { + "Id": "20250418104412252", + "Order": 5, + "Name": "Param5", + "FullName": "PLC4.Param5", + "DataType": "System.UInt16", + "DataValue": "", + "SetValue": "", + "Address": "0x1", + "AddrType": "", + "Length": 1, + "Desc": "", + "Trigger": false, + "Reserve1": "", + "Reserve2": "", + "Reserve3": "" + }, + { + "Id": "20250418104412341", + "Order": 6, + "Name": "Param6", + "FullName": "PLC4.Param6", + "DataType": "System.Boolean", + "DataValue": "", + "SetValue": "", + "Address": "0x0001", + "AddrType": "", + "Length": 1, + "Desc": "", + "Trigger": false, + "Reserve1": "", + "Reserve2": "", + "Reserve3": "" + } + ], + "GroupList": [], + "Id": "0000004", + "Name": "PLC4", + "Desc": "", + "Brand": "Siemens", + "Model": "S7_1500", + "Comm": "MODBUSTCP", + "IP": "10.221.50.200:3000", + "RedisQueueName": "PLC4Queue", "IsSimulate": false, "Reserve1": "", "Reserve2": "", @@ -2714,5 +3020,5 @@ } ], "CreationTime": "2025-02-26 15:31:23", - "LastWriteTime": "2025-04-11 09:11:42" + "LastWriteTime": "2025-04-18 10:45:48" } \ No newline at end of file -- Gitblit v1.9.1