|
@@ -392,7 +392,7 @@ namespace NumMachine
|
|
//号牌不为空
|
|
//号牌不为空
|
|
if (!(plateInformation.plate.Contains("_无_")))
|
|
if (!(plateInformation.plate.Contains("_无_")))
|
|
{
|
|
{
|
|
- Log.WriteLog(LogType.process, LogFile.INFO, nmn.id + "收到号牌回调信息: [" + plateInformation.plate + "]");
|
|
|
|
|
|
+ //Log.WriteLog(LogType.process, LogFile.INFO, nmn.id + "收到号牌回调信息: [" + plateInformation.plate + "]");
|
|
nmn.SetLic(strIP, nmn.id, plateInformation.plate, DateTime.Now.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss"), GetStatus(strIP));
|
|
nmn.SetLic(strIP, nmn.id, plateInformation.plate, DateTime.Now.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss"), GetStatus(strIP));
|
|
FilterLic(strIP, (NumberMachineNode)nmn.Clone());
|
|
FilterLic(strIP, (NumberMachineNode)nmn.Clone());
|
|
}
|
|
}
|
|
@@ -493,7 +493,7 @@ namespace NumMachine
|
|
while (enumer.MoveNext())
|
|
while (enumer.MoveNext())
|
|
{
|
|
{
|
|
////遍历,计数达标且队列中无此号牌
|
|
////遍历,计数达标且队列中无此号牌
|
|
- Log.WriteLog(LogType.process, LogFile.INFO, "filter中号牌:" + enumer.Current.Key.LicenseNum + ", 个数:" + enumer.Current.Value);
|
|
|
|
|
|
+ //Log.WriteLog(LogType.process, LogFile.INFO, "filter中号牌:" + enumer.Current.Key.LicenseNum + ", 个数:" + enumer.Current.Value);
|
|
//if (enumer.Current.Value >= (int)(filterCount * filterRatio) && enumer.Current.Key != null && !LicBuffer.Contains(enumer.Current.Key))
|
|
//if (enumer.Current.Value >= (int)(filterCount * filterRatio) && enumer.Current.Key != null && !LicBuffer.Contains(enumer.Current.Key))
|
|
//找到最大计数及相应号牌信息
|
|
//找到最大计数及相应号牌信息
|
|
if (enumer.Current.Value >= maxCount && enumer.Current.Key != null)// && !LicBuffer.Contains(enumer.Current.Key))
|
|
if (enumer.Current.Value >= maxCount && enumer.Current.Key != null)// && !LicBuffer.Contains(enumer.Current.Key))
|
|
@@ -503,7 +503,7 @@ namespace NumMachine
|
|
//{
|
|
//{
|
|
maxCount = enumer.Current.Value;
|
|
maxCount = enumer.Current.Value;
|
|
node = (NumberMachineNode)enumer.Current.Key.Clone();
|
|
node = (NumberMachineNode)enumer.Current.Key.Clone();
|
|
- Log.WriteLog(LogType.process, LogFile.INFO, "筛出号牌:" + node);
|
|
|
|
|
|
+ //Log.WriteLog(LogType.process, LogFile.INFO, "筛出号牌:" + node);
|
|
//}
|
|
//}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -971,13 +971,13 @@ namespace NumMachine
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ node = null;
|
|
int timeLimit = FILTERINGNUMBER * 2;
|
|
int timeLimit = FILTERINGNUMBER * 2;
|
|
while (node == null && timeLimit-- > 0)
|
|
while (node == null && timeLimit-- > 0)
|
|
{
|
|
{
|
|
lock (LicBuffer)
|
|
lock (LicBuffer)
|
|
{
|
|
{
|
|
- Log.WriteLog(LogType.process, LogFile.INFO, "licBuffer 元素个数:" + LicBuffer.Count);
|
|
|
|
|
|
+ //Log.WriteLog(LogType.process, LogFile.INFO, "licBuffer 元素个数:" + LicBuffer.Count);
|
|
for (int i = 0; i < LicBuffer.Count; i++)
|
|
for (int i = 0; i < LicBuffer.Count; i++)
|
|
{
|
|
{
|
|
node = LicBuffer.Dequeue();
|
|
node = LicBuffer.Dequeue();
|
|
@@ -986,12 +986,12 @@ namespace NumMachine
|
|
if (node.id == id && node.LicenseNum != "")
|
|
if (node.id == id && node.LicenseNum != "")
|
|
{
|
|
{
|
|
license = node.LicenseNum;
|
|
license = node.LicenseNum;
|
|
- Log.WriteLog(LogType.process, LogFile.INFO, "license: " + license + ", id: " + id);
|
|
|
|
|
|
+ //Log.WriteLog(LogType.process, LogFile.INFO, "license: " + license + ", id: " + id);
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
- Log.WriteLog(LogType.process, LogFile.INFO, "other license: " + node.LicenseNum + ", id: " + node.id);
|
|
|
|
|
|
+ //Log.WriteLog(LogType.process, LogFile.INFO, "other license: " + node.LicenseNum + ", id: " + node.id);
|
|
LicBuffer.Enqueue(node);
|
|
LicBuffer.Enqueue(node);
|
|
}
|
|
}
|
|
}
|
|
}
|