From 9d1660270272180cd71147d6ddd53d1382643d2e Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期一, 02 十一月 2026 18:00:14 +0800
Subject: [PATCH] merge: 并入远程 Initial commit 作为历史根节点
---
HMI.AlermInfoManage/AlarmInfoManage.xaml.cs | 595 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 307 insertions(+), 288 deletions(-)
diff --git a/HMI.AlermInfoManage/AlarmInfoManage.xaml.cs b/HMI.AlermInfoManage/AlarmInfoManage.xaml.cs
index a2cbbc5..02cb527 100644
--- a/HMI.AlermInfoManage/AlarmInfoManage.xaml.cs
+++ b/HMI.AlermInfoManage/AlarmInfoManage.xaml.cs
@@ -1,19 +1,15 @@
-锘縰sing HMI.AlarmInfoManage.Entity;
-using HMI.AlarmInfoManage.Model;
-using HMI.Base;
-using HMI.Core.Setting;
+锘縰sing HMI.Base;
+using HMI.Core.Entity;
using HMI.Core.Util;
using HMI.UI.Util;
+using HMI.Util;
+using HMI.Util.Alarm;
using Microsoft.Win32;
-using NPOI.SS.Formula.Functions;
-using NPOI.XSSF.UserModel;
-using Sharp7;
-using SimensDriver;
using System;
using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Data;
using System.IO;
-using System.Linq;
-using System.Timers;
using System.Windows;
using System.Windows.Controls;
@@ -24,91 +20,116 @@
/// </summary>
public partial class AlarmInfoManage : PluginControl
{
- private string blockPath;
- private string markPath;
- private string textSettingPath;
- private Simens plc = new Simens();
- private XmlUIModel Model;
+ private string alarmTextPath;
- private bool isHaveAlarm;
- private bool isNewAlarm;
+
+ private string dbPath;
private SqliteHelper sqliteHelper;
- private Timer MonitorTimer;
- private Timer PcTimer;
+ //private string opcIP = "127.0.0.1";
+ //private int opcPort = 6543;
+ //private int localPort = 18888;
+ //private SCADAApi lTSCADAApi = new OPCClient();
- /// <summary>
- /// pc璀﹀憡鏁板瓧淇″彿
- /// </summary>
- private int isPcAlarmnumber = 0;
+ private ObservableCollection<AlarmText> datasource = new ObservableCollection<AlarmText>();
- /// <summary>
- /// 褰撳墠鎶ヨ淇℃伅
- /// </summary>
- private string currentInfo = null;
+ public ObservableCollection<AlarmText> Datasource
+ {
+ get { return datasource; }
+ set { Set(ref datasource, value); }
+ }
- /// <summary>
- /// 鎺ユ敹鎶ヨ鐨勯槦鍒�
- /// </summary>
- private MSMQHelper alarmQueue = new MSMQHelper("LTHMI_Alarm");
- /// <summary>
- /// 鏃ュ織鐢熸垚鍣�
- /// </summary>
- private MSMQHelper loggeralarm = new MSMQHelper("LTHMI_Logger");
- /// <summary>
- /// 鍒锋柊鎶ヨ鐨勯槦鍒�
- /// </summary>
- private MSMQHelper alarmRefershToMain = new MSMQHelper("LTHMI_Alarm_Rrfresh");
-
- /// <summary>
- /// 鎶ヨ
- /// </summary>
- private byte[] alarmCodeBytes;
- /// <summary>
- /// 鎶ヨ淇℃伅缂撳瓨
- /// </summary>
- private List<AlarmText> currentAlarmCachePlc = new List<AlarmText>();
- /// <summary>
- /// PLC鎶ヨ淇℃伅缂撳瓨
- /// </summary>
- private List<AlarmText> preAlarmCachePlc = new List<AlarmText>();
- /// <summary>
- /// 鎶ヨ淇℃伅缂撳瓨
- /// </summary>
- private List<AlarmText> currentAlarmCachePc = new List<AlarmText>();
-
- /// <summary>
- /// 浠ｇ爜绠＄悊
- /// </summary>
- private List<AlarmSetting> alarmSettings = new List<AlarmSetting>();
- // <summary>
- /// 鏍囧織浣嶆姤璀︾鐞�
- /// </summary>
- private List<AlarmSetting> signAlarmSetting = new List<AlarmSetting>();
/// <summary>
/// 鎶ヨ鏂囨湰鍒楄〃
/// </summary>
- private List<AlarmText> alarmTexts = new List<AlarmText>();
- /// <summary>
- /// 浼犺嚦涓荤獥浣撶殑鎶ヨ淇℃伅
- /// </summary>
- private List<AlarmText> currentAlarmCachePlcToMain = new List<AlarmText>();
+ private ObservableCollection<AlarmText> alarmTexts = new ObservableCollection<AlarmText>();
+ public ObservableCollection<AlarmText> AlarmTexts
+ {
+ get { return alarmTexts; }
+ set { Set(ref alarmTexts, value); }
+ }
- private AlarmText alarm;
- private SystemSetting systemSetting;
+ private double size = 30;
+ private int currentPage = 0;
+ public int CurrentPage
+ {
+ get => currentPage;
+ set
+ {
+ Set(ref currentPage, value);
+ RefreshData();
+ }
+ }
+
+ private int maxPage = 0;
+ public int MaxPage
+ {
+ get => maxPage;
+ set
+ {
+ Set(ref maxPage, value);
+ }
+ }
public AlarmInfoManage()
{
- systemSetting = SystemSetting.Instance;
+ DataContext = this;
InitializeComponent();
+ }
+
+ public override void SetBaseFolder(string folder)
+ {
+ base.SetBaseFolder(folder);
+ dbPath = Path.Combine(BaseFolder, "alarm.db");
+ alarmTextPath = Path.Combine(BaseFolder, "AlarmText.data");
}
public override void InitFinish()
{
- Model = new XmlUIModel(BaseFolder);
- DataContext = Model;
+ if (!File.Exists(dbPath))
+ {
+ SqliteHelper.CreateDatabase(dbPath);
+ }
+ sqliteHelper = new SqliteHelper(dbPath);
+ sqliteHelper.ExecuteSql(@"CREATE TABLE IF NOT EXISTS Alarm (
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ source TEXT NOT NULL,
+ alarmcode TEXT,
+ alarminfo TEXT,
+ time DATETIME);");
+
+ LoadAlarmText();
+
+ AlarmUtil.OnAlarm += AlarmUtil_OnAlarm;
+ //if (!lTSCADAApi.Connect2(opcIP, opcPort, localPort, out string errMsg))
+ //{
+ //}
+ //else
+ //{
+ // this.MonitorTimer.Start();
+ //}
+ }
+
+ private void AlarmUtil_OnAlarm(object sender, List<AlarmText> e)
+ {
+ foreach (AlarmText alarm in e)
+ {
+ var sql = string.Empty;
+ if (alarm.IsPLCAlarm)
+ {
+ var currentInfo = alarm.AlarmInfo;
+ sql = string.Format("INSERT INTO Alarm (source, alarmcode, alarminfo, time) VALUES('{0}','{1}','{2}','{3}');",
+ alarm.Source, alarm.AlarmCode, currentInfo, alarm.Time);
+ }
+ else
+ {
+ sql = string.Format("INSERT INTO Alarm (source, alarmcode, alarminfo, time) VALUES('{0}','{1}','{2}','{3}');",
+ alarm.Source, alarm.AlarmCode, alarm.AlarmInfo, alarm.Time);
+ }
+ sqliteHelper.ExecuteSql(sql);
+ }
}
private void Button_Click(object sender, RoutedEventArgs e)
@@ -118,6 +139,10 @@
{
case "settingBtn":
OpenSettingWindow();
+ break;
+ case "refreshBtn":
+ LoadAlarmText();
+ RefreshPage(CurrentPage);
break;
case "importBtn":
ImportText();
@@ -129,11 +154,56 @@
private void OpenSettingWindow()
{
- AlarmSettingList listModal = new AlarmSettingList(blockPath, markPath, log)
+ AlarmSettingList listModal = new AlarmSettingList(log)
{
Owner = Window.GetWindow(this)
};
listModal.ShowDialog();
+ }
+
+ private void RefreshPage(int? page = null)
+ {
+ var sql = "SELECT COUNT (*) as num FROM Alarm;";
+ var dt = sqliteHelper.GetDataTable(sql);
+ if (dt.Rows.Count <= 0)
+ {
+ CurrentPage = 1;
+ MaxPage = 1;
+ return;
+ }
+ int count = int.Parse(dt.Rows[0]["num"].ToString());
+ MaxPage = (int)Math.Ceiling(count / size);
+
+ if (page != null)
+ {
+ CurrentPage = page.Value;
+ }
+ else if (CurrentPage > MaxPage)
+ {
+ CurrentPage = MaxPage;
+ }
+ }
+
+ private void RefreshData()
+ {
+ var list = new ObservableCollection<AlarmText>();
+ var sql = $"SELECT source, alarmcode, alarminfo, time FROM Alarm ORDER BY time DESC LIMIT ({CurrentPage - 1} * {size}), {size};";
+ var dt = sqliteHelper.GetDataTable(sql);
+ if (dt.Rows.Count > 0)
+ {
+ foreach (DataRow dr in dt.Rows)
+ {
+ var at = new AlarmText
+ {
+ Source = dr["source"].ToString(),
+ AlarmCode = dr["alarmcode"].ToString(),
+ AlarmInfo = dr["alarminfo"].ToString(),
+ Time = dr["time"].ToString(),
+ };
+ list.Add(at);
+ }
+ }
+ Datasource = list;
}
private void ImportText()
@@ -150,9 +220,63 @@
catch (Exception ex)
{
log.Error("AlarmText Import Failed.", ex);
- ToastHelper.Error(Window.GetWindow(this), $"瀵煎叆澶辫触锛亄ex.Message}");
+ ToastHelper.Error(Window.GetWindow(this), $"{this.lang("App.ImportFailed")}: {ex.Message}");
}
}
+
+ /// <summary>
+ /// 瀵煎叆鎶ヨ浠ｇ爜鏂囨湰
+ /// </summary>
+ /// <param name="excelFile">鐢靛瓙璁捐琛ㄦ牸鏂囦欢</param>
+ //private void ImportExcelAlarmText(string excelFile)
+ //{
+ // int index = 0;
+
+ // try
+ // {
+ // if (excelFile.IndexOf(".xlsm") < 0)
+ // {
+ // this.Warning(this.lang("Alm.OnlySupportXlsm"));
+ // return;
+ // }
+
+ // this.alarmTexts.Clear();
+ // XSSFWorkbook workbook = new XSSFWorkbook(excelFile);
+ // XSSFSheet sheet = (XSSFSheet)workbook.GetSheet("sheet1");
+ // XSSFRow row = null;
+
+ // for (int i = 2; i < (sheet.LastRowNum + 1); i++)
+ // {
+ // index = i;
+ // row = (XSSFRow)sheet.GetRow(i);
+ // if (row != null)
+ // {
+ // AlarmText alarm = new AlarmText();
+ // alarm.AlarmCode = row.Cells[0].StringCellValue;
+ // alarm.OpNo = row.Cells[1].StringCellValue;
+ // alarm.ModuleNo = row.Cells[2].StringCellValue;
+ // alarm.ModuleName_CN = row.Cells[3].StringCellValue;
+ // alarm.ModuleName_EN = row.Cells[4].StringCellValue;
+ // alarm.MAlarmCode = row.Cells[5].StringCellValue;
+ // alarm.MAlarmText_CN = row.Cells[6].StringCellValue;
+ // alarm.MAlarmText_EN = row.Cells[7].StringCellValue;
+ // this.alarmTexts.Add(alarm);
+ // }
+ // }
+
+ // if (sheet.LastRowNum > 0)
+ // {
+ // XmlHelper.SerializeToXml(textSettingPath, this.alarmTexts);
+ // }
+
+ // this.Success(this.lang("App.ImportSuccess"));
+ // }
+ // catch (Exception ex)
+ // {
+ // log.Error($"Row {index} AlarmText Import Failed.", ex);
+ // this.Error($"{this.lang("Alm.RowImportFailed", index)}: {ex.Message}");
+ // }
+ //}
/// <summary>
/// 瀵煎叆鎶ヨ浠ｇ爜鏂囨湰
@@ -166,240 +290,135 @@
{
if (excelFile.IndexOf(".xlsm") < 0)
{
- this.Warning("浠呮敮鎸亁lsm鏍煎紡鏂囦欢");
+ this.Warning(this.lang("Alm.OnlySupportXlsm"));
return;
}
- this.alarmTexts.Clear();
- XSSFWorkbook workbook = new XSSFWorkbook(excelFile);
- XSSFSheet sheet = (XSSFSheet)workbook.GetSheet("sheet1");
- XSSFRow row = null;
+ this.alarmTexts = new ObservableCollection<AlarmText>
+ (ExcelHelper.ReadFromExcel<AlarmText>(excelFile));
- for (int i = 2; i < (sheet.LastRowNum + 1); i++)
+ if (alarmTexts.Count > 0)
{
- index = i;
- row = (XSSFRow)sheet.GetRow(i);
- if (row != null)
- {
- AlarmText alarm = new AlarmText();
- alarm.AlarmCode = row.Cells[0].StringCellValue;
- alarm.OpNo = row.Cells[1].StringCellValue;
- alarm.ModuleNo = row.Cells[2].StringCellValue;
- alarm.ModuleName_CN = row.Cells[3].StringCellValue;
- alarm.ModuleName_EN = row.Cells[4].StringCellValue;
- alarm.MAlarmCode = row.Cells[5].StringCellValue;
- alarm.MAlarmText_CN = row.Cells[6].StringCellValue;
- alarm.MAlarmText_EN = row.Cells[7].StringCellValue;
- this.alarmTexts.Add(alarm);
- }
+ XmlHelper.SerializeToXml(alarmTextPath, this.alarmTexts);
}
-
- if (sheet.LastRowNum > 0)
- {
- XmlHelper.SerializeToXml(textSettingPath, this.alarmTexts);
- }
-
- this.Success("瀵煎叆鎴愬姛");
+ LoadAlarmText();
+ this.Success(this.lang("App.ImportSuccess"));
}
catch (Exception ex)
{
log.Error($"Row {index} AlarmText Import Failed.", ex);
- this.Error($"绗瑊index}琛屽鍏ュ紓甯革紒{ex.Message}");
+ this.Error($"{this.lang("Alm.RowImportFailed", index)}: {ex.Message}");
+ }
+ }
+
+ private void LoadAlarmText()
+ {
+ try
+ {
+ if (string.IsNullOrEmpty(alarmTextPath) || !File.Exists(alarmTextPath))
+ {
+ AlarmTexts = new ObservableCollection<AlarmText>();
+ }
+ else
+ {
+ AlarmTexts = XmlHelper.DeserializeFromXml<ObservableCollection<AlarmText>>(alarmTextPath);
+ }
+ }
+ catch (Exception ex)
+ {
+ log.Error("LoadAlarmText Error.", ex);
+ AlarmTexts = new ObservableCollection<AlarmText>();
}
}
private void UserControl_Loaded(object sender, RoutedEventArgs e)
{
- if (!string.IsNullOrEmpty(systemSetting.PlcIp))
- {
- if (this.plc.isConnection)
- {
- this.plc.Simens_S7_ConnectPLC(systemSetting.PlcIp, 102, 0, 1, string.Empty);
- }
- }
- MonitorTimer = new Timer
- {
- Interval = 100,
- };
- MonitorTimer.Elapsed += MonitorTimer_Elapsed;
-
- PcTimer = new Timer
- {
- Interval = 100,
- };
- PcTimer.Elapsed += PcTimer_Elapsed; ;
-
+ //if (!string.IsNullOrEmpty(systemSetting.PlcIp))
+ //{
+ // if (this.plc.isConnection)
+ // {
+ // this.plc.Simens_S7_ConnectPLC(systemSetting.PlcIp, 102, 0, 1, string.Empty);
+ // }
+ //}
+ RefreshPage(1);
Loaded -= UserControl_Loaded;
}
- private void PcTimer_Elapsed(object sender, ElapsedEventArgs e)
+ public override void DoClose(object sender, EventArgs e)
{
- try
- {
- PcTimer.Enabled = false;
- this.alarmQueue.Receive(100, out string MessageID, out string MsgStr);
- if (MessageID != string.Empty)
- {
- log.Info(MsgStr);
- switch (MessageID)
- {
- case "Clear":
- ////this.currentAlarmCachePc.RemoveAll(alarm => alarm.Source == "PC");
- this.currentAlarmCachePc.Clear();
- this.RefershAlarm();
- break;
- default:
- AlarmText aalarm = this.alarmTexts.Find(alarm => alarm.AlarmCode == MsgStr);
- aalarm.Source = "PC";
- aalarm.Time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- if ((aalarm != null) && (this.currentAlarmCachePc.Find(alarm => alarm.AlarmCode == aalarm.AlarmCode) == null))
- {
- this.currentAlarmCachePc.Add(aalarm);
- this.RefershAlarm();
- this.isPcAlarmnumber = this.currentAlarmCachePc.Count;
- }
-
- break;
- }
- }
- }
- catch (Exception ex)
- {
- log.Error("PcTimer Execute Failed", ex);
- }
- finally
- {
- PcTimer.Enabled = true;
- }
+ // AlarmUtil.OnAlarm -= AlarmUtil_OnAlarm;
}
- private void MonitorTimer_Elapsed(object sender, ElapsedEventArgs e)
- {
- try
- {
- this.MonitorTimer.Enabled = false;
- isHaveAlarm = false;
- foreach (var item in signAlarmSetting)
- {
- isHaveAlarm = isHaveAlarm ||
- this.plc.Simens_S7_ReadBool_DB(item.DBAddress, item.StartAddress, item.Length);
- }
+ //private void MonitorTimer_Elapsed_bak(object sender, ElapsedEventArgs e)
+ //{
+ // try
+ // {
+ // this.MonitorTimer.Enabled = false;
+ // isHaveAlarm = false;
+ // foreach (var item in signAlarmSetting)
+ // {
+ // //isHaveAlarm = isHaveAlarm ||
+ // // this.plc.Simens_S7_ReadBool_DB(item.DBAddress, item.StartAddress, item.Length);
+ // }
- ////鏈夋姤璀�
- if (isHaveAlarm)
- {
- this.isNewAlarm = false;
- this.currentAlarmCachePlc.Clear();
- RefreshDBSetting();
- for (int i = 0; i < ((int)alarmCodeBytes.Length / 4); i++)
- {
- int code = S7.GetDIntAt(alarmCodeBytes, 4 * i);
- ////鏈夋姤璀�
- if (code != 0)
- {
- string acode = string.Format("{0:d10}", code);
- alarm = this.alarmTexts.Find(item => item.AlarmCode == acode);
- if (alarm != null)
- {
- alarm.Source = "PLC";
- alarm.Time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- this.currentAlarmCachePlc.Add(alarm);
- ////鏈夋柊鎶ヨ
- if (this.preAlarmCachePlc.Find(alarm => alarm.AlarmCode == acode) == null)
- {
- this.isNewAlarm = true;
- this.SendLogMsg(alarm.ModuleName_CN + alarm.MAlarmText_CN);
- }
- }
- }
- }
+ // ////鏈夋姤璀�
+ // if (isHaveAlarm)
+ // {
+ // this.isNewAlarm = false;
+ // this.currentAlarmCachePlc.Clear();
+ // RefreshDBSetting();
+ // for (int i = 0; i < ((int)alarmCodeBytes.Length / 4); i++)
+ // {
+ // int code = S7.GetDIntAt(alarmCodeBytes, 4 * i);
+ // ////鏈夋姤璀�
+ // if (code != 0)
+ // {
+ // string acode = string.Format("{0:d10}", code);
+ // alarm = AlarmTexts.FirstOrDefault(item => item.AlarmCode == acode);
+ // if (alarm != null)
+ // {
+ // alarm.Source = "PLC";
+ // alarm.Time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ // this.currentAlarmCachePlc.Add(alarm);
+ // ////鏈夋柊鎶ヨ
+ // if (this.preAlarmCachePlc.Find(alarm => alarm.AlarmCode == acode) == null)
+ // {
+ // this.isNewAlarm = true;
+ // this.SendLogMsg(alarm.ModuleName_CN + alarm.MAlarmText_CN);
+ // }
+ // }
+ // }
+ // }
- ////鏈夋柊鎶ヨ鍜屾姤璀﹀噺灏戞椂鍒锋柊鎶ヨ琛�
- if (this.isNewAlarm || (this.currentAlarmCachePlc.Count != this.preAlarmCachePlc.Count))
- {
- this.currentAlarmCachePlcToMain = XmlHelper.DeepClone(this.currentAlarmCachePlc);
- this.RefershAlarm();
- }
+ // ////鏈夋柊鎶ヨ鍜屾姤璀﹀噺灏戞椂鍒锋柊鎶ヨ琛�
+ // if (this.isNewAlarm || (this.currentAlarmCachePlc.Count != this.preAlarmCachePlc.Count))
+ // {
+ // this.currentAlarmCachePlcToMain = XmlHelper.DeepClone(this.currentAlarmCachePlc);
+ // this.RefershAlarm();
+ // }
- this.preAlarmCachePlc.Clear();
- this.preAlarmCachePlc = XmlHelper.DeepClone(this.currentAlarmCachePlc);
- }
- else
- {
- if (this.preAlarmCachePlc.Count != 0 || this.currentAlarmCachePlcToMain.Count != 0 || this.currentAlarmCachePlc.Count != 0)
- {
- this.preAlarmCachePlc.Clear();
- this.currentAlarmCachePlcToMain.Clear();
- this.currentAlarmCachePlc.Clear();
- this.RefershAlarm();
- }
- }
- }
- catch (Exception ex)
- {
- log.Error("sdadsa", ex);
- }
- finally
- {
- this.MonitorTimer.Enabled = true;
- }
- }
-
- /// <summary>
- /// 鍒锋柊鎶ヨ鍧椾俊鎭�
- /// </summary>
- private void RefreshDBSetting()
- {
- List<byte> bytes = new List<byte>();
- foreach (var item in alarmSettings)
- {
- byte[] itemalarmCodeBytes = this.plc.Simens_S7_ReadBytes_DB("DB", item.DBAddress, item.StartAddress, item.Length);
- bytes.AddRange(itemalarmCodeBytes.ToList());
- }
- alarmCodeBytes = bytes.ToArray();
- }
-
- /// <summary>
- /// 鍒锋柊鎶ヨ淇℃伅
- /// </summary>
- private void RefershAlarm()
- {
- this.alarmRefershToMain.Send("AlarmRefersh", string.Empty);
-
- foreach (AlarmText alarm in this.currentAlarmCachePlc)
- {
- this.currentInfo = alarm.ModuleName_CN + alarm.MAlarmText_CN;
- Model.Datasource.Add(alarm);
- string sqladd = string.Format("INSERT INTO Alarm (source, alarmcode, alarminfo, time) VALUES( '{0}','{1}','{2}','{3}');",
- alarm.Source, alarm.AlarmCode, this.currentInfo, alarm.Time);
- sqliteHelper.ExecuteSql(sqladd);
- }
-
- foreach (AlarmText alarm in this.currentAlarmCachePc)
- {
-
- Model.Datasource.Add(alarm);
- string sqladd2 = string.Format("INSERT INTO Alarm (source, alarmcode, alarminfo, time) VALUES( '{0}','{1}','{2}','{3}');", alarm.Source, alarm.AlarmCode, this.currentInfo, alarm.Time);
- this.sqliteHelper.ExecuteSql(sqladd2);
- }
- }
-
- /// <summary>
- /// 鍙戦�佹棩蹇楁秷鎭�
- /// </summary>
- /// <param name="Msg">鏃ュ織娑堟伅</param>
- private void SendLogMsg(string Msg)
- {
- string LogMsg = "{\"Type\":\"Alarm\",\"Source\":\"" + alarm.Source + "\",\"Msg\":\"" + Msg + "\",\"Time\":\"" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "\"}";
- this.loggeralarm.Send("Log", LogMsg);
- }
-
- public override void SetBaseFolder(string folder)
- {
- base.SetBaseFolder(folder);
- blockPath = Path.Combine(BaseFolder, "BlockSetting.xml");
- markPath = Path.Combine(BaseFolder, "MarkSetting.xml");
- textSettingPath = Path.Combine(BaseFolder, "textSetting.xml");
- }
+ // this.preAlarmCachePlc.Clear();
+ // this.preAlarmCachePlc = XmlHelper.DeepClone(this.currentAlarmCachePlc);
+ // }
+ // else
+ // {
+ // if (this.preAlarmCachePlc.Count != 0 || this.currentAlarmCachePlcToMain.Count != 0 || this.currentAlarmCachePlc.Count != 0)
+ // {
+ // this.preAlarmCachePlc.Clear();
+ // this.currentAlarmCachePlcToMain.Clear();
+ // this.currentAlarmCachePlc.Clear();
+ // this.RefershAlarm();
+ // }
+ // }
+ // }
+ // catch (Exception ex)
+ // {
+ // log.Error("sdadsa", ex);
+ // }
+ // finally
+ // {
+ // this.MonitorTimer.Enabled = true;
+ // }
+ //}
}
}
--
Gitblit v1.9.1