transit

SocialMinistryDataExchange/Controllers/apiController.cs

@@ -20,7 +20,7 @@ namespace SocialMinistryDataExchange.Controllers {
         public async Task<string> PutXMLDefenceStatus() {
             var request = System.IO.File.ReadAllText("Model/reference/Request.xml");
             var responce = await _repository.PutDefenceStatus(request);
-            return String.Empty;
+            return responce;
         }
 
         // тестовый запрос зачисленности личности
@@ -43,6 +43,8 @@ namespace SocialMinistryDataExchange.Controllers {
                             PersonName = "Василий",
                             PersonSurname = "Алибабаевич",
                             PersonBirthday = DateTime.Parse("2015-01-01"),
+                            PersonSnils = "12345678",
+                            Territory = "Пермский ГО (г. Пермь)",
                             },
                         PersonOccupation = new SMPersonOccupationStatus()
                     },
@@ -54,7 +56,7 @@ namespace SocialMinistryDataExchange.Controllers {
                                 PersonDocumentNumber = "123456",
                                 PersonDocumentDate = DateTime.Parse("2010-01-01"),
                             },
-                            PersonFamilyName = "Мкртчян",
+                            PersonFamilyName = "Мкртчя",
                             PersonName = "Василий",
                             PersonSurname = "Алибабаевич",
                             PersonBirthday = DateTime.Parse("2015-01-01"),

SocialMinistryDataExchange/Model/Contingent/Center/Contingent_center_Context.cs

