From bd125c728f48a21729fbc12122b5c340059a9d13 Mon Sep 17 00:00:00 2001
From: quanzhou <quan.zhou@broconcentric.com>
Date: 星期五, 29 八月 2025 15:45:22 +0800
Subject: [PATCH] PLC报警添加种类分别存储功能完善
---
src/Bro.M141.Process/UI/UIPrinter.cs | 20 +++++-----
src/Bro.M141.Process/M141Process.cs | 49 ++++++++++--------------
2 files changed, 30 insertions(+), 39 deletions(-)
diff --git a/src/Bro.M141.Process/M141Process.cs b/src/Bro.M141.Process/M141Process.cs
index 1a63702..9067fd5 100644
--- a/src/Bro.M141.Process/M141Process.cs
+++ b/src/Bro.M141.Process/M141Process.cs
@@ -198,6 +198,7 @@
Dictionary<string, List<int>> StateDIC = new Dictionary<string, List<int>>();
List<string> AlarmTypeList = new List<string>();
+
int numplc = 0;
while (true)
@@ -297,9 +298,7 @@
var alrams = item1.AlarmDetails;
var plcdev = DeviceCollection.FirstOrDefault(u => u.Id == item1.plcname) as PLCBase;
-
-
-
+
foreach (var item in alrams.GroupBy(u => u.address))
{
int add = item.Key;
@@ -340,40 +339,32 @@
}
- //if (!StateDIC.ContainsKey(plcdev.Name))
- //{
-
- // StateDIC[plcdev.Name] = new List<int>();
- //}
}
+
+ List<int> list = new List<int>();
Dictionary<string, AlarmTypeData> AlarmType = new Dictionary<string, AlarmTypeData>();
- List<int> list = new List<int>();
-
foreach (var item in alrams)
{
- if (!AlarmType.ContainsKey(item.alarmtype))
+ string key = item.alarmtype;
+
+ if (!AlarmType.TryGetValue(key, out var alarmData))
{
- AlarmType.Add(item.alarmtype, new AlarmTypeData()
+ // 涓嶅瓨鍦紝鍒涘缓鏂扮殑
+ alarmData = new AlarmTypeData()
{
CSVhead = csvhead,
CSVdata = csvdata,
- });
-
+ };
+ AlarmType.Add(item.alarmtype, alarmData);
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"鎶ヨ{item.alarmname}绫诲埆{key}浣滀负key鍔犲叆AlarmType瀛楀吀");
}
- if (AlarmType.ContainsKey(item.alarmtype))
- {
- AlarmType[item.alarmtype].CSVhead += $",{item.alarmname}";
+ alarmData.CSVhead += $",{item.alarmname}";
+ alarmData.CSVdata += $",{(item.value == 1 ? "1" : "")}";
+ alarmData.AlarmTypeValue.Add(item.value);
- AlarmType[item.alarmtype].CSVdata += $",{(item.value == 1 ? "1" : "")}";
-
- AlarmType[item.alarmtype].AlarmTypeValue.Add(item.value);
-
- LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"鎶ヨ绫诲埆{item.alarmtype}锛涙暟鍊納item.value}鍔犲叆瀛楀吀锛欰larmType");
- }
-
}
foreach(var item in AlarmType.Keys)
{
@@ -384,13 +375,13 @@
if (!StateDIC[key].SequenceEqual(list))
{
- LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"{plcdev.Name}鎶ヨ绫诲瀷锛歿item}鐨勪俊鍙峰彂鐢熷彉鍖�");
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"{plcdev.Name}鎶ヨ绫诲瀷锛歿item}鐨勪俊鍙峰彂鐢熷彉鍖�,淇濆瓨鐨勬暟鎹负{AlarmType[item].CSVdata}");
StateDIC[key].Clear();
StateDIC[key].AddRange(list);
- CSVRecordAsync($"PLCstate_{key}.csv", AlarmType[item].CSVhead, AlarmType[item].CSVdata);
+ CSVRecordAsync($"PLCstate_{DateTime.Now.ToString("yyyyMMdd")}_{key}.csv", AlarmType[item].CSVdata, AlarmType[item].CSVhead);
var showdata = alrams.Where(u => u.value == 1).Select(u => u.alarmname).ToList();
@@ -411,9 +402,9 @@
}
}
- catch
+ catch(Exception EXC)
{
-
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Error, $"PLC鎶ヨ瀛樺偍璁板綍鍙戠敓寮傚父 {EXC.ToString()}");
}
}
}
@@ -449,7 +440,7 @@
public class AlarmTypeData
{
- public List <int> AlarmTypeValue;
+ public List <int> AlarmTypeValue = new List<int>();
public string CSVhead;
diff --git a/src/Bro.M141.Process/UI/UIPrinter.cs b/src/Bro.M141.Process/UI/UIPrinter.cs
index 86241c5..727b501 100644
--- a/src/Bro.M141.Process/UI/UIPrinter.cs
+++ b/src/Bro.M141.Process/UI/UIPrinter.cs
@@ -149,16 +149,16 @@
//g.DrawString("鍘傚晢", font, brush, (startX + 20) * Scale, (startY + 5) * Scale);//
//g.DrawString("鍢夊桨绉戞妧", font2, brush, (startX + 140) * Scale, (startY + 4) * Scale);
- BarcodeWriter writer = new BarcodeWriter();
- writer.Format = BarcodeFormat.QR_CODE;
- QrCodeEncodingOptions options = new QrCodeEncodingOptions()
- {
- DisableECI = true,//璁剧疆鍐呭缂栫爜
- CharacterSet = "UTF-8", //璁剧疆浜岀淮鐮佺殑瀹藉害鍜岄珮搴�
- Width = 123,
- Height = 123,
- Margin = 1//璁剧疆浜岀淮鐮佺殑杈硅窛,鍗曚綅涓嶆槸鍥哄畾鍍忕礌
- };
+ //BarcodeWriter writer = new BarcodeWriter();
+ //writer.Format = BarcodeFormat.QR_CODE;
+ //QrCodeEncodingOptions options = new QrCodeEncodingOptions()
+ //{
+ // DisableECI = true,//璁剧疆鍐呭缂栫爜
+ // CharacterSet = "UTF-8", //璁剧疆浜岀淮鐮佺殑瀹藉害鍜岄珮搴�
+ // Width = 123,
+ // Height = 123,
+ // Margin = 1//璁剧疆浜岀淮鐮佺殑杈硅窛,鍗曚綅涓嶆槸鍥哄畾鍍忕礌
+ //};
////绗簩琛屾暟鎹�
//g.DrawRectangle(p, startX * Scale, (startY + 20) * Scale, 70 * Scale, 20 * Scale);
--
Gitblit v1.8.0