kshkulev/hcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix device metering history export

Browse Source
This commit is contained in:
HOME-LAPTOP\kshkulev
2025-09-17 18:10:54 +09:00
parent 4cb9b72d6c
commit 814f40df0c
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Hcs.Client/Client/Api/Registry/Registry27.cs
View File

@ -11,6 +11,6 @@
/// </summary> /// </summary>
public static RegistryElement Element1 => new( public static RegistryElement Element1 => new(
"1", "1",
"3e86b303-62be-4837-91c1-ed2475702c65"); "3a9687b5-caed-4ec6-8a08-f4d3d012f2c7");
} }
} }

41
Hcs.Client/Client/Api/Request/DeviceMetering/ExportMeteringDeviceHistoryRequest.cs
View File

@ -70,35 +70,44 @@ namespace Hcs.Client.Api.Request.DeviceMetering
{ {
var items = new List<object>(); var items = new List<object>();
var itemsElementName = new List<ItemsChoiceType4>(); var itemsElementName = new List<ItemsChoiceType4>();
foreach (var meteringDeviceType in payload.meteringDeviceType) if (payload.meteringDeviceType != null)
{ {
items.Add(new nsiRef() foreach (var meteringDeviceType in payload.meteringDeviceType)
{ {
Code = meteringDeviceType.Code, items.Add(new nsiRef()
GUID = meteringDeviceType.GUID {
}); Code = meteringDeviceType.Code,
itemsElementName.Add(ItemsChoiceType4.MeteringDeviceType); GUID = meteringDeviceType.GUID
});
itemsElementName.Add(ItemsChoiceType4.MeteringDeviceType);
}
} }
foreach (var municipalResource in payload.municipalResource) if (payload.municipalResource != null)
{ {
items.Add(new nsiRef() foreach (var municipalResource in payload.municipalResource)
{ {
Code = municipalResource.Code, items.Add(new nsiRef()
GUID = municipalResource.GUID {
}); Code = municipalResource.Code,
itemsElementName.Add(ItemsChoiceType4.MunicipalResource); GUID = municipalResource.GUID
});
itemsElementName.Add(ItemsChoiceType4.MunicipalResource);
}
} }
foreach (var meteringDeviceRootGUID in payload.meteringDeviceRootGUID) if (payload.meteringDeviceRootGUID != null)
{ {
items.Add(meteringDeviceRootGUID); foreach (var meteringDeviceRootGUID in payload.meteringDeviceRootGUID)
itemsElementName.Add(ItemsChoiceType4.MeteringDeviceRootGUID); {
items.Add(meteringDeviceRootGUID);
itemsElementName.Add(ItemsChoiceType4.MeteringDeviceRootGUID);
}
} }
// http://open-gkh.ru/DeviceMetering/exportMeteringDeviceHistoryRequest.html // http://open-gkh.ru/DeviceMetering/exportMeteringDeviceHistoryRequest.html
var request = new exportMeteringDeviceHistoryRequest var request = new exportMeteringDeviceHistoryRequest
{ {
Id = Constants.SIGNED_XML_ELEMENT_ID, Id = Constants.SIGNED_XML_ELEMENT_ID,
version = "15.7.0.1", version = "13.1.3.1",
FIASHouseGuid = payload.fiasHouseGuid, FIASHouseGuid = payload.fiasHouseGuid,
Items = [.. items], Items = [.. items],
ItemsElementName = [.. itemsElementName] ItemsElementName = [.. itemsElementName]