From 4df72b089c81867796f33cf64834725070810aa5 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 01 八月 2025 17:42:40 +0800
Subject: [PATCH] 11

---
 config/modbus_config.json |   76 ++++++++++++++++++--------------------
 1 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/config/modbus_config.json b/config/modbus_config.json
index dc07a58..c7ec98d 100644
--- a/config/modbus_config.json
+++ b/config/modbus_config.json
@@ -1,15 +1,14 @@
 {
   "ConfigVersion": "1.0",
-  "ProjectName": "GSModbus閫氱敤閰嶇疆",
-  "Description": "閫氱敤Modbus TCP閫氫俊閰嶇疆鏂囦欢",
-  
+  "ProjectName": "娑﹁揪椤圭洰",
+  "Description": "娑﹁揪椤圭洰TCP閫氫俊閰嶇疆鏂囦欢",
+
   "Connection": {
-    "IpAddress": "192.168.3.250",
+    "IpAddress": "192.168.1.231",
     "Port": 502,
     "ConnectionTimeoutMs": 5000,
     "OperationTimeoutMs": 3000
   },
-  
   "Communication": {
     "HeartbeatIntervalMs": 1000,
     "DataPollingIntervalMs": 500,
@@ -17,21 +16,19 @@
     "ReconnectDelayMs": 3000,
     "MaxRetryCount": 3
   },
-  
   "OutputAddresses": {
     "Description": "MES鍙戦�佺粰PLC鐨勫湴鍧�閰嶇疆",
     "HeartbeatAddress": {
       "Address": 6000,
       "DataType": "Byte",
-      "Description": "MES蹇冭烦鍖呭湴鍧�"
+      "Description": "MES蹇冭烦鍖呭湴鍧�锛屼竴绉掍氦鏇垮彂0/1"
     },
     "DataConfirmationAddress": {
       "Address": 6001,
-      "DataType": "Byte", 
-      "Description": "MES鏁版嵁璇诲彇纭鍦板潃"
+      "DataType": "Byte",
+      "Description": "MES鏁版嵁璇诲彇纭鍦板潃锛屾暟鎹鍙朞K缃�1"
     }
   },
-  
   "InputAddresses": {
     "Description": "浠嶱LC璇诲彇鐨勫湴鍧�閰嶇疆",
     "ControlSignals": {
@@ -40,17 +37,20 @@
         "DataType": "Byte",
         "Length": 1,
         "DisplayName": "PLC蹇冭烦",
-        "Description": "PLC鍙戦�佺殑蹇冭烦淇″彿"
+        "Description": "PLC鍙戦�佺殑蹇冭烦淇″彿锛屼竴绉掍氦鏇垮彂0/1"
       },
       "DataReady": {
         "Address": 6003,
         "DataType": "Byte",
         "Length": 1,
         "DisplayName": "鏁版嵁灏辩华",
-        "Description": "PLC鏁版嵁鍑嗗灏辩华淇″彿"
+        "Description": "PLC鏁版嵁鍑嗗灏辩华淇″彿锛屾暟鎹甇K缃�1",
+        "ValueMap": {
+          "0": "鏁版嵁鏈氨缁�",
+          "1": "鏁版嵁灏辩华"
+        }
       }
     },
-    
     "ProductData": {
       "ProductModel": {
         "Address": 6004,
@@ -58,7 +58,7 @@
         "Length": 10,
         "Encoding": "BigEndian",
         "DisplayName": "浜у搧鍨嬪彿",
-        "Description": "浜у搧鍨嬪彿瀛楃涓诧紝澶х妯″紡瀛樺偍"
+        "Description": "浜у搧鍨嬪彿瀛楃涓诧紝澶х妯″紡瀛樺偍锛屼竴涓瓧鑺備袱涓瓧绗�"
       },
       "TestStation": {
         "Address": 6014,
@@ -73,30 +73,29 @@
         "Length": 10,
         "Encoding": "BigEndian",
         "DisplayName": "浜у搧鐮�",
-        "Description": "浜у搧鍞竴鏍囪瘑鐮�"
+        "Description": "浜у搧鍞竴鏍囪瘑鐮侊紝澶х妯″紡瀛樺偍锛屼竴涓瓧鑺備袱涓瓧绗�"
       },
       "TestResult": {
         "Address": 6025,
         "DataType": "Byte",
         "Length": 1,
         "DisplayName": "娴嬭瘯缁撴灉",
-        "Description": "娴嬭瘯缁撴灉锛�1=鍚堟牸锛�0=涓嶅悎鏍�",
+        "Description": "娴嬭瘯缁撴灉鐘舵��",
         "ValueMap": {
           "0": "涓嶅悎鏍�",
           "1": "鍚堟牸"
         }
       },
-      "Timestamp": {
+      "RecordTime": {
         "Address": 6026,
         "DataType": "Timestamp",
         "Length": 7,
         "Format": "YYYYMMDDHHMMSS",
         "Encoding": "BigEndian",
         "DisplayName": "璁板綍鏃堕棿",
-        "Description": "鏁版嵁璁板綍鏃堕棿鎴�"
+        "Description": "鏁版嵁璁板綍鏃堕棿鎴筹紝澶х妯″紡瀛樺偍锛屼竴涓瓧鑺備袱涓瓧绗︼紝鏍煎紡锛氬勾鏈堟棩鏃跺垎绉掞紙14浣嶏級"
       }
     },
-    
     "MeasurementData": {
       "MinInstallSize": {
         "Address": 6033,
@@ -106,27 +105,27 @@
         "Unit": "mm",
         "DecimalPlaces": 2,
         "DisplayName": "鏈�灏忓畨瑁呭昂瀵�",
-        "Description": "鏈�灏忓畨瑁呭昂瀵告祴閲忓��"
+        "Description": "鏈�灏忓畨瑁呭昂瀵告祴閲忓�硷紝榛樿涓や釜灏忔暟鐐癸紝渚嬶細鏀跺埌12345搴斾负123.45"
       },
       "MaxInstallSize": {
         "Address": 6035,
-        "DataType": "Integer", 
+        "DataType": "Integer",
         "Length": 2,
         "Scale": 0.01,
         "Unit": "mm",
         "DecimalPlaces": 2,
         "DisplayName": "鏈�澶у畨瑁呭昂瀵�",
-        "Description": "鏈�澶у畨瑁呭昂瀵告祴閲忓��"
+        "Description": "鏈�澶у畨瑁呭昂瀵告祴閲忓�硷紝榛樿涓や釜灏忔暟鐐�"
       },
       "Stroke": {
         "Address": 6037,
         "DataType": "Integer",
         "Length": 2,
         "Scale": 0.01,
-        "Unit": "mm", 
+        "Unit": "mm",
         "DecimalPlaces": 2,
         "DisplayName": "琛岀▼",
-        "Description": "鎵ц鍣ㄨ绋嬫祴閲忓��"
+        "Description": "鎵ц鍣ㄨ绋嬫祴閲忓�硷紝榛樿涓や釜灏忔暟鐐�"
       },
       "Speed": {
         "Address": 6039,
@@ -136,7 +135,7 @@
         "Unit": "mm/s",
         "DecimalPlaces": 2,
         "DisplayName": "閫熷害",
-        "Description": "鎵ц鍣ㄨ繍琛岄�熷害"
+        "Description": "鎵ц鍣ㄨ繍琛岄�熷害锛岄粯璁や袱涓皬鏁扮偣"
       },
       "WorkingVoltage": {
         "Address": 6041,
@@ -146,7 +145,7 @@
         "Unit": "V",
         "DecimalPlaces": 2,
         "DisplayName": "宸ヤ綔鐢靛帇",
-        "Description": "绯荤粺宸ヤ綔鐢靛帇"
+        "Description": "绯荤粺宸ヤ綔鐢靛帇锛岄粯璁や袱涓皬鏁扮偣"
       },
       "WorkingCurrent": {
         "Address": 6043,
@@ -156,17 +155,17 @@
         "Unit": "A",
         "DecimalPlaces": 2,
         "DisplayName": "宸ヤ綔鐢垫祦",
-        "Description": "绯荤粺宸ヤ綔鐢垫祦"
+        "Description": "绯荤粺宸ヤ綔鐢垫祦锛岄粯璁や袱涓皬鏁扮偣"
       },
       "WorkingPressure": {
         "Address": 6045,
         "DataType": "Integer",
         "Length": 2,
         "Scale": 0.01,
-        "Unit": "bar",
+        "Unit": "N",
         "DecimalPlaces": 2,
         "DisplayName": "宸ヤ綔鍘嬪姏",
-        "Description": "绯荤粺宸ヤ綔鍘嬪姏"
+        "Description": "绯荤粺宸ヤ綔鍘嬪姏锛岄粯璁や袱涓皬鏁扮偣锛屽崟浣嶏細鐗涢】"
       },
       "UpHallSensor": {
         "Address": 6047,
@@ -176,36 +175,33 @@
         "Unit": "",
         "DecimalPlaces": 2,
         "DisplayName": "涓婂崌闇嶅皵浼犳劅鍣�",
-        "Description": "涓婂崌闇嶅皵浼犳劅鍣ㄨ鏁�"
+        "Description": "涓婂崌闇嶅皵浼犳劅鍣ㄨ鏁帮紝榛樿涓や釜灏忔暟鐐�"
       }
     }
   },
-  
   "DataTypes": {
     "Description": "鏀寔鐨勬暟鎹被鍨嬪畾涔�",
-    "Byte": "鍗曞瓧鑺傛暟鍊� (0-255)",
-    "Integer": "澶氬瓧鑺傛暣鏁帮紝鏀寔缂╂斁",
-    "String": "瀛楃涓诧紝鏀寔澶х/灏忕缂栫爜",
-    "Timestamp": "鏃堕棿鎴筹紝鏀寔鑷畾涔夋牸寮�",
+    "Byte": "鍗曞瓧鑺傛暟鍊� (0-255)锛岀敤浜庡績璺冲寘銆佷俊鍙风姸鎬佺瓑",
+    "Integer": "澶氬瓧鑺傛暣鏁帮紝鏀寔缂╂斁锛岀敤浜庢祴閲忔暟鎹�",
+    "String": "瀛楃涓诧紝鏀寔澶х/灏忕缂栫爜锛岀敤浜庝骇鍝佸瀷鍙枫�佷骇鍝佺爜",
+    "Timestamp": "鏃堕棿鎴筹紝鏀寔鑷畾涔夋牸寮忥紝鐢ㄤ簬璁板綍鏃堕棿",
     "Float": "娴偣鏁�",
     "Boolean": "甯冨皵鍊�"
   },
-  
   "UI": {
-    "WindowTitle": "GSModbus - 閫氱敤MES涓嶱LC閫氫俊绯荤粺",
+    "WindowTitle": "鐢熶骇绾縈ES涓嶱LC閫氫俊绯荤粺",
     "AutoStartPolling": false,
     "LogLevel": "Info",
     "MaxLogLines": 1000
   },
-
   "Database": {
     "Enabled": true,
     "Type": "Oracle",
-    "ConnectionString": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.92)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = lts_dev; Password=ltsdev",
+    "ConnectionString": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.223)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = rdmes_dev; Password=rdmesdev",
     "AutoCreateTables": true,
     "DataRetentionDays": 90,
     "Tables": {
-      "ModbusDataTable": "MODBUS_DATA",
+      "ModbusDataTable": "PRODUCTION_DATA",
       "CommunicationLogTable": "COMMUNICATION_LOG",
       "ErrorLogTable": "ERROR_LOG",
       "StatisticsTable": "STATISTICS"

--
Gitblit v1.9.3