From cf15cc79755316c1c426b39b6e2eea0f1dd263bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E7=9D=BFAMD7950X?= <774114798@qq.com>
Date: Mon, 2 Dec 2024 14:52:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8C=E6=AC=A1=E5=9B=9E?=
 =?UTF-8?q?=E8=B7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...condaryCircuitLogicExpressionAppService.cs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/SecondaryCircuitInfo/SecondaryCircuitLogicExpressionAppService.cs b/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/SecondaryCircuitInfo/SecondaryCircuitLogicExpressionAppService.cs
index 18014de..2c31bb1 100644
--- a/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/SecondaryCircuitInfo/SecondaryCircuitLogicExpressionAppService.cs
+++ b/src/YunDa.Application/YunDa.ISAS.Application/GeneralInformation/SecondaryCircuitInfo/SecondaryCircuitLogicExpressionAppService.cs
@@ -96,7 +96,12 @@ namespace YunDa.ISAS.Application.GeneralInformation.SecondaryCircuitInfo
                         {
                             entity.TelemeteringConfigurationId = telemeteringId;
                         }
-                        var telesignal = InsertTelesignal(secondaryCircuitProtectionDevice, entity.Name);
+                        if (_telemeteringConfigurationRepository.GetAll().Where(t => t.DataSourceCategory == DataSourceCategoryEnum.None).Count()>0)
+                        {
+                            dispatchaddr = (int)_telemeteringConfigurationRepository.GetAll().Where(t => t.DataSourceCategory == DataSourceCategoryEnum.None)?.Select(t => t.DispatcherAddress)?.Max() + 1;
+                        }
+
+                        var telesignal = InsertTelesignal(secondaryCircuitProtectionDevice, entity.Name, dispatchaddr);
                         var telesignalId = await _telesignalisationConfigurationRepository.InsertAndGetIdAsync(telesignal);
                         if (telesignalId!= default)
                         {
@@ -122,9 +127,9 @@ namespace YunDa.ISAS.Application.GeneralInformation.SecondaryCircuitInfo
             {
                 // 新增的记录
                 var entity = new TelemeteringConfiguration();
-                entity.DispatcherAddress = 0;
+                entity.DispatcherAddress = dispatchaddr;
                 entity.CPUSector = 0;
-                entity.DeviceAddress = 0;
+                entity.DeviceAddress = 1;
                 entity.InfoAddress = 0;
                 entity.InfoCPUSector = 0;
                 entity.InfoDeviceAddress = dispatchaddr;
@@ -149,15 +154,15 @@ namespace YunDa.ISAS.Application.GeneralInformation.SecondaryCircuitInfo
             }
             return null;
         }
-        private TelesignalisationConfiguration InsertTelesignal(SecondaryCircuitProtectionDevice secondaryCircuitProtectionDevice, string secondaryCircuitName)
+        private TelesignalisationConfiguration InsertTelesignal(SecondaryCircuitProtectionDevice secondaryCircuitProtectionDevice, string secondaryCircuitName, int dispatchaddr)
         {
             // 新增的记录
             var entity = new TelesignalisationConfiguration
             {
                 Name = $"{secondaryCircuitName}_判定虚遥信",
-                DispatcherAddress = 0,
+                DispatcherAddress = dispatchaddr,
                 CPUSector = 0,
-                DeviceAddress = 0,
+                DeviceAddress = 1,
                 InfoAddress = 0,
                 InfoCPUSector = 0,
                 InfoDeviceAddress = 0,
@@ -175,6 +180,8 @@ namespace YunDa.ISAS.Application.GeneralInformation.SecondaryCircuitInfo
                 DataSourceCategory = DataSourceCategoryEnum.None,
                 IsCommStatus = false,
                 TransformerSubstationId = secondaryCircuitProtectionDevice.ProtectionDevice.TransformerSubstationId,
+                EquipmentInfoId = secondaryCircuitProtectionDevice.ProtectionDevice.EquipmentInfoId,
+                EquipmentTypeId = secondaryCircuitProtectionDevice.ProtectionDevice.EquipmentInfo.EquipmentTypeId,
             };
             return entity;
         }