From aa6b32cb313c914e5f8eed0a347551f8fc65ffbd Mon Sep 17 00:00:00 2001
From: kingno <30263@KINGNO>
Date: 星期三, 27 八月 2025 16:51:18 +0800
Subject: [PATCH] 合并
---
src/Bro.M141.Process/UI/UIPrinter.cs | 83 ++++++++++++++++++++
src/Bro.M141.Process/M141Config.cs | 7 +
src/Bro.M141.Process/M141Process.cs | 130 +++++++++++++++++++++++++------
3 files changed, 193 insertions(+), 27 deletions(-)
diff --git a/src/Bro.M141.Process/M141Config.cs b/src/Bro.M141.Process/M141Config.cs
index 3da03ca..b583595 100644
--- a/src/Bro.M141.Process/M141Config.cs
+++ b/src/Bro.M141.Process/M141Config.cs
@@ -392,6 +392,7 @@
public string plcname { get; set; } = "";
+
[Category("PLC閰嶇疆")]
[DisplayName("鏄惁鍚敤")]
[Description("鏄惁鍚敤")]
@@ -428,6 +429,12 @@
[Description("鎶ヨ鍚嶇О")]
public string alarmname { get; set; } = "";
+ [Category("閰嶇疆")]
+ [DisplayName("鎶ヨ绉嶇被")]
+ [Description("鎶ヨ绉嶇被")]
+ public string alarmtype { get; set; } = "";
+
+
[Browsable(false)]
[JsonIgnore]
public int value { get; set; } = -1;
diff --git a/src/Bro.M141.Process/M141Process.cs b/src/Bro.M141.Process/M141Process.cs
index cb5927d..1a63702 100644
--- a/src/Bro.M141.Process/M141Process.cs
+++ b/src/Bro.M141.Process/M141Process.cs
@@ -13,6 +13,7 @@
using MySql.Data.MySqlClient;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using NPOI.SS.Formula.Function;
using NPOI.SS.Formula.Functions;
using Org.BouncyCastle.Asn1.X509;
using Org.BouncyCastle.Ocsp;
@@ -196,6 +197,8 @@
Dictionary<string, List<int>> StateDIC = new Dictionary<string, List<int>>();
+ List<string> AlarmTypeList = new List<string>();
+
int numplc = 0;
while (true)
{
@@ -292,16 +295,15 @@
}
var alrams = item1.AlarmDetails;
+
var plcdev = DeviceCollection.FirstOrDefault(u => u.Id == item1.plcname) as PLCBase;
- if (!StateDIC.ContainsKey(plcdev.Name))
- {
- StateDIC[plcdev.Name] = new List<int>();
- }
-
+
+
foreach (var item in alrams.GroupBy(u => u.address))
{
int add = item.Key;
+
var readres = plcdev.Read(add, 1, out _)[0];
var Allbin = Convert.ToString(readres, 2).PadLeft(16, '0').Select(c => c - '0').ToArray();
@@ -311,39 +313,103 @@
foreach (var item2 in item)
{
item2.value = Allbin[item2.address2];
+
+ if (!AlarmTypeList.Contains(item2.alarmtype))
+ {
+
+ AlarmTypeList.Add(item2.alarmtype);
+
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"鎶ヨ绫诲埆{item2.alarmtype}鍔犲叆闃熷垪,闃熷垪涓暟涓簕AlarmTypeList.Count}");
+ }
}
}
+
+ string StateDICKey = "";
+
+ foreach (var item in AlarmTypeList)
+ {
+
+ StateDICKey = plcdev.Name +"_"+ item;
+
+ if (!StateDIC.ContainsKey(StateDICKey))
+ {
+
+ StateDIC[StateDICKey] = new List<int>();
+
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"鎶ヨ绫诲埆{StateDICKey}鍔犲叆瀛楀吀锛歋tateDIC");
+
+ }
+
+ //if (!StateDIC.ContainsKey(plcdev.Name))
+ //{
+
+ // StateDIC[plcdev.Name] = new List<int>();
+ //}
+ }
+
+ Dictionary<string, AlarmTypeData> AlarmType = new Dictionary<string, AlarmTypeData>();
+
List<int> list = new List<int>();
+
foreach (var item in alrams)
{
- csvhead += $",{item.alarmname}";
- csvdata += $",{(item.value == 1 ? "1" : "")}";
- list.Add(item.value);
- }
+ if (!AlarmType.ContainsKey(item.alarmtype))
+ {
+ AlarmType.Add(item.alarmtype, new AlarmTypeData()
+ {
+ CSVhead = csvhead,
+ CSVdata = csvdata,
+ });
- if (!StateDIC[plcdev.Name].SequenceEqual(list))
+ }
+
+ if (AlarmType.ContainsKey(item.alarmtype))
+ {
+ AlarmType[item.alarmtype].CSVhead += $",{item.alarmname}";
+
+ 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)
{
- StateDIC[plcdev.Name].Clear();
- StateDIC[plcdev.Name].AddRange(list);
- CSVRecordAsync($"PLCstate_{plcdev.Name}.csv", csvdata, csvhead);
+ list = AlarmType[item].AlarmTypeValue;
- var showdata = alrams.Where(u => u.value == 1).Select(u => u.alarmname).ToList();
+ string key = plcdev.Name+"_"+item;
- if (showdata == null)
+ if (!StateDIC[key].SequenceEqual(list))
{
- showdata = new List<string>();
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"{plcdev.Name}鎶ヨ绫诲瀷锛歿item}鐨勪俊鍙峰彂鐢熷彉鍖�");
+
+ StateDIC[key].Clear();
+
+ StateDIC[key].AddRange(list);
+
+ CSVRecordAsync($"PLCstate_{key}.csv", AlarmType[item].CSVhead, AlarmType[item].CSVdata);
+
+ var showdata = alrams.Where(u => u.value == 1).Select(u => u.alarmname).ToList();
+
+ if (showdata == null)
+ {
+ showdata = new List<string>();
+ }
+
+ if (showdata.Count > 0)
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"{plcdev.Name}鎶ヨ 涓暟:{showdata.Count} {string.Join(',', showdata)}");
+ }
+ else
+ {
+ LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"{plcdev.Name}鎶ヨ 涓暟:0");
+ }
}
- if (showdata.Count > 0)
- {
- LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"{plcdev.Name}鎶ヨ 涓暟:{showdata.Count} {string.Join(',', showdata)}");
- }
- else
- {
- LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"{plcdev.Name}鎶ヨ 涓暟:0");
- }
- }
+ }
}
catch
{
@@ -357,8 +423,6 @@
{
}
-
-
try
{
@@ -383,6 +447,18 @@
}
}
+ public class AlarmTypeData
+ {
+ public List <int> AlarmTypeValue;
+
+ public string CSVhead;
+
+ public string CSVdata;
+
+ }
+
+
+
/// <summary>
/// 缃戠粶棰勭儹
/// </summary>
diff --git a/src/Bro.M141.Process/UI/UIPrinter.cs b/src/Bro.M141.Process/UI/UIPrinter.cs
index 0e59987..86241c5 100644
--- a/src/Bro.M141.Process/UI/UIPrinter.cs
+++ b/src/Bro.M141.Process/UI/UIPrinter.cs
@@ -149,6 +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//璁剧疆浜岀淮鐮佺殑杈硅窛,鍗曚綅涓嶆槸鍥哄畾鍍忕礌
+ };
////绗簩琛屾暟鎹�
//g.DrawRectangle(p, startX * Scale, (startY + 20) * Scale, 70 * Scale, 20 * Scale);
@@ -192,6 +202,79 @@
}
}
+
+ //private void printDocument_Print(object sender, PrintPageEventArgs e)
+ //{
+ // Font fntTxt = new Font("榛戜綋", 15, System.Drawing.FontStyle.Bold);//姝ｆ枃鏂囧瓧
+ // System.Drawing.Brush brush = new SolidBrush(System.Drawing.Color.Black);//鐢诲埛
+ // try
+ // {
+ // string numvalue = message;
+
+ // float Scale = (float)0.95;
+ // int startX = 10;
+ // int startY = 25;
+
+ // //int length = 320 * Scale;
+ // //int height = 160 * Scale;
+ // var g = e.Graphics;
+
+ // Font font = new Font("Arial", 8 * Scale);//璁剧疆瀛椾綋棰滆壊
+ // Font font2 = new Font("Arial", 11 * Scale);//璁剧疆瀛椾綋棰滆壊
+ // Font font3 = new Font("Arial", 36 * Scale);//璁剧疆瀛椾綋棰滆壊
+ // Font font4 = new Font("Arial", 12 * Scale);//璁剧疆瀛椾綋棰滆壊
+
+
+ // Pen p = new Pen(Color.Black, Scale);//瀹氫箟浜嗕竴涓粦鑹�,瀹藉害涓�1鐨勭敾绗�
+ // g.Clear(Color.White);
+ // g.DrawRectangle(p, startX * Scale, startY * Scale, 70 * Scale, 20 * Scale);//鍦ㄧ敾鏉夸笂鐢荤煩褰�,璧峰鍧愭爣涓�(10,10),瀹戒负80,楂樹负20
+ // g.DrawRectangle(p, startX * Scale, startY * Scale, 280 * Scale, 20 * Scale);//鍦ㄧ敾鏉夸笂鐢荤煩褰�,璧峰鍧愭爣涓�(90,10),瀹戒负80,楂樹负20
+ // g.DrawString("鍘傚晢", font, brush, (startX + 20) * Scale, (startY + 5) * Scale);//
+ // g.DrawString("鍢夊桨绉戞妧", font2, brush, (startX + 140) * Scale, (startY + 4) * Scale);
+
+
+ // //绗簩琛屾暟鎹�
+ // g.DrawRectangle(p, startX * Scale, (startY + 20) * Scale, 70 * Scale, 20 * Scale);
+ // g.DrawRectangle(p, startX * Scale, (startY + 20) * Scale, 280 * Scale, 20 * Scale);
+ // g.DrawString("鍝佸悕", font, brush, (startX + 20) * Scale, (startY + 25) * Scale);
+ // g.DrawString(@"COVER LG208H-RC100 #2", font4, brush, (startX + 71) * Scale, (startY + 22) * Scale);
+
+ // //绗笁琛屾暟鎹�
+ // g.DrawRectangle(p, startX * Scale, (startY + 40) * Scale, 70 * Scale, 20 * Scale);
+ // g.DrawRectangle(p, startX * Scale, (startY + 40) * Scale, 280 * Scale, 20 * Scale);
+ // g.DrawString("鏂欏彿", font, brush, (startX + 20) * Scale, (startY + 45) * Scale);
+ // g.DrawString(@"436LG208I000", font2, brush, (startX + 130) * Scale, (startY + 43) * Scale);
+
+ // //绗洓琛屾暟鎹�
+ // g.DrawRectangle(p, startX * Scale, (startY + 60) * Scale, 70 * Scale, 20 * Scale);
+ // g.DrawRectangle(p, startX * Scale, (startY + 60) * Scale, 210 * Scale, 20 * Scale);
+ // g.DrawString("鏁伴噺", font, brush, (startX + 20) * Scale, (startY + 65) * Scale);
+ // g.DrawString(@"50PCS", font2, brush, (startX + 120) * Scale, (startY + 62) * Scale);
+
+ // //绗簲琛屾暟鎹�
+ // g.DrawRectangle(p, startX * Scale, (startY + 80) * Scale, 70 * Scale, 20 * Scale);
+ // g.DrawRectangle(p, startX * Scale, (startY + 80) * Scale, 210 * Scale, 20 * Scale);
+ // g.DrawString("鐢熶骇鏃ユ湡", font, brush, (startX + 10) * Scale, (startY + 85) * Scale);
+ // g.DrawString($"{DateTime.Now.ToString("yyyy.MM.dd")}", font2, brush, (startX + 105) * Scale, (startY + 82) * Scale);
+
+ // //绗叚琛屾暟鎹�
+ // g.DrawRectangle(p, startX * Scale, (startY + 100) * Scale, 70 * Scale, 20 * Scale);
+ // g.DrawRectangle(p, startX * Scale, (startY + 100) * Scale, 140 * Scale, 20 * Scale);
+ // g.DrawRectangle(p, startX * Scale, (startY + 100) * Scale, 210 * Scale, 20 * Scale);
+ // g.DrawString("MARK1", font, brush, (startX + 15) * Scale, (startY + 104) * Scale);
+ // g.DrawString("MARK2", font, brush, (startX + 155) * Scale, (startY + 104) * Scale);
+
+
+ // //渚ч潰
+ // g.DrawRectangle(p, (startX + 210) * Scale, (startY + 60) * Scale, 70 * Scale, 60 * Scale);
+ // g.DrawString(@"#2", font3, brush, (startX + 210) * Scale, (startY + 62) * Scale);
+ // }
+ // catch (Exception ee)
+ // {
+ // MessageBox.Show(ee.Message);
+ // }
+ //}
+
private void printDocument_Print222(object sender, PrintPageEventArgs e)
{
Font fntTxt = new Font("榛戜綋", 15, System.Drawing.FontStyle.Bold);//姝ｆ枃鏂囧瓧
--
Gitblit v1.8.0