@@ -5,6 +5,8 @@
 namespace SocialMinistryDataExchange.Model.Contingent.Center
 {
     public partial class Contingent_center_Context : DbContext, IContingentContext {
+        
+
         public Contingent_center_Context()
         {
         }

SocialMinistryDataExchange/Model/EscpSD/SM_EscpXSD.cs

@@ -9,25 +9,77 @@ namespace SocialMinistryDataExchange.Model.EscpSD {
     [XmlType(AnonymousType = true, Namespace = "urn://ru.permkrai.ecsp/mv/ecsp-sending-status-maloimushch")]
     [XmlRoot(Namespace = "urn://ru.permkrai.ecsp/mv/ecsp-sending-status-maloimushch", IsNullable = false)]
     public partial class EcspSendingStatusMaloimushch {
-        public string PrimaryKey { get; set; }
-        [XmlElement(DataType = "date")]
-        public DateTime DateTime { get; set; }
-        public string OrganSZ { get; set; }
-        public byte ObshKolChlenovSem { get; set; }
-        public string LgotKat { get; set; }
-        public decimal SrednedushevoiDohod { get; set; }
-        public decimal ProzhitMinimum { get; set; }
-        [XmlElement(DataType = "date")]
-        public DateTime SrokDeistviiaS { get; set; }
-        [XmlElement(DataType = "date")]
-        public DateTime SrokDeistviiaDo { get; set; }
-        
+        [XmlElement(ElementName = "PrimaryKey")]
+        public string MsgID { get; set; }
+        [XmlElement(DataType = "date", ElementName = "DateTime")]
+        public DateTime MsgDataTime { get; set; }
+
         [XmlElement(ElementName = "Leechnost")]
         public Person Person { get; set; }
         [XmlElement(ElementName = "Semya")]
         public Family? Family { get; set; }
+
+        public PersonStatus PersonSDStatus { get; set; } = new();
+
+        [XmlElement(ElementName = "OrganSZ")]
+        public string SDDepartment {
+            get { return PersonSDStatus.SDDepartment; } 
+            set { PersonSDStatus.SDDepartment = value; } 
+        }
+        [XmlElement(ElementName = "ObshKolChlenovSem")]
+        public byte FamilyPersonsCount {
+            get { return PersonSDStatus.FamilyPersonsCount; } 
+            set { PersonSDStatus.FamilyPersonsCount = value; } 
+        }
+        [XmlElement(ElementName = "LgotKat")]
+        public string Status {
+            get { return PersonSDStatus.Status; }
+            set { PersonSDStatus.Status = value; } 
+        }
+        [XmlElement(ElementName = "SrednedushevoiDohod")]
+        public decimal AvgIncome {
+            get { return PersonSDStatus.AvgIncome; }
+            set { PersonSDStatus.AvgIncome = value; } 
+        }
+        [XmlElement(ElementName = "ProzhitMinimum")]
+        public decimal MinIncome {
+            get { return PersonSDStatus.MinIncome; }
+            set { PersonSDStatus.MinIncome = value; } 
+        }
+        [XmlElement(DataType = "date", ElementName = "SrokDeistviiaS")]
+        public DateTime StartDate {
+            get { return PersonSDStatus.StartDate; }
+            set { PersonSDStatus.StartDate = value; } 
+        }
+        [XmlElement(DataType = "date", ElementName = "SrokDeistviiaDo")]
+        public DateTime EndDate {
+            get { return PersonSDStatus.EndDate; }
+            set { PersonSDStatus.EndDate = value; } 
+        }
+    }
+    [Serializable()]
+    [DesignerCategory("code")]
+    [XmlType(AnonymousType = true, Namespace = "urn://ru.permkrai.ecsp/mv/ecsp-sending-status-maloimushch")]
+    public class PersonStatus {
+        [XmlElement(ElementName = "OrganSZ")]
+        public string SDDepartment { get; set; }
+        [XmlElement(ElementName = "LgotKat")]
+        public string Status { get; set; }
+        [XmlElement(DataType = "date", ElementName = "SrokDeistviiaS")]
+        public DateTime StartDate { get; set; }
+        [XmlElement(DataType = "date", ElementName = "SrokDeistviiaDo")]
+        public DateTime EndDate { get; set; }
+        [XmlElement(ElementName = "SrednedushevoiDohod")]
+        public decimal AvgIncome { get; set; }
+        [XmlElement(ElementName = "ProzhitMinimum")]
+        public decimal MinIncome { get; set; }
+        [XmlElement(ElementName = "ObshKolChlenovSem")]
+        public byte FamilyPersonsCount { get; set; }
     }
 
+    [Serializable()]
+    [DesignerCategory("code")]
+    [XmlType(AnonymousType = true, Namespace = "urn://ru.permkrai.ecsp/mv/ecsp-sending-status-maloimushch")]
     public class Family {
         [XmlElement(ElementName = "LeechostvSemya")]
         public Person[]? Relatives { get; set; }
@@ -72,6 +124,4 @@ namespace SocialMinistryDataExchange.Model.EscpSD {
         [XmlElement(DataType = "date", ElementName = "DataVydachi")]
         public DateTime DateOfIssue { get; set; }
     }
-
-
 }

SocialMinistryDataExchange/Model/IContingentContext.cs

@@ -3,6 +3,7 @@ using SocialMinistryDataExchange.Model.Contingent.Center;
 
 namespace SocialMinistryDataExchange.Model {
     public interface IContingentContext {
+
         DbSet<СтатусыНуждаемости> СтатусыНуждаемостиs { get; set; }
         DbSet<ТипНуждаемости> ТипНуждаемостиs { get; set; }
 

SocialMinistryDataExchange/Model/SMData.cs

@@ -4,12 +4,15 @@ namespace SocialMinistryDataExchange.Model {
 
     [Flags]
     enum PersonSearchAttributes : byte {
+        PersonFamilyName = 1,
+        PersonName = 2,
+        PersonBirthday = 4,
+    }
+    [Flags]
+    enum PersonIdentitySearchAttributes : byte {
         PersonDocumentSeria = 1,
         PersonDocumentNumber = 2,
         PersonDocumentDate = 4,
-        PersonFamilyName = 8,
-        PersonName = 16,
-        PersonBirthday = 32,
     }
 
     public class SMResponceTemp {
@@ -28,10 +31,10 @@ namespace SocialMinistryDataExchange.Model {
         public string? Фамилия { get; set; }
         public bool? БезОтчества { get; set; }
         public DateTime? ДатаРождения { get; set; }
-        public Guid? ТерриторияФактическогоМестаЖительстваNew { get; set; }
-        public string? Снилс { get; set; }
-
+        public Guid? ТерриторияРегистрацииПоМестуЖительстваNew { get; set; }
         public string? ТерриторияShortname { get; set; }
+        public string? Снилс { get; set; }
+                
         public Guid? ТипОрганизации { get; set; }
         public int? ТипОрганизацииКод { get; set; }
         public string? ТипОрганизацииНаименование { get; set; }

SocialMinistryDataExchange/Startup.cs

@@ -29,7 +29,7 @@ namespace SocialMinistryDataExchange {
                 .MinimumLevel.Debug()
                 .MinimumLevel.Override("Default", LogEventLevel.Information)
                 .Enrich.FromLogContext()
-                .WriteTo.File($@"{Directory.GetCurrentDirectory()}\Logs\{DateTime.Now.ToString("yyyy-MM-dd")}.log"
+                .WriteTo.File($@"{Directory.GetCurrentDirectory()}\Logs\{DateTime.Now:yyyy-MM-dd}.log"
                                 , outputTemplate: "[{Timestamp:HH:mm:ss.fff}] |{Level:u3}| {Message:lj}{NewLine}{Exception}")
                 .CreateLogger();
             services.AddSingleton(Log.Logger);
@@ -45,7 +45,8 @@ namespace SocialMinistryDataExchange {
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) {
+        //public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) {
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env) {
             if (env.IsDevelopment()) {
                 app.UseDeveloperExceptionPage();
                 app.UseSwagger();