From 1c48d19c5176bfb65b34e460b53f8a43583c1e69 Mon Sep 17 00:00:00 2001
From: ccongli <1441652193@qq.com>
Date: Thu, 14 Sep 2023 17:51:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8E=A5=E5=8F=A3=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AEv1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/modbus/DataProcessing.cs         | 45 ++++++++++++++-----
 .../Controllers/Data/DataCaptureController.cs | 11 +++++
 2 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/vol-net6/VOL.Data/Services/modbus/DataProcessing.cs b/vol-net6/VOL.Data/Services/modbus/DataProcessing.cs
index 9c3a115..4d637bc 100644
--- a/vol-net6/VOL.Data/Services/modbus/DataProcessing.cs
+++ b/vol-net6/VOL.Data/Services/modbus/DataProcessing.cs
@@ -116,11 +116,23 @@ namespace VOL.Data.Services.modbus
             SaveModel model = new SaveModel();
             Dictionary<string, object> mapData = new()
             {
-                //{ "temperature", device.temperature ?? 68.0M },
-                //{ "potential", device.potential ?? 220.0M },
-                //{ "current", device.current ?? 24.0M },
-                //{ "processno", device.processno ?? "10092768" },
-                //{ "run_mode", device.run_mode ?? 1 }
+                { "config_id", machine.config_id},
+                { "com_status", machine.com_status ?? 15 },  
+                { "gmode", machine.gmode ?? 1 },
+                { "smode", machine.smode ?? 1 },
+                { "run_program_no", machine.run_program_no ?? "12345"},
+                { "state",  machine.state ?? 2 }, 
+                { "temperature", machine.temperature ?? 33M }, 
+                { "potential", machine.potential ?? 220M},
+                { "current", machine.current ?? 36M},
+                { "quantity", machine.current ?? 1008},
+                { "on_time", machine.on_time ?? 1694683609}, 
+                { "run_time", machine.run_time ?? 1694683629}, 
+                { "feed_rate",machine.cut_rate ?? 62.00M},
+                { "cut_rate", machine.cut_rate ?? 68.00M},
+                { "main_rate",  machine.cut_rate ?? 65.00M},
+                { "run_time_total", machine.run_time_total ?? 10080},
+                { "quantity_total", machine.quantity_total ?? 10086}
             };
             model.MainData = mapData;
             try {
@@ -149,13 +161,22 @@ namespace VOL.Data.Services.modbus
             SaveModel model = new SaveModel();
             Dictionary<string, object> mapData = new()
             {
-                //{ "standby_time", produce.standby_time ?? 24 },
-                //{ "run_time", produce.run_time ?? 20 },
-                //{ "status", produce.status ?? 1 },
-                //{ "turnout", produce.turnout ?? 1640 },
-                //{ "turnout_one", produce.turnout_one ?? 450 },
-                //{ "turnout_two", produce.turnout_two ?? 630 },
-                //{ "turnout_three", produce.turnout_three ?? 560 }
+                { "config_id", produce.config_id},
+                { "program_no", produce.program_no ?? 56789 },
+                { "com_status", produce.com_status ?? 15 },
+                { "run_time", produce.run_time ?? 34695 },
+                { "status", produce.status ?? 1 },
+                { "turnout_all", produce.turnout_all ?? 1640 },
+                { "turnout_1", produce.turnout_1 ?? 450 },
+                { "turnout_2", produce.turnout_2 ?? 630 },
+                { "turnout_3", produce.turnout_3 ?? 560 },
+                { "schedule_1", produce.schedule_1 ?? 0.92M },
+                { "schedule_2", produce.schedule_2 ?? 0.88M },
+                { "schedule_3", produce.schedule_3 ?? 0.78M },
+                { "yield_1", produce.yield_1 ?? 0.97M },
+                { "yield_2", produce.yield_2 ?? 0.88M },
+                { "yield_3", produce.yield_3 ?? 0.92M },
+                { "oee", produce.oee ?? 0.99M }
             };
             model.MainData = mapData;
             try
diff --git a/vol-net6/VOL.WebApi/Controllers/Data/DataCaptureController.cs b/vol-net6/VOL.WebApi/Controllers/Data/DataCaptureController.cs
index 33b1779..98671c9 100644
--- a/vol-net6/VOL.WebApi/Controllers/Data/DataCaptureController.cs
+++ b/vol-net6/VOL.WebApi/Controllers/Data/DataCaptureController.cs
@@ -117,6 +117,17 @@ namespace VOL.WebApi.Controllers.Data
         }
 
 
+        [HttpGet, HttpPost, Route("testSave")]
+        public IActionResult testSave()
+        {
+            Dictionary<string, Dictionary<string, object>> dataMap = new();
+            dataMap.Add("machine", new Dictionary<string, object>() { { "config_id", 666 } });
+            dataMap.Add("produce", new Dictionary<string, object>() { { "config_id", 666 } });
+            string message = saveSourceData(dataMap);
+            return Content(message);
+        }
+
+
         private string saveSourceData(Dictionary<string, Dictionary<string, object>> dataMap) {
             // 获取当前系统时间, 保证插入时间一致
             DateTime now = DateTime.Now;