|
|
|
@ -3,6 +3,7 @@ using Admin.Core.Model;
|
|
|
|
using log4net;
|
|
|
|
using log4net;
|
|
|
|
using Serilog;
|
|
|
|
using Serilog;
|
|
|
|
using StackExchange.Profiling.Internal;
|
|
|
|
using StackExchange.Profiling.Internal;
|
|
|
|
|
|
|
|
using System.Timers;
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
/// 测温数据采集
|
|
|
|
/// 测温数据采集
|
|
|
|
@ -17,7 +18,7 @@ namespace Aucma.Core.TemperatureTask
|
|
|
|
private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(AucamTemperatureMeasurementService));
|
|
|
|
private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(AucamTemperatureMeasurementService));
|
|
|
|
private readonly ITestedCodeMESServices _codeMESServices;
|
|
|
|
private readonly ITestedCodeMESServices _codeMESServices;
|
|
|
|
private readonly ITemperatureHistoryServices _temperatureHistoryServices;
|
|
|
|
private readonly ITemperatureHistoryServices _temperatureHistoryServices;
|
|
|
|
|
|
|
|
System.Timers.Timer timer1 = new System.Timers.Timer(5000);
|
|
|
|
bool flag = true;
|
|
|
|
bool flag = true;
|
|
|
|
public AucamTemperatureMeasurementService(ITemperatureHistoryServices temperatureHistoryServices,
|
|
|
|
public AucamTemperatureMeasurementService(ITemperatureHistoryServices temperatureHistoryServices,
|
|
|
|
ITestedCodeMESServices codeMESServices)
|
|
|
|
ITestedCodeMESServices codeMESServices)
|
|
|
|
@ -28,11 +29,10 @@ namespace Aucma.Core.TemperatureTask
|
|
|
|
|
|
|
|
|
|
|
|
public void Execute()
|
|
|
|
public void Execute()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
while (true)
|
|
|
|
timer1.Elapsed += new System.Timers.ElapsedEventHandler(Run); //到达时间的时候执行事件；
|
|
|
|
{
|
|
|
|
timer1.AutoReset = true;//设置是执行一次（false）还是一直执行(true)；
|
|
|
|
Run();
|
|
|
|
timer1.Enabled = true;//需要调用 timer.Start()或者timer.Enabled = true来启动它，
|
|
|
|
Thread.Sleep(5000);
|
|
|
|
timer1.Start();//timer.Start()的内部原理还是设置timer.Enabled = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#region 采集任务处理
|
|
|
|
#region 采集任务处理
|
|
|
|
@ -40,87 +40,69 @@ namespace Aucma.Core.TemperatureTask
|
|
|
|
/// 采集任务处理
|
|
|
|
/// 采集任务处理
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
|
/// <returns></returns>
|
|
|
|
/// <returns></returns>
|
|
|
|
public async void Run()
|
|
|
|
private void Run(object? sender, ElapsedEventArgs e)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
try
|
|
|
|
try
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
Console.WriteLine($"【{DateTime.Now}】开始读取测温数据");
|
|
|
|
if (flag)
|
|
|
|
if (flag)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
try
|
|
|
|
try
|
|
|
|
{
|
|
|
|
{
|
|
|
|
flag = false;
|
|
|
|
flag = false;
|
|
|
|
|
|
|
|
|
|
|
|
DateTime dt;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Console.WriteLine($"【{DateTime.Now}】开始读取测温数据");
|
|
|
|
var historyList = _codeMESServices.QueryAsync(d=>d.IsSync==0).Result;
|
|
|
|
string sql = "select top 1 * from TemperatureHistory order by SyncDate desc";
|
|
|
|
Console.WriteLine(historyList.ToJson());
|
|
|
|
var allList= await _temperatureHistoryServices.QuerySqlAsync(sql,null);
|
|
|
|
|
|
|
|
if (allList == null || allList.Count == 0)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
dt = DateTime.Now.AddMinutes(-5);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
TemperatureHistory maxHistory = allList.First();
|
|
|
|
|
|
|
|
if (maxHistory.SyncDate.ToString()==null)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
dt = Convert.ToDateTime(maxHistory.EndDateTime);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
dt = Convert.ToDateTime(maxHistory.SyncDate);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var historyList = _codeMESServices.QueryTemperatureHistory(dt);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var query = (from a in historyList
|
|
|
|
var query = (from a in historyList
|
|
|
|
select new TemperatureHistory
|
|
|
|
select new TemperatureHistory
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Line_No = a.Line_No,
|
|
|
|
Line_No = a.Line_No,
|
|
|
|
Gongwno = a.Gongwno,
|
|
|
|
GongwNo = a.GongwNo,
|
|
|
|
CpNo = a.CpNo,
|
|
|
|
CpNo = a.CpNo,
|
|
|
|
CpModel = a.CpModel,
|
|
|
|
CpModel = a.CpModel,
|
|
|
|
FactoryModel = a.FactoryModel,
|
|
|
|
FactoryModel = a.factoryModel,
|
|
|
|
Voltage = a.Voltage,
|
|
|
|
Voltage = a.Voltage,
|
|
|
|
|
|
|
|
Frequency = a.Frequency,
|
|
|
|
Point2 = a.Point2,
|
|
|
|
Point2 = a.Point2,
|
|
|
|
TestTime = a.TestTime,
|
|
|
|
TestTime = a.TestTime,
|
|
|
|
TestedTime = a.TestedTime,
|
|
|
|
TestedTime = a.TestedTime,
|
|
|
|
Etemp = a.Etemp,
|
|
|
|
Etemp = a.Etemp,
|
|
|
|
BeginDateTime = a.BeginDateTime,
|
|
|
|
BeginDateTime =Convert.ToDateTime(a.BeginDateTime),
|
|
|
|
CpResult = a.CpResult,
|
|
|
|
CpResult = a.CpResult,
|
|
|
|
EndDateTime = a.EndDateTime,
|
|
|
|
EndDateTime = Convert.ToDateTime(a.EndDateTime),
|
|
|
|
UserName = a.UserName,
|
|
|
|
UserName = a.UserName,
|
|
|
|
Remark = a.Remark,
|
|
|
|
Remark = a.Remark,
|
|
|
|
TestNo = a.TestNo,
|
|
|
|
TestNo = a.TestNo,
|
|
|
|
Temp_Mes = a.Temp_Mes,
|
|
|
|
Temp_Mes = a.Temp_Mes,
|
|
|
|
Power_Mes = a.Power_Mes,
|
|
|
|
Power_Mes = a.Power_Mes,
|
|
|
|
Part_Mes = a.Part_Mes,
|
|
|
|
Part_Mes = a.Part_Mes,
|
|
|
|
ErrorCode_Mes = a.ErrorCode_Mes,
|
|
|
|
|
|
|
|
T1Name = a.T1Name,
|
|
|
|
|
|
|
|
T2Name = a.T2Name,
|
|
|
|
|
|
|
|
T3Name = a.T3Name,
|
|
|
|
|
|
|
|
T4Name = a.T4Name,
|
|
|
|
|
|
|
|
T5Name = a.T5Name,
|
|
|
|
|
|
|
|
T6Name = a.T6Name,
|
|
|
|
|
|
|
|
IsOrder = a.IsOrder,
|
|
|
|
|
|
|
|
LowV_Time = a.LowV_Time,
|
|
|
|
LowV_Time = a.LowV_Time,
|
|
|
|
LowV_PowerMin = a.LowV_PowerMin,
|
|
|
|
LowV_PowerMin = a.LowV_PowerMin,
|
|
|
|
LowV_PowerMax = a.LowV_PowerMax,
|
|
|
|
LowV_PowerMax = a.LowV_PowerMax,
|
|
|
|
LowV_PowerFact = a.LowV_PowerFact,
|
|
|
|
LowV_PowerFact = a.LowV_PowerFact,
|
|
|
|
LowVoltage = a.LowVoltage,
|
|
|
|
LowVoltage = a.LowVoltage,
|
|
|
|
SyncDate = dt
|
|
|
|
SyncDate =DateTime.Now
|
|
|
|
}).ToList();
|
|
|
|
}).ToList();
|
|
|
|
|
|
|
|
|
|
|
|
if (query == null|| query.Count==0) return;
|
|
|
|
if (query == null || query.Count == 0) return;
|
|
|
|
|
|
|
|
logHelper.Error($"读取数据个数:{historyList.Count()}");
|
|
|
|
Console.WriteLine($"【{DateTime.Now}】读取数据个数:{historyList.Count()}");
|
|
|
|
Console.WriteLine($"【{DateTime.Now}】读取数据个数:{historyList.Count()}");
|
|
|
|
var result = await _temperatureHistoryServices.AddAsync(query);
|
|
|
|
var result = _temperatureHistoryServices.AddAsync(query).Result;
|
|
|
|
if (result > 0)
|
|
|
|
if (result > 0)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Console.WriteLine($"【{DateTime.Now}】保存测温数据成功！保存数量：{query.Count}");
|
|
|
|
historyList.ForEach(d => d.IsSync = 1);
|
|
|
|
|
|
|
|
int r = _codeMESServices.UpateTemperatureHistoryFlag(historyList);
|
|
|
|
|
|
|
|
if (r > 0)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
Console.WriteLine($"【{DateTime.Now}】保存测温数据成功！保存数量：{query.Count}");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Thread.Sleep(50000);
|
|
|
|
Console.WriteLine($"【{DateTime.Now}】测温数据同步成功！数量：{query.Count}");
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch (Exception ex)
|
|
|
|
catch (Exception ex)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
liulb@mesnac.com
1 year ago