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

Add new service and resource types

Browse Source
This commit is contained in:
HOME-LAPTOP\kshkulev
2025-08-22 09:29:19 +09:00
parent 875e3470d8
commit f1823414f1
3 changed files with 52 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Hcs.Client/ClientApi/HouseManagementApi/HcsHouseManagementNsi.cs
View File

@ -79,6 +79,7 @@ namespace Hcs.ClientApi.HouseManagementApi
Name = "Электроснабжение" Name = "Электроснабжение"
}; };
// TODO: Подставить корректный код и ГУИД
public static HouseManagement.ContractSubjectTypeMunicipalResource ElectricSupplyMunicipalResource public static HouseManagement.ContractSubjectTypeMunicipalResource ElectricSupplyMunicipalResource
=> new HouseManagement.ContractSubjectTypeMunicipalResource() => new HouseManagement.ContractSubjectTypeMunicipalResource()
{ {
@ -86,5 +87,40 @@ namespace Hcs.ClientApi.HouseManagementApi
GUID = "7379be86-6c95-4e41-b000-3bc703d35969", GUID = "7379be86-6c95-4e41-b000-3bc703d35969",
Name = "Электрическая энергия" Name = "Электрическая энергия"
}; };
public static HouseManagement.ContractSubjectTypeServiceType HeatingSupplyServiceType
=> new HouseManagement.ContractSubjectTypeServiceType()
{
Code = "6",
GUID = "74925764-ddf3-4b4b-b18d-85994187c13a",
Name = "Отопление"
};
public static HouseManagement.ContractSubjectTypeMunicipalResource HeatingSupplyMunicipalResource
=> new HouseManagement.ContractSubjectTypeMunicipalResource()
{
// Значения взяты из справочника 239
Code = "4",
GUID = "eec6e4b8-76c8-4fce-99b7-c95718edad19",
Name = null
};
public static HouseManagement.ContractSubjectTypeServiceType HotWaterSupplyServiceType
=> new HouseManagement.ContractSubjectTypeServiceType()
{
Code = "2",
GUID = "ee8c6a41-aaf8-41c8-a1f6-5832cc622f88",
Name = null
};
// TODO: Подставить корректный код и ГУИД
public static HouseManagement.ContractSubjectTypeMunicipalResource HotWaterSupplyMunicipalResource
=> new HouseManagement.ContractSubjectTypeMunicipalResource()
{
Code = "2.2",
GUID = "1471de55-c2e7-4101-9f2a-9bef6fffb896",
Name = "Горячая вода 2"
};
} }
} }

10
Hcs.Client/ClientApi/HouseManagementApi/HcsMethodImportSupplyResourceContractData.cs
View File

@ -152,8 +152,8 @@ namespace Hcs.ClientApi.HouseManagementApi
Guid contractSubjectGuid = Guid.NewGuid(); Guid contractSubjectGuid = Guid.NewGuid();
contract.ContractSubject = [ contract.ContractSubject = [
new HouseManagement.SupplyResourceContractTypeContractSubject() { new HouseManagement.SupplyResourceContractTypeContractSubject() {
ServiceType = HcsHouseManagementNsi.ElectricSupplyServiceType, ServiceType = HcsHouseManagementNsi.HeatingSupplyServiceType,
MunicipalResource = HcsHouseManagementNsi.ElectricSupplyMunicipalResource, MunicipalResource = HcsHouseManagementNsi.HeatingSupplyMunicipalResource,
StartSupplyDate = (договор.ДатаЗаключения != null ? (DateTime)договор.ДатаЗаключения : DateTime.Now), StartSupplyDate = (договор.ДатаЗаключения != null ? (DateTime)договор.ДатаЗаключения : DateTime.Now),
EndSupplyDate = DateTime.Now.AddYears(50), EndSupplyDate = DateTime.Now.AddYears(50),
TransportGUID = FormatGuid(contractSubjectGuid) TransportGUID = FormatGuid(contractSubjectGuid)
@ -299,6 +299,12 @@ namespace Hcs.ClientApi.HouseManagementApi
pair.StartSupplyDate = startSupplyDate; pair.StartSupplyDate = startSupplyDate;
// TODO: Проверить комментарий // TODO: Проверить комментарий
pair.EndSupplyDateSpecified = false; // Не указана дата окончания поставки ресурса pair.EndSupplyDateSpecified = false; // Не указана дата окончания поставки ресурса
// TODO: Необходимо указывать только для отопления и ГВС, нужен рефактор кода
pair.HeatingSystemType = new HouseManagement.SupplyResourceContractTypeObjectAddressPairHeatingSystemType()
{
OpenOrNot = HouseManagement.SupplyResourceContractTypeObjectAddressPairHeatingSystemTypeOpenOrNot.Closed,
CentralizedOrNot = HouseManagement.SupplyResourceContractTypeObjectAddressPairHeatingSystemTypeCentralizedOrNot.Centralized
};
var address = new HouseManagement.SupplyResourceContractTypeObjectAddress() var address = new HouseManagement.SupplyResourceContractTypeObjectAddress()
{ {

14
Hcs.Client/ClientApi/HouseManagementApi/HcsMethodImportSupplyResourceContractObjectAddress.cs
View File

@ -84,18 +84,20 @@ namespace Hcs.ClientApi.HouseManagementApi
Guid transportGuid = Guid.NewGuid(); Guid transportGuid = Guid.NewGuid();
// TODO: Эти значения должны быть регулируемыми
var serviceType = new HouseManagement.ContractSubjectObjectAdressTypeServiceType() var serviceType = new HouseManagement.ContractSubjectObjectAdressTypeServiceType()
{ {
Code = HcsHouseManagementNsi.ElectricSupplyServiceType.Code, Code = HcsHouseManagementNsi.HeatingSupplyServiceType.Code,
GUID = HcsHouseManagementNsi.ElectricSupplyServiceType.GUID, GUID = HcsHouseManagementNsi.HeatingSupplyServiceType.GUID,
Name = HcsHouseManagementNsi.ElectricSupplyServiceType.Name Name = HcsHouseManagementNsi.HeatingSupplyServiceType.Name
}; };
// TODO: Эти значения должны быть регулируемыми
var municipalResource = new HouseManagement.ContractSubjectObjectAdressTypeMunicipalResource() var municipalResource = new HouseManagement.ContractSubjectObjectAdressTypeMunicipalResource()
{ {
Code = HcsHouseManagementNsi.ElectricSupplyMunicipalResource.Code, Code = HcsHouseManagementNsi.HeatingSupplyMunicipalResource.Code,
GUID = HcsHouseManagementNsi.ElectricSupplyMunicipalResource.GUID, GUID = HcsHouseManagementNsi.HeatingSupplyMunicipalResource.GUID,
Name = HcsHouseManagementNsi.ElectricSupplyMunicipalResource.Name Name = HcsHouseManagementNsi.HeatingSupplyMunicipalResource.Name
}; };
var pair = new HouseManagement.importSupplyResourceContractObjectAddressRequestObjectAddressLoadObjectPair() var pair = new HouseManagement.importSupplyResourceContractObjectAddressRequestObjectAddressLoadObjectPair()