mirror of
https://gitee.com/ThingsGateway/ThingsGateway.git
synced 2025-11-01 08:03:58 +08:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dbee8496cb | ||
|
|
044e78bea9 |
@@ -1,9 +1,9 @@
|
|||||||
<Project>
|
<Project>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PluginVersion>10.9.26</PluginVersion>
|
<PluginVersion>10.9.28</PluginVersion>
|
||||||
<ProPluginVersion>10.9.26</ProPluginVersion>
|
<ProPluginVersion>10.9.26</ProPluginVersion>
|
||||||
<DefaultVersion>10.9.26</DefaultVersion>
|
<DefaultVersion>10.9.28</DefaultVersion>
|
||||||
<AuthenticationVersion>2.9.13</AuthenticationVersion>
|
<AuthenticationVersion>2.9.13</AuthenticationVersion>
|
||||||
<SourceGeneratorVersion>10.9.13</SourceGeneratorVersion>
|
<SourceGeneratorVersion>10.9.13</SourceGeneratorVersion>
|
||||||
<NET8Version>8.0.17</NET8Version>
|
<NET8Version>8.0.17</NET8Version>
|
||||||
|
|||||||
@@ -116,7 +116,8 @@ public static class JsonUtils
|
|||||||
case BuiltInType.Int64: { return decoder.ReadInt64(fieldName); }
|
case BuiltInType.Int64: { return decoder.ReadInt64(fieldName); }
|
||||||
case BuiltInType.UInt64: { return decoder.ReadUInt64(fieldName); }
|
case BuiltInType.UInt64: { return decoder.ReadUInt64(fieldName); }
|
||||||
case BuiltInType.Float: { return decoder.ReadFloat(fieldName); }
|
case BuiltInType.Float: { return decoder.ReadFloat(fieldName); }
|
||||||
case BuiltInType.Double: { return decoder.ReadDouble(fieldName); }
|
case BuiltInType.Double:
|
||||||
|
case BuiltInType.Number: { return decoder.ReadDouble(fieldName); }
|
||||||
case BuiltInType.String:
|
case BuiltInType.String:
|
||||||
{
|
{
|
||||||
if (decoder.ReadField(fieldName, out var value))
|
if (decoder.ReadField(fieldName, out var value))
|
||||||
@@ -288,7 +289,7 @@ public static class JsonUtils
|
|||||||
}
|
}
|
||||||
case BuiltInType.Number:
|
case BuiltInType.Number:
|
||||||
{
|
{
|
||||||
encoder.WriteInt64(fieldName, Convert.ToInt64(value));
|
encoder.WriteDouble(fieldName, Convert.ToInt64(value));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
case BuiltInType.UInteger:
|
case BuiltInType.UInteger:
|
||||||
|
|||||||
@@ -95,12 +95,9 @@ public class ThingsGatewayNodeManager : CustomNodeManager2
|
|||||||
fs.EventNotifier = EventNotifiers.SubscribeToEvents;
|
fs.EventNotifier = EventNotifiers.SubscribeToEvents;
|
||||||
if (item?.Any() == true)
|
if (item?.Any() == true)
|
||||||
{
|
{
|
||||||
FolderState varFolder = CreateFolder(fs, "Variables", "Variables");
|
|
||||||
varFolder.AddReference(ReferenceTypes.Organizes, true, ObjectIds.ObjectsFolder);
|
|
||||||
varFolder.EventNotifier = EventNotifiers.SubscribeToEvents;
|
|
||||||
foreach (var item2 in item)
|
foreach (var item2 in item)
|
||||||
{
|
{
|
||||||
CreateVariable(varFolder, item2);
|
CreateVariable(fs, item2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -290,6 +287,8 @@ public class ThingsGatewayNodeManager : CustomNodeManager2
|
|||||||
return DataTypeIds.String;
|
return DataTypeIds.String;
|
||||||
if (tp == typeof(DateTime))
|
if (tp == typeof(DateTime))
|
||||||
return DataTypeIds.DateTime;
|
return DataTypeIds.DateTime;
|
||||||
|
if (tp == typeof(decimal))
|
||||||
|
return DataTypeIds.Decimal;
|
||||||
return DataTypeIds.String;
|
return DataTypeIds.String;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user