Skip to content

Mars
Mars

cdy816 / Mars

通知 3
Star 1
Fork 0
Mars
Mars

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 2eda557a 编写于 作者: cdy816's avatar cdy816
浏览文件
操作

解压查询Bug修改

上级 e37d1bb1
隐藏空白更改
内联 并排
Showing with 34 addition and 46 deletion
DataRunner/His/Compress/Special/NoneCompressUnit.cs
浏览文件 @ 2eda557a
......@@ -51,7 +51,7 @@ namespace Cdy.Tag
target.Write(this.StartTime);
target.Write((ushort)(size - this.QulityOffset));//写入值的个数
if (size > 0)
source.CopyTo(target, sourceAddr, targetAddr + 12, size);
source.CopyTo(target, sourceAddr, targetAddr + 10, size);
return size + 10;
}
......@@ -148,7 +148,14 @@ namespace Cdy.Tag
// return (int)count;
//}
/// <summary>
/// 读取时间戳
/// </summary>
/// <param name="source"></param>
/// <param name="sourceAddr"></param>
/// <param name="timeTick"></param>
/// <param name="startTime"></param>
/// <returns></returns>
private Dictionary<DateTime, int> ReadTimeQulity(MarshalMemoryBlock source, int sourceAddr, int timeTick, out DateTime startTime)
{
source.Position = sourceAddr;
......@@ -164,11 +171,6 @@ namespace Cdy.Tag
{
timeQulities.Add(startTime.AddMilliseconds(source.ReadUShort() * timeTick), i);
}
while (source.Position < source.Length)
{
timeQulities.Add(startTime.AddTicks(source.ReadUShort() * timeTick), source.ReadByte());
}
return timeQulities;
}
......@@ -189,14 +191,17 @@ namespace Cdy.Tag
DateTime time;
var qs = ReadTimeQulity(source, sourceAddr, timeTick, out time);
//读取质量戳,时间戳2个字节，值1个字节，质量戳1个字节
var qq = source.ReadBytes(qs.Count * 3, qs.Count);
//值地址
var valaddr = qs.Count * 2;
int i = 0;
int rcount = 0;
foreach(var vv in qs)
{
//如果时间戳大于100说明，是其他类型的值，故排除掉
if(qq[vv.Value] <100)
{
if (vv.Key < startTime || vv.Key > endTime)
......@@ -227,6 +232,7 @@ namespace Cdy.Tag
DateTime time;
var qs = ReadTimeQulity(source, sourceAddr, timeTick, out time);
//读取质量戳,时间戳2个字节，值1个字节，质量戳1个字节
var qq = source.ReadBytes(qs.Count * 3, qs.Count);
var valaddr = qs.Count * 2;
......@@ -266,6 +272,7 @@ namespace Cdy.Tag
DateTime time;
var qs = ReadTimeQulity(source, sourceAddr, timeTick, out time);
//读取质量戳,时间戳2个字节，值2个字节，质量戳1个字节
var qq = source.ReadBytes(qs.Count * 4, qs.Count);
var valaddr = qs.Count * 2;
......@@ -304,6 +311,7 @@ namespace Cdy.Tag
DateTime time;
var qs = ReadTimeQulity(source, sourceAddr, timeTick, out time);
//读取质量戳,时间戳2个字节，值2个字节，质量戳1个字节
var qq = source.ReadBytes(qs.Count * 4, qs.Count);
var valaddr = qs.Count * 2;
......@@ -342,6 +350,7 @@ namespace Cdy.Tag
DateTime time;
var qs = ReadTimeQulity(source, sourceAddr, timeTick, out time);
//读取质量戳,时间戳2个字节，值4个字节，质量戳1个字节
var qq = source.ReadBytes(qs.Count * 6, qs.Count);
var valaddr = qs.Count * 2;
......@@ -356,7 +365,7 @@ namespace Cdy.Tag
{
continue;
}
var bval = source.ReadUShort(valaddr + i * 4);
var bval = source.ReadInt(valaddr + i * 4);
result.Add(bval, vv.Key, qq[vv.Value]);
rcount++;
}
......@@ -380,6 +389,7 @@ namespace Cdy.Tag
DateTime time;
var qs = ReadTimeQulity(source, sourceAddr, timeTick, out time);
//读取质量戳,时间戳2个字节，值4个字节，质量戳1个字节
var qq = source.ReadBytes(qs.Count * 6, qs.Count);
var valaddr = qs.Count * 2;
......@@ -394,7 +404,7 @@ namespace Cdy.Tag
{
continue;
}
var bval = source.ReadUShort(valaddr + i * 4);
var bval = source.ReadUInt(valaddr + i * 4);
result.Add(bval, vv.Key, qq[vv.Value]);
rcount++;
}
......@@ -419,6 +429,7 @@ namespace Cdy.Tag
DateTime time;
var qs = ReadTimeQulity(source, sourceAddr, timeTick, out time);
//读取质量戳,时间戳2个字节，值8个字节，质量戳1个字节
var qq = source.ReadBytes(qs.Count * 10, qs.Count);
var valaddr = qs.Count * 2;
......@@ -433,7 +444,7 @@ namespace Cdy.Tag
{
continue;
}
var bval = source.ReadUShort(valaddr + i * 8);
var bval = source.ReadLong(valaddr + i * 8);
result.Add(bval, vv.Key, qq[vv.Value]);
rcount++;
}
......@@ -457,6 +468,7 @@ namespace Cdy.Tag
DateTime time;
var qs = ReadTimeQulity(source, sourceAddr, timeTick, out time);
//读取质量戳,时间戳2个字节，值8个字节，质量戳1个字节
var qq = source.ReadBytes(qs.Count * 10, qs.Count);
var valaddr = qs.Count * 2;
......@@ -471,7 +483,7 @@ namespace Cdy.Tag
{
continue;
}
var bval = source.ReadUShort(valaddr + i * 8);
var bval = source.ReadULong(valaddr + i * 8);
result.Add(bval, vv.Key, qq[vv.Value]);
rcount++;
}
......@@ -495,6 +507,7 @@ namespace Cdy.Tag
DateTime time;
var qs = ReadTimeQulity(source, sourceAddr, timeTick, out time);
//读取质量戳,时间戳2个字节，值4个字节，质量戳1个字节
var qq = source.ReadBytes(qs.Count * 6, qs.Count);
var valaddr = qs.Count * 2;
......@@ -509,7 +522,7 @@ namespace Cdy.Tag
{
continue;
}
var bval = source.ReadUShort(valaddr + i * 4);
var bval = source.ReadFloat(valaddr + i * 4);
result.Add(bval, vv.Key, qq[vv.Value]);
rcount++;
}
......@@ -533,6 +546,7 @@ namespace Cdy.Tag
DateTime time;
var qs = ReadTimeQulity(source, sourceAddr, timeTick, out time);
//读取质量戳,时间戳2个字节，值8个字节，质量戳1个字节
var qq = source.ReadBytes(qs.Count * 10, qs.Count);
var valaddr = qs.Count * 2;
......@@ -547,7 +561,7 @@ namespace Cdy.Tag
{
continue;
}
var bval = source.ReadUShort(valaddr + i * 8);
var bval = source.ReadDouble(valaddr + i * 8);
result.Add(bval, vv.Key, qq[vv.Value]);
rcount++;
}
......@@ -571,6 +585,7 @@ namespace Cdy.Tag
DateTime time;
var qs = ReadTimeQulity(source, sourceAddr, timeTick, out time);
//读取质量戳,时间戳2个字节，值8个字节，质量戳1个字节
var qq = source.ReadBytes(qs.Count * 10, qs.Count);
var valaddr = qs.Count * 2;
......@@ -585,7 +600,7 @@ namespace Cdy.Tag
{
continue;
}
var bval = source.ReadUShort(valaddr + i * 8);
var bval = source.ReadDateTime(valaddr + i * 8);
result.Add(bval, vv.Key, qq[vv.Value]);
rcount++;
}
......
DataRunner/His/HisEnginer.cs
浏览文件 @ 2eda557a
......@@ -287,6 +287,7 @@ namespace Cdy.Tag
//用于解码时在头尾分别记录前一个区域的值和后一个区域的值
count += 2;
//数据区偏移，时间戳占2个字节
dataOffset = regionHeadSize + count * 2;
switch (tagType)
{
......@@ -330,6 +331,7 @@ namespace Cdy.Tag
count = CachMemoryTime * 1000 / MemoryTimeTick;
}
//数据区偏移,时间戳占2个字节,质量戳占1个字节
dataOffset = headSize + count * 2;
switch (tagType)
{
......
DataRunner/His/HisQuery/QuerySerivce.cs
浏览文件 @ 2eda557a
......@@ -3155,7 +3155,7 @@ namespace Cdy.Tag
{
int preid = ltmp[0];
dtmp.Add(preid,0);
for (int i = 0; i < ltmp.Count; i++)
for (int i = 1; i < ltmp.Count; i++)
{
var id = ltmp[i] + preid;
dtmp.Add(id, i);
......
DataRunner/His/Tag/HisRunTag.cs
浏览文件 @ 2eda557a
......@@ -104,39 +104,10 @@ namespace Cdy.Tag
/// </summary>
public virtual byte SizeOfValue { get; }
///// <summary>
/////
///// </summary>
//public static int HeadSize
//{
// get
// {
// return 4;
// }
//}
///// <summary>
/////
///// </summary>
//public byte[] HeadDatas
//{
// get
// {
// return headBytes;
// }
//}
#endregion ...Properties...
#region ... Methods ...
//public void Init()
//{
// var hbyts = new List<byte>(4);
// hbyts.AddRange(BitConverter.GetBytes(this.HisQulityStartAddr - this.TimerValueStartAddr));
// headBytes = hbyts.ToArray();
//}
/// <summary>
///
......@@ -177,8 +148,8 @@ namespace Cdy.Tag
Count = vcount;
//数据内容: 时间戳(time1+time2+...) +数值区(value1+value2+...)+质量戳区(q1+q2+....)
//实时数据内存结构为:实时值+时间戳+质量戳
HisAddr.WriteIntDirect(TimerValueStartAddr + vcount * 2, tim + TimerOffset);
//实时数据内存结构为:实时值+时间戳+质量戳，时间戳2个字节，质量戳1个字节
HisAddr.WriteUShort(TimerValueStartAddr + vcount * 2, (ushort)(tim + TimerOffset));
//写入数值
//HisAddr.WriteBytesDirect(HisValueStartAddr + vcount * SizeOfValue, RealMemoryAddr, RealValueAddr, SizeOfValue);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或