From adfcd624fa7d4a3679ac080bb94411f7aec7999f Mon Sep 17 00:00:00 2001 From: "nodyang@aliyun.com" Date: Fri, 22 Nov 2024 14:43:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=94=A8=E7=9A=84=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RfidWeb/FormMain.cs | 132 ++++---- RfidWeb/Frm/FrmBarCodeGridView.cs | 46 ++- RfidWeb/Frm/UserAlarmShow.Designer.cs | 108 +++---- RfidWeb/Frm/UserAlarmShow.cs | 48 +-- RfidWeb/RfidWeb.csproj | 1 - RfidWeb/Tool/TestFactory.cs | 39 --- Tool/CacheManager.cs | 4 +- Tool/ExcelHelp.cs | 244 +-------------- Tool/Model/HmiPoint.cs | Bin 14387 -> 0 bytes Tool/Model/HmiPointInfo.cs | 414 ++++++++++++++++++++++++++ Tool/PlcConnect.cs | 11 + Tool/RfidSetting.cs | Bin 1660 -> 0 bytes Tool/RfidSetting2.cs | 21 ++ Tool/Tool.csproj | 10 +- 14 files changed, 640 insertions(+), 438 deletions(-) delete mode 100644 RfidWeb/Tool/TestFactory.cs delete mode 100644 Tool/Model/HmiPoint.cs create mode 100644 Tool/Model/HmiPointInfo.cs delete mode 100644 Tool/RfidSetting.cs create mode 100644 Tool/RfidSetting2.cs diff --git a/RfidWeb/FormMain.cs b/RfidWeb/FormMain.cs index 4a3ae8d..efd2a18 100644 --- a/RfidWeb/FormMain.cs +++ b/RfidWeb/FormMain.cs @@ -34,10 +34,9 @@ namespace RfidWeb public FormMain() { cache=Cache.Default; - + var currentPlcIp = RfidSetting.Current.PlcIp; DbInfo.Init(typeof(UserInfo).Assembly); - var rfidSetting = RfidSetting.Current; InitializeComponent(); if (this.FormBorderStyle == FormBorderStyle.None) { @@ -67,12 +66,12 @@ namespace RfidWeb buttons.Clear(); buttons.Add(btnShow); - buttons.Add(btnArgument); buttons.Add(btnAlarm); buttons.Add(btnAccount); buttons.Add(btnMes); buttons.Add(buttonUpdateLog); + buttons.Add(btnBarCode); btnShow_Click(new object(), EventArgs.Empty); } @@ -82,32 +81,32 @@ namespace RfidWeb /// 移除过期的缓存项 void TimeState(Object state) { - - labTime.Text = DateTime.Now.ToFullString(); bool isExit = UserManager.IsExit(); this.Invoke(() => { - - - - - this.Invoke(() => + labTime.Text = DateTime.Now.ToFullString(); + //不存在 + if (!isExit) { - //不存在 - if (!isExit) - { - labUser.ForeColor= System.Drawing.SystemColors.Window; - labUser.Text = "未登录(未授权)"; - PlcConnect.Instance.Write(HmiPointInfo.Safety_level, int.Parse("0")); - } - else + labUser.ForeColor = System.Drawing.SystemColors.Window; + labUser.Text = "未登录(未授权)"; + + CacheManager.Act(CacheKeyManager.FormMain, () => { - var dto = UserManager.GetUser(); - labUser.Text = $"{dto.UserName}({dto.RoleName})"; - labUser.ForeColor = Color.FromArgb(21, 182, 173); - } + ThreadPoolX.QueueUserWorkItem(() => + { + PlcConnect.Instance.Write(HmiPointInfo.Safety_level, int.Parse("0")); + }); + }); - }); + + } + else + { + var dto = UserManager.GetUser(); + labUser.Text = $"{dto.UserName}({dto.RoleName})"; + labUser.ForeColor = Color.FromArgb(21, 182, 173); + } }); @@ -122,38 +121,40 @@ namespace RfidWeb private void ShowLed() { - if (cache.ContainsKey(CacheKeyManager.Home)) return; - cache.Set(CacheKeyManager.Home, DateTime.Now, TimeSpan.FromSeconds(10)); - bool result =PlcConnect.Instance.ReadPlcType().IsSuccess; - hslLanternSimplePlc.LanternBackground = result ? Color.LimeGreen : Color.Red; - cache.Remove(CacheKeyManager.Home); + CacheManager.Act(CacheKeyManager.Home, () => + { + + bool result = PlcConnect.IsSuccess; + hslLanternSimplePlc.LanternBackground = result ? Color.LimeGreen : Color.Red; + }); } private void ReadBufLog() { - if (cache.ContainsKey(CacheKeyManager.ReadBufLog)) return; - cache.Set(CacheKeyManager.ReadBufLog, DateTime.Now, TimeSpan.FromSeconds(10)); - - var barCodea = HmiPointInfo.GetBufA(); - if (barCodea.Item1) + CacheManager.Act(CacheKeyManager.ReadBufLog, () => { - readBufService.Insert("A",barCodea.Item2); - } - var barCodeb = HmiPointInfo.GetBufB(); - if (barCodeb.Item1) - { - readBufService.Insert("B", barCodeb.Item2); - } + var barCodea = HmiPointInfo.GetBufA(); + if (barCodea.Item1) + { + readBufService.Insert("A", barCodea.Item2); + } - var barCodec = HmiPointInfo.GetBufC(); - if (barCodec.Item1) - { - readBufService.Insert("C", barCodec.Item2); - } + var barCodeb = HmiPointInfo.GetBufB(); + if (barCodeb.Item1) + { + readBufService.Insert("B", barCodeb.Item2); + } + + var barCodec = HmiPointInfo.GetBufC(); + if (barCodec.Item1) + { + readBufService.Insert("C", barCodec.Item2); + } + + }); - cache.Remove(CacheKeyManager.ReadBufLog); } /// @@ -164,23 +165,26 @@ namespace RfidWeb if (UserManager.IsExit()) { - var dic = pointService.GetValueName(); - - if (cache.ContainsKey(CacheKeyManager.UpdateLog)) return; - cache.Set(CacheKeyManager.UpdateLog, DateTime.Now, TimeSpan.FromSeconds(5)); - var plc = PlcConnect.Instance; - var userDto = UserManager.GetUser(); - var strings = dic.Keys; - foreach (var se in strings) + + CacheManager.Act(CacheKeyManager.UpdateLog, () => { - var res = plc.ReadInt32(se); - if (res.IsSuccess) + var dic = pointService.GetValueName(); + var plc = PlcConnect.Instance; + var userDto = UserManager.GetUser(); + var strings = dic.Keys; + foreach (var se in strings) { - string name = dic[se]; - updateLogService.AddOrUpdateLog(userDto, name, res.Content); + var res = plc.ReadInt32(se); + if (res.IsSuccess) + { + string name = dic[se]; + updateLogService.AddOrUpdateLog(userDto, name, res.Content); + } } - } - cache.Remove(CacheKeyManager.UpdateLog); + }); + + + } @@ -339,14 +343,6 @@ namespace RfidWeb panContent.Controls.Clear(); panContent.Controls.Add(new FrmBarCodeGridView()); CheckButton(btnBarCode); - - // CheckLogin(); - - //var isLogin = UserManager.IsExit(); - //if (isLogin) - //{ - - //} } } } diff --git a/RfidWeb/Frm/FrmBarCodeGridView.cs b/RfidWeb/Frm/FrmBarCodeGridView.cs index b3cfd17..84a0973 100644 --- a/RfidWeb/Frm/FrmBarCodeGridView.cs +++ b/RfidWeb/Frm/FrmBarCodeGridView.cs @@ -1,4 +1,6 @@ -using DB.Service; +using ClosedXML.Excel; + +using DB.Service; using HZH_Controls.Controls; @@ -20,13 +22,14 @@ namespace RfidWeb.Frm public partial class FrmBarCodeGridView : UserControl { private ReadBufLogService readBufLogService = new ReadBufLogService(); + public FrmBarCodeGridView() { InitializeComponent(); this.dataGridView1.Columns["CreateTime"].DefaultCellStyle.Format = "yyyy-MM-dd HH:mm:ss"; - var keyValue= new List>(); + var keyValue = new List>(); keyValue.Add(new KeyValuePair("A", "收料1")); keyValue.Add(new KeyValuePair("B", "收料2")); keyValue.Add(new KeyValuePair("C", "废料")); @@ -48,7 +51,8 @@ namespace RfidWeb.Frm this.ucPagerControl21.ShowSourceChanged += new HZH_Controls.Controls.PageControlEventHandler(this.ucPagerControl21_ShowSourceChanged); - this.ucHorizontalList1.SelectedItemEvent += new System.EventHandler(this.ucHorizontalList1_SelectedItemEvent); + this.ucHorizontalList1.SelectedItemEvent += + new System.EventHandler(this.ucHorizontalList1_SelectedItemEvent); ucPagerControl21_ShowSourceChanged(new object()); } @@ -70,7 +74,7 @@ namespace RfidWeb.Frm int index = ucPagerControl21.PageIndex; var page = readBufLogService.GetPagedList(ucPagerControl21.PageIndex, - ucPagerControl21.PageSize, key,beginTime,endTime); + ucPagerControl21.PageSize, key, beginTime, endTime); ucPagerControl21.PageCount = page.TotalPages; this.dataGridView1.DataSource = page.Items; } @@ -100,11 +104,41 @@ namespace RfidWeb.Frm Console.WriteLine("目录已创建。"); } - string file = directoryPath + "\\" + DateTime.Now.ToFullString(true) + "_" + val + ".xlsx"; + string suiji = Guid.NewGuid().ToString().Substring(0, 5); + + string file = directoryPath + "\\" + DateTime.Now.ToString("yyyyMMddHHmmss") + suiji + "_" + val + ".xlsx"; var dt = readBufLogService.GetDtaTable(key, beginTime, endTime); - ExcelHelper.Export(dt,val,file); + ExportDataTableToExcel(dt, file); MessageBox.Show("OK"); } + + void ExportDataTableToExcel(DataTable table, string filePath) + { + using (var workbook = new XLWorkbook()) + { + table.TableName = "Shell1"; + var worksheet = workbook.Worksheets.Add(table.TableName); + + // 写入列头 + for (int col = 0; col < table.Columns.Count; col++) + { + worksheet.Cell(1, col + 1).Value = table.Columns[col].ColumnName; + } + + // 写入行数据 + for (int row = 0; row < table.Rows.Count; row++) + { + for (int col = 0; col < table.Columns.Count; col++) + { + worksheet.Cell(row + 2, col + 1).Value = table.Rows[row][col].ToString(); + } + } + + + // 保存为文件 + workbook.SaveAs(filePath); + } + } } } diff --git a/RfidWeb/Frm/UserAlarmShow.Designer.cs b/RfidWeb/Frm/UserAlarmShow.Designer.cs index 0e1439b..99fd757 100644 --- a/RfidWeb/Frm/UserAlarmShow.Designer.cs +++ b/RfidWeb/Frm/UserAlarmShow.Designer.cs @@ -28,11 +28,11 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.dataGridView2 = new System.Windows.Forms.DataGridView(); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -63,6 +63,7 @@ this.hslA3 = new HslControls.HslLanternSimple(); this.hslA2 = new HslControls.HslLanternSimple(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.btnStatus = new System.Windows.Forms.Button(); this.panel3 = new System.Windows.Forms.Panel(); this.hslLabelCombofeedingMotorSpeed = new HslControls.HslLabelCombo(); this.hslLabelComboReceiving = new HslControls.HslLabelCombo(); @@ -79,7 +80,6 @@ this.hslB9 = new HslControls.HslLanternSimple(); this.hslB10 = new HslControls.HslLanternSimple(); this.hslB11 = new HslControls.HslLanternSimple(); - this.btnStatus = new System.Windows.Forms.Button(); this.tableLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); @@ -110,37 +110,37 @@ this.dataGridView2.AllowUserToAddRows = false; this.dataGridView2.AllowUserToDeleteRows = false; this.dataGridView2.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.dataGridView2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewTextBoxColumn1, this.dataGridViewTextBoxColumn2}); - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle7.BackColor = System.Drawing.Color.Red; - dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.Red; - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridView2.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.Red; + dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.Red; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridView2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridView2.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridView2.Location = new System.Drawing.Point(458, 3); this.dataGridView2.Name = "dataGridView2"; this.dataGridView2.ReadOnly = true; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle8.BackColor = System.Drawing.Color.Red; - dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 15F); - dataGridViewCellStyle8.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.Red; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.White; - this.dataGridView2.RowsDefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.Yellow; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 15F); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.Yellow; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.Black; + this.dataGridView2.RowsDefaultCellStyle = dataGridViewCellStyle3; this.dataGridView2.RowTemplate.Height = 23; this.dataGridView2.Size = new System.Drawing.Size(449, 270); this.dataGridView2.TabIndex = 1; @@ -165,14 +165,14 @@ // this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.al, @@ -181,13 +181,13 @@ this.dataGridView1.Location = new System.Drawing.Point(3, 3); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.ReadOnly = true; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle10.BackColor = System.Drawing.Color.Red; - dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle10.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.Red; - dataGridViewCellStyle10.SelectionForeColor = System.Drawing.Color.White; - this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.Red; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.Red; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.White; + this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle5; this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.Size = new System.Drawing.Size(449, 270); this.dataGridView1.TabIndex = 0; @@ -486,6 +486,16 @@ this.groupBox2.TabStop = false; this.groupBox2.Text = "料盘侧(收料2)"; // + // btnStatus + // + this.btnStatus.BackColor = System.Drawing.Color.Chartreuse; + this.btnStatus.Location = new System.Drawing.Point(252, 92); + this.btnStatus.Name = "btnStatus"; + this.btnStatus.Size = new System.Drawing.Size(112, 28); + this.btnStatus.TabIndex = 32; + this.btnStatus.Text = "状态"; + this.btnStatus.UseVisualStyleBackColor = false; + // // panel3 // this.panel3.BackColor = System.Drawing.SystemColors.ButtonFace; @@ -653,16 +663,6 @@ this.hslB11.TabIndex = 12; this.hslB11.Text = "hslLanternSimple1"; // - // btnStatus - // - this.btnStatus.BackColor = System.Drawing.Color.Chartreuse; - this.btnStatus.Location = new System.Drawing.Point(252, 92); - this.btnStatus.Name = "btnStatus"; - this.btnStatus.Size = new System.Drawing.Size(112, 28); - this.btnStatus.TabIndex = 32; - this.btnStatus.Text = "状态"; - this.btnStatus.UseVisualStyleBackColor = false; - // // UserAlarmShow // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/RfidWeb/Frm/UserAlarmShow.cs b/RfidWeb/Frm/UserAlarmShow.cs index e530c13..e9dcc3d 100644 --- a/RfidWeb/Frm/UserAlarmShow.cs +++ b/RfidWeb/Frm/UserAlarmShow.cs @@ -23,6 +23,7 @@ using Tool; using Tool.Model; using HslCommunication.LogNet; using Chloe; +using DocumentFormat.OpenXml.Wordprocessing; namespace RfidWeb.Frm { @@ -46,24 +47,31 @@ namespace RfidWeb.Frm void TimeState(Object state) { - - if(cache.ContainsKey("UserAlarmShow")) return; - - cache.Set("UserAlarmShow", DateTime.Now.ToString(), TimeSpan.FromSeconds(20)); - - stopwatc.Restart(); - var stateText = HmiPointInfo.GetStateText(); - this.Invoke(() => + + CacheManager.Act("UserAlarmShow", () => { - btnStatus.Text = stateText; + var isSuccess = PlcConnect.IsSuccess; + if (isSuccess) + { + + stopwatc.Restart(); + var stateText = HmiPointInfo.GetStateText(); + this.Invoke(() => { btnStatus.Text = stateText; }); + FillAlarmGrid(); + FillPromptGrid(); + FillAlartLed(); + FillhslLabelCombo(); + stopwatc.Stop(); + logNet.WriteInfo("首页运行时间:" + stopwatc.Elapsed.TotalMilliseconds); + } + else + { + this.Invoke(() => { btnStatus.Text = "plc连接失败"; }); + logNet.WriteWarn("plc连接失败"); + } }); - FillAlarmGrid(); - FillPromptGrid(); - FillAlartLed(); - FillhslLabelCombo(); - stopwatc.Stop(); - cache.Remove("UserAlarmShow"); - logNet.WriteInfo("运行时间:"+stopwatc.Elapsed.TotalMilliseconds); + + } /// @@ -334,9 +342,9 @@ namespace RfidWeb.Frm { foreach (var simple in simples) { - if (simple.LanternBackground != Color.Red) + if (simple.LanternBackground != System.Drawing.Color.Red) { - simple.LanternBackground = Color.Red; + simple.LanternBackground = System.Drawing.Color.Red; } } } @@ -344,9 +352,9 @@ namespace RfidWeb.Frm { foreach (var simple in simples) { - if (simple.LanternBackground != Color.Chartreuse) + if (simple.LanternBackground != System.Drawing.Color.Chartreuse) { - simple.LanternBackground = Color.Chartreuse; + simple.LanternBackground = System.Drawing.Color.Chartreuse; } } diff --git a/RfidWeb/RfidWeb.csproj b/RfidWeb/RfidWeb.csproj index eb59b1d..116db01 100644 --- a/RfidWeb/RfidWeb.csproj +++ b/RfidWeb/RfidWeb.csproj @@ -225,7 +225,6 @@ - FormLogin.cs diff --git a/RfidWeb/Tool/TestFactory.cs b/RfidWeb/Tool/TestFactory.cs deleted file mode 100644 index adde399..0000000 --- a/RfidWeb/Tool/TestFactory.cs +++ /dev/null @@ -1,39 +0,0 @@ -using DB.Dto; -using DB.Service; - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Microsoft.VisualBasic.ApplicationServices; - -namespace RfidWeb -{ - public class TestFactory - { - public static UserDto dto; - public static UserDto TestUser() - { - if (dto != null) - { - return dto; - } - long id = 7254397083167133696; - var userInfo = new UserService().Query(id); - - - UserDto user = new UserDto - { - Id = userInfo.ID, - UserName = userInfo.UserName, - RoleId = userInfo.RoleId, - RoleName ="管理员", - RoleLevel =1 - }; - dto = user; - return user; - - } - } -} diff --git a/Tool/CacheManager.cs b/Tool/CacheManager.cs index 9eb02d9..8bd3006 100644 --- a/Tool/CacheManager.cs +++ b/Tool/CacheManager.cs @@ -5,14 +5,14 @@ namespace Tool { public class CacheManager { - + public static void Act(string key,Action action) { ICache _cache=Cache.Default; if(_cache.ContainsKey(key)) return; try { - _cache.Set(key, TimeSpan.FromSeconds(300)); + _cache.Set(key, TimeSpan.FromSeconds(3000)); action(); } finally diff --git a/Tool/ExcelHelp.cs b/Tool/ExcelHelp.cs index a5fbfc3..5f28270 100644 --- a/Tool/ExcelHelp.cs +++ b/Tool/ExcelHelp.cs @@ -1,243 +1 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; -using NPOI.SS.UserModel; -using NPOI.XSSF.UserModel; - - -namespace Tool -{ - public class ExcelHelper - { - /// - /// Excel行高，Height的单位是1/20个点。例：设置高度为25个点 - /// - private static short rowHeight = 25 * 20; - - #region 导出Excel - - #region 导出 - - /// - /// 导出 - /// - /// 数据源 - /// 列名 - /// 绝对路径 - /// sheet页名 - public static void Export(DataTable dt, string strHeader, string fileName, string sheetName = "Sheet1") - { - // 使用 NPOI 组件导出 Excel 文件 - - //XSSFWorkbook:是操作Excel2007的版本，扩展名是.xlsx - XSSFWorkbook workbook = new XSSFWorkbook(); - - //HSSFWorkbook:是操作Excel2003以前（包括2003）的版本，扩展名是.xls - //HSSFWorkbook workbook = new HSSFWorkbook(); - - //创建Sheet - ISheet sheet = workbook.CreateSheet(sheetName); - - //对列名拆分 - string[] strArry = strHeader.Split(','); - - //设置单元格样式 - ICellStyle style = SetCellStyle(workbook); - - //创建表格 - NPOICreateTable(dt, strArry, sheet, style, 0); - - // 将 Excel 文件保存到磁盘 - NPOISaveFile(workbook, fileName); - - // 释放资源 - //workbook.Dispose(); - } - #endregion - - #region 自定义框架，导出 - - /// - /// 自定义顶部，导出 - /// - /// 数据源 - /// 拆分后列名 - /// 绝对路径，路径+文件名+后缀 - /// 新一行索引，开始 - /// - /// - public static void Export(DataTable dt, string[] strArry, string fileName, int num, XSSFWorkbook workbook, ISheet sheet) - { - //设置单元格样式 - ICellStyle style = SetCellStyle(workbook); - - //创建表格 - NPOICreateTable(dt, strArry, sheet, style, num); - - // 将 Excel 文件保存到磁盘 - NPOISaveFile(workbook, fileName); - - // 释放资源 - //workbook.Dispose(); - } - #endregion - - #endregion - - - - #region 保存文件 - - private static string NPOISaveFile(XSSFWorkbook workbook, string fileName) - { - try - { - // 将 Excel 文件保存到磁盘 - using (FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write)) - { - workbook.Write(fs); - } - - return ""; - } - catch (Exception err) - { - return err.Message; - } - } - - #endregion - - #region 创建表格 - - /// - /// 创建表格 - /// - /// 数据源 - /// 拆分后的列名 - /// Sheet页 - /// 样式 - /// 行索引 - private static void NPOICreateTable(DataTable dt, string[] strArry, ISheet sheet, ICellStyle style, int num) - { - IRow row = null;//声明行 - - #region 创建列名 - - //在索引 num 的位置 创建一行 - row = sheet.CreateRow(num); - row.Height = rowHeight;//设置行高 - - //循环列名数组，创建单元格并赋值、样式 - for (int i = 0; i < strArry.Length; i++) - { - row.CreateCell(i).SetCellValue(strArry[i]); - row.GetCell(i).CellStyle = style; - } - - #endregion - - #region 创建行 - - //循环数据源 创建行 - for (int i = 0; i < dt.Rows.Count; i++) - { - //创建行 - row = sheet.CreateRow(num + 1); - row.Height = rowHeight;//设置行高 - num++;//行索引自增 - - //循环数据源列集合，创建单元格 - for (int j = 0; j < dt.Columns.Count; j++) - { - string ValueType = "";//值类型 - string Value = "";//值 - //类型 和 值，赋值 - if (dt.Rows[i][j].ToString() != null) - { - ValueType = dt.Rows[i][j].GetType().ToString(); - Value = dt.Rows[i][j].ToString(); - } - //根据不同数据类型，对数据处理。处理后创建单元格并赋值 和 样式 - switch (ValueType) - { - case "System.String"://字符串类型 - row.CreateCell(j).SetCellValue(Value); - break; - case "System.DateTime"://日期类型 - System.DateTime dateV; - System.DateTime.TryParse(Value, out dateV); - row.CreateCell(j).SetCellValue(dateV.ToString("yyyy-MM-dd")); - break; - case "System.Boolean"://布尔型 - bool boolV = false; - bool.TryParse(Value, out boolV); - row.CreateCell(j).SetCellValue(boolV); - break; - case "System.Int16"://整型 - case "System.Int32": - case "System.Int64": - case "System.Byte": - int intV = 0; - int.TryParse(Value, out intV); - row.CreateCell(j).SetCellValue(intV); - break; - case "System.Decimal"://浮点型 - case "System.Double": - double doubV = 0; - double.TryParse(Value, out doubV); - row.CreateCell(j).SetCellValue(doubV); - break; - case "System.DBNull"://空值处理 - row.CreateCell(j).SetCellValue(""); - break; - default: - row.CreateCell(j).SetCellValue(""); - break; - } - row.GetCell(j).CellStyle = style; - //设置宽度 - //sheet.SetColumnWidth(j, (Value.Length + 10) * 256); - } - } - - #endregion - - //循环列名数组，多所有列 设置 自动列宽 - for (int i = 0; i < strArry.Length; i++) - { - sheet.AutoSizeColumn(i); - } - } - - #endregion - - #region 设置单元格样式 - - public static ICellStyle SetCellStyle(XSSFWorkbook workbook) - { - #region 单元格样式 - - //创建一个样式 - ICellStyle style = workbook.CreateCellStyle(); - style.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;//水平对齐 - style.VerticalAlignment = VerticalAlignment.Center;//垂直对齐 - - style.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;//下边框为细线边框 - style.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;//左边框 - style.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;//上边框 - style.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;//右边框 - - #endregion - - return style; - } - - #endregion - } -} + \ No newline at end of file diff --git a/Tool/Model/HmiPoint.cs b/Tool/Model/HmiPoint.cs deleted file mode 100644 index 9381bd8921520f2c3fcbdc5ff3ef5eb3137c8fbe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14387 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 diff --git a/Tool/Model/HmiPointInfo.cs b/Tool/Model/HmiPointInfo.cs new file mode 100644 index 0000000..fc6af8a --- /dev/null +++ b/Tool/Model/HmiPointInfo.cs @@ -0,0 +1,414 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +using HslCommunication; + +namespace Tool.Model +{ + public class HmiPointInfo + { + /// + /// DInt 供料电机速度 + /// + public static readonly string feeding_motor_speed = "feeding_motor_speed"; + + public static Int32 GetFeedingMotorSpeed => GetValue(feeding_motor_speed); + + + /// + /// DInt 层合电机速度 + /// + public static readonly string Laminated_motor_speed = "Laminated_motor_speed"; + + + public static Int32 GetLaminatedMotorSpeed => GetValue(Laminated_motor_speed); + + + /// + /// DInt 毛毡带电机速度 + /// + public static readonly string Felt_belt_motor_speed = "Felt_belt_motor_speed"; + + + public static Int32 GetFeltBeltMotorSpeed => GetValue(Felt_belt_motor_speed); + + + /// + /// DInt 收料电机1速度 + /// + public static readonly string Receiving_Electric_motor_speed = "Receiving_Electric_motor_speed"; + + public static Int32 GeReceivingMotorSpeed => GetValue(Receiving_Electric_motor_speed); + + + /// + /// 层合生产数量 + /// + public static readonly string Product_counter2 = "Product_counter2"; + + public static Int32 GetProduct_counter2 => GetValue(Product_counter2); + /// + /// 裁切1生产数量 + /// + public static readonly string CQ_Chip1_counter = "CQ_Chip1_counter"; + + public static Int32 GetCQ_Chip1_counter => GetValue(CQ_Chip1_counter); + + /// + /// 裁切2生产数量 + /// + public static readonly string CQ_Chip2_counter = "CQ_Chip2_counter"; + + public static Int32 GetCQ_Chip2_counter => GetValue(CQ_Chip2_counter); + + + /// + /// 裁刀1温度 + /// + public static readonly string QDWD1SS = "QDWD1SS"; + + public static Int32 GetQDWD1SS => GetValue(QDWD1SS); + + /// + /// 裁刀1温度 + /// + public static readonly string QDWD2SS = "QDWD2SS"; + + public static Int32 GetQDWD2SS => GetValue(QDWD2SS); + + /// + /// 设备内部温度 + /// + public static readonly string SWSS = "SWSS"; + + public static Int32 GetSWSS => GetValue(SWSS); + + + private static Int32 GetValue(string key) + { + var plc = PlcConnect.Instance; + var result = plc.ReadInt32(key); + + return result.IsSuccess ? result.Content : 0; + } + + + private static Boolean GetBoolValue(string key) + { + var plc = PlcConnect.Instance; + var result = plc.ReadBool(key); + + return result.Content; + } + + public static readonly string CUTTING_SET_TEMPERATURE1_1 = "CUTTING_SET_TEMPERATURE1_1"; + + public static Int32 GetCUTTING_SET_TEMPERATURE1_1 => GetValue(CUTTING_SET_TEMPERATURE1_1); + + public static readonly string CUTTING_SET_TEMPERATURE1_2 = "CUTTING_SET_TEMPERATURE1_2"; + public static Int32 GetCUTTING_SET_TEMPERATURE1_2 => GetValue(CUTTING_SET_TEMPERATURE1_2); + + + public static readonly string CUTTING_SET_TEMPERATURE1_3 = "CUTTING_SET_TEMPERATURE1_3"; + + public static Int32 GetCUTTING_SET_TEMPERATURE1_3 => GetValue(CUTTING_SET_TEMPERATURE1_3); + + public static readonly string CUTTING_SET_TEMPERATURE1_4 = "CUTTING_SET_TEMPERATURE1_4"; + + public static Int32 GetCUTTING_SET_TEMPERATURE1_4 => GetValue(CUTTING_SET_TEMPERATURE1_4); + + + + + public static readonly string CUTTING_SET_TEMPERATURE2_1 = "CUTTING_SET_TEMPERATURE2_1"; + + public static Int32 GetCUTTING_SET_TEMPERATURE2_1 => GetValue(CUTTING_SET_TEMPERATURE2_1); + + public static readonly string CUTTING_SET_TEMPERATURE2_2 = "CUTTING_SET_TEMPERATURE2_2"; + public static Int32 GetCUTTING_SET_TEMPERATURE2_2 => GetValue(CUTTING_SET_TEMPERATURE2_2); + + public static readonly string CUTTING_SET_TEMPERATURE2_3 = "CUTTING_SET_TEMPERATURE2_3"; + + public static Int32 GetCUTTING_SET_TEMPERATURE2_3 => GetValue(CUTTING_SET_TEMPERATURE2_3); + + public static readonly string CUTTING_SET_TEMPERATURE2_4 = "CUTTING_SET_TEMPERATURE2_4"; + + public static Int32 GetCUTTING_SET_TEMPERATURE2_4 => GetValue(CUTTING_SET_TEMPERATURE2_4); + + + public static readonly string CUTTING_SET_TIME1_1 = "CUTTING_SET_TIME1_1"; + + public static Int32 GetCUTTING_SET_TIME1_1 => GetValue(CUTTING_SET_TIME1_1); + + public static readonly string CUTTING_SET_TIME1_2 = "CUTTING_SET_TIME1_2"; + + public static Int32 GetCUTTING_SET_TIME1_2 => GetValue(CUTTING_SET_TIME1_2); + + + public static readonly string CUTTING_SET_TIME1_3 = "CUTTING_SET_TIME1_3"; + + public static Int32 GetCUTTING_SET_TIME1_3 => GetValue(CUTTING_SET_TIME1_3); + + public static readonly string CUTTING_SET_TIME1_4 = "CUTTING_SET_TIME1_4"; + + public static Int32 GetCUTTING_SET_TIME1_4 => GetValue(CUTTING_SET_TIME1_4); + + + public static readonly string CUTTING_SET_TIME2_1 = "CUTTING_SET_TIME2_1"; + + public static Int32 GetCUTTING_SET_TIME2_1 => GetValue(CUTTING_SET_TIME2_1); + + public static readonly string CUTTING_SET_TIME2_2 = "CUTTING_SET_TIME2_2"; + + public static Int32 GetCUTTING_SET_TIME2_2 => GetValue(CUTTING_SET_TIME2_2); + + public static readonly string CUTTING_SET_TIME2_3 = "CUTTING_SET_TIME2_3"; + + public static Int32 GetCUTTING_SET_TIME2_3 => GetValue(CUTTING_SET_TIME2_3); + + public static readonly string CUTTING_SET_TIME2_4 = "CUTTING_SET_TIME2_4"; + + public static Int32 GetCUTTING_SET_TIME2_4 => GetValue(CUTTING_SET_TIME2_4); + + + + + /// + /// 计划的数量 + /// + public static readonly string Product_counter_CH = "Product_counter_CH"; + + + /// + /// 安全级别 + /// + public static readonly string Safety_level = "Safety_level"; + + + + /// + /// 1盘料选择，0卷料选择 + /// + public static readonly string CH_Mode_selection = "CH_Mode_selection"; + + /// + /// 裁刀1屏蔽 + /// + public static readonly string HMI_Cutting1_pass = "HMI_Cutting1_pass"; + + + /// + /// 裁刀2屏蔽 + /// + public static readonly string HMI_Cutting2_pass = "HMI_Cutting2_pass"; + + + /// + /// 裁刀1屏蔽 + /// + public static readonly string Cutting1_passad = "Cutting1_passad"; + + + /// + /// 裁刀2屏蔽 + /// + public static readonly string Cutting2_passad = "Cutting2_passad"; + + + + /// + /// 切刀1到达使用上限清除计数按钮 + /// + public static readonly string CQ_QD1_counter_reset = "CQ_QD1_counter_reset"; + + + /// + /// 切刀2到达使用上限清除计数按钮 + /// + public static readonly string CQ_QD2_counter_reset = "CQ_QD2_counter_reset"; + + + + /// + /// 毛毡带到达使用上限清除计数按钮 + /// + public static readonly string CQ_MZD_counter_reset = "CQ_MZD_counter_reset"; + + + public static String GetStateText() + { + + string text = ""; + var plc = PlcConnect.Instance; + var result = plc.ReadInt32("status_indicator"); + if (result.IsSuccess) + { + var context = result.Content; + switch (context) + { + case 0: + text = "异常停机"; + break; + + case 1: + text = "手动模式"; + break; + case 2: + text = "自动模式"; + break; + case 3: + text = "自动运行中"; + break; + case 4: + text = "停止"; + break; + case 5: + text = "安全回路异常"; + break; + } + + } + + return text; + } + + + public static Dictionary BufDictionary = new Dictionary(); + + + public static (bool, string) GetBufA() + { + string key = "CHIP0_OK_For_SWJ"; + string kye = "READ_CHIP0.BUF"; + var plc = PlcConnect.Instance; + var result =plc.ReadInt32(key); + if (result.IsSuccess && result.Content==1) + { + OperateResult read = plc.ReadTag(kye, ushort.Parse("23")); + if (read.IsSuccess) + { + var stringBuilder = read.Content2.ToHexString(); + if (stringBuilder.Length > 22) + { + stringBuilder = stringBuilder.Substring(22); + plc.Write(key, Int32.Parse("0")); + return (true,stringBuilder); + } + } + } + + return (false, ""); + } + + + public static (bool, string) GetBufB() + { + string key = "CHIP1_OK_For_SWJ"; + string kye = "READ_CHIP1.BUF"; + var plc = PlcConnect.Instance; + var result = plc.ReadInt32(key); + if (result.IsSuccess && result.Content == 1) + { + OperateResult read = plc.ReadTag(kye, ushort.Parse("23")); + if (read.IsSuccess) + { + var stringBuilder = read.Content2.ToHexString(); + if (stringBuilder.Length > 22) + { + stringBuilder = stringBuilder.Substring(22); + plc.Write(key, Int32.Parse("0")); + return (true, stringBuilder); + } + } + } + + return (false, ""); + + } + + public static (bool, string) GetBufC() + { + var plc = PlcConnect.Instance; + string kye = "READ_CHIP2.BUF"; + string stringBuilder = ""; + + OperateResult read = plc.ReadTag(kye, ushort.Parse("25")); + if (read.IsSuccess) + { + stringBuilder = read.Content2.ToHexString(); + if (stringBuilder.StartsWith("024E6F52", StringComparison.OrdinalIgnoreCase)) + { + return (false, ""); + } + + if (stringBuilder.Length > 2) + { + stringBuilder = stringBuilder.Substring(2); + return (true, stringBuilder); + } + } + + + return (false, ""); + } + + public static (bool, string) GetBufABC(string key2) + { + string[] str = new string[] { "READ_CHIP0.BUF", "READ_CHIP1.BUF", "READ_CHIP2.BUF" }; + string kye = ""; + switch (key2) + { + case "A": + kye = str[0]; + break; + case "B": + kye = str[1]; + break; + + case "C": + kye = str[2]; + break; + } + + var plc = PlcConnect.Instance; + string stringBuilder = ""; + + OperateResult read = plc.ReadTag(kye, ushort.Parse("25")); + if (read.IsSuccess) + { + stringBuilder = read.Content2.ToHexString(); + } + + if (stringBuilder.Trim().Length == 0) + { + return (false, stringBuilder); + } + + if (stringBuilder.StartsWith("000000000") || stringBuilder.StartsWith("024E6F52".ToLower())) + { + return (false, stringBuilder); + } + if (BufDictionary.TryGetValue(key2, out var val)) + { + if (val == stringBuilder) + { + return (false, stringBuilder); + } + else + { + BufDictionary[key2] = stringBuilder; + return (true, stringBuilder); + } + } + else + { + BufDictionary[key2] = stringBuilder; + return (true, stringBuilder); + } + } + } +} diff --git a/Tool/PlcConnect.cs b/Tool/PlcConnect.cs index ed133cf..86e5649 100644 --- a/Tool/PlcConnect.cs +++ b/Tool/PlcConnect.cs @@ -21,6 +21,9 @@ namespace Tool } + + + private AllenBradleyNet CreateAb() { var rfidSetting = RfidSetting.Current; @@ -101,6 +104,14 @@ namespace Tool } + public static bool IsSuccess + { + get + { + bool result = PlcConnect.Instance.ReadPlcType().IsSuccess; + return result; + } + } public static OperateResult WriteTag(string address, UInt32 num) diff --git a/Tool/RfidSetting.cs b/Tool/RfidSetting.cs deleted file mode 100644 index 6ebb269a7cd559b5f99ac0c9701c10b679278de4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1660 zcmV-?27~z*+Fzg+GtHWeYg~^cnl1x&X1Zp63#`Gw$FZTGGF@RQD>@><(923WfCu&0 z-sOD8g3oF;+k4fgmNl?QiMi8PU$Y?ZpdsezQz<=+xCWcdZo)Fh&18ug00XnDD|Ex5 zIoJCiB5w>Da%?u!E3q!>3^&Wy5y*qUwhz)9?ilUwi&i~?yaoXHngY3^Slr5Lcg=Xx zQJz|kJ>13Fy*!81J+n~z8z%iJ{r!gMfl>@Wq~{=`IZhfS=4$V#j!D%dq8GM$Vl8ER zl$`dlbEap&MGyBY4DYiw1X|cfIl-g=uJ%U1S+WvmvOo_!9<%v(JdH>h!~7k$x}CE! z%PCxGmnzlP-a&(k;R2wf57>W0;{&74(aVJVa)4D9+X4TpL&CI_)rP)zv! zhy~cM2s=k-^=xsxdp5T&W?hX3T!n>yqtXuEwg!`NYL5($Nt_&xh5d9|>&M>$&+%t9 z7ii>4Bwb(RMvhAx+GIhvmrQECHEm)JWTPJQ<7xkwo0yR#o72AhD~l1?FQ^&S-H#Iy z=f=FUoX*0gN1kG)0%xK)caXIGwHJU)Q}#_#-7c!ewW((d$AQqh3QtA+$#?ILKRB2I z#NhzS-=!rMOHn?mZ#)Zuu5?7_u4aW6VM7nc~;Om;r6sqH54o#6B z8@i0U3f8{Ebk03tWkgWNM0o0Dotz#d?XknejAJ#kd(wG8CJa+s>%V!15YwCdWJ}FHJ73!EUp>X3NEVKiwMV zCYAX*t0B9>>SFB{pfn5wG1-9Wk@e7*jK-w8BVQ=LV_BM%HV6b6U-!jvPaLsn!AReb-qI|4oAgBH{E zf-PuV`TP>JwUJHxGHj}o^91l4vHB!|`EFx~*eSKKTDmyl!tK~6m^y(P0V#ED$m_09 z1ke9*K#V@?1cJ(#Px`7o;pKlYdAMl9Po7m+4SrFfk1h25M*}eMRy02{YC9}`f|yhA zU66rN)D^icG1|}-)n=C;m8md--iE&rQw&)#p^gKKb=CF})MKp0en@3$?dXE!jrK$5 zFihC?)(HUkb3fRlT5_~pd67LFM&Xi^){)xUwc z*^iPA7%7;aGC8A~w*aIK@7*f6YmN}l%&v}fuO}aK?N9bY^h%wRQ_u~K(apOur-M{r zot~V3fb{c|{&@a<{660{y6CL?#I>&4&N!_%RR+fk!2PqE0TTxTf|QHUXu;}|u4vA@d?7X&f$wc1lLBB_ozcrT>Clu+al=qc^Jr@;& zce#n0hx?&47T`5Bb8?F;0X&iI>%H9BI4DZ|F<`PrJsEonyZ{ zBRO?N4K1n1Fv;wVW@KCcD?!2UB1w9!_=fobxzhm+!=vQk)Z+@K*Ml1w795bA$j^P; z;eNzvDTGtKg_Y$+F{E|`U<|qQwG7|d8>b4_!8oem1-%_CCOxopl!=D;pgV)o_&xu6 znfF~poK{&zzH;-iXGDGNd9HBP|JJC|hv$A==)DaQJF_)zD=d`c?WvidJA5o$BPmuX zVI@A)v6YGlo5a%uj(iEUj7CeJpBMH|ELZ-f@oANtApC)6uOGO#LLMp`0E@(81=xCY z#dju`;F6)y>vQpt@*E=}f=`@Ii_@u!SRI+MXCD{=>9w&Zlz2ZVv|~gFLd10h%#93| z^Vi$9lKJZ{ZeT}l9>7H$A6f$TyOZB1F~Sdv-bU%mIic*ksvaZ5NzJJFFuwCYzNjo? zh|bTw?XYC5Uw*%2Z3q;P2Nz!K$jL$5fj_dkTV+9Z%}dOs@?6yoGp*cPK0`$_qwi5= za;|KLmuMw2gvDx$?Tu|fV0O$b{B+s- + { + public string Db { get; set; } = "server=127.0.0.1;database=gaosu;uid=postgres;pwd=123456"; + public string PlcIp { get; set; } = "192.168.1.100"; + public int Port { get; set; } = 44818; + public string HslKey { get; set; } = "4b133324-fea4-4766-b066-857279c92f5d"; + } +} diff --git a/Tool/Tool.csproj b/Tool/Tool.csproj index fcbd6b1..6fe6c42 100644 --- a/Tool/Tool.csproj +++ b/Tool/Tool.csproj @@ -36,6 +36,9 @@ ..\Src\HslCommunication.dll + + 0.104.2 + 11.0.2024.1101 @@ -46,9 +49,6 @@ - - 2.7.2 - 112.1.0 @@ -81,14 +81,14 @@ - + - +