Bladeren bron

mxg:修改删除岗位正则表达式错误问题

mengxiangge 6 jaren geleden
bovenliggende
commit
de72f2a550
2 gewijzigde bestanden met toevoegingen van 19 en 3 verwijderingen
  1. 3 3
      MBI/SAGA.MBI/Common/RegexConstPattern.cs
  2. 16 0
      MBI/SAGA.MBI/DataArrange/DalUploadFloor.cs

+ 3 - 3
MBI/SAGA.MBI/Common/RegexConstPattern.cs

@@ -17,9 +17,9 @@ namespace SAGA.MBI.Common
     class RegexConstPattern
     {
         public const string IsSpaceId = @"Si\S*";
-        public const string IsEquipId = @"Si\S*";
-        public const string IsEquipPartId = @"Si\S*";
-        public const string IsBeaconId = @"Si\S*";
+        public const string IsEquipId = @"Eq\S*";
+        public const string IsEquipPartId = @"Ec\S*";
+        public const string IsBeaconId = @"VOBc\S*";
 
         public const string IsFamilyCode = @"\s*-\s*\S*";
 

+ 16 - 0
MBI/SAGA.MBI/DataArrange/DalUploadFloor.cs

@@ -509,6 +509,22 @@ namespace SAGA.MBI.DataArrange
                     if (dutyId.IsNotNullEmpty())
                     {
                         cdutys = cloudDutys.Where(t => t.Id == dutyId).ToList();
+                        if (!cdutys.Any())
+                        {
+                            //去跟据id物理世界查找
+                            var tempcduty = DalCommon.QueryObjectById(dutyId);
+                            if (tempcduty != null)
+                            {
+                                cdutys.Add(tempcduty);
+                                //添加设备所在楼层
+                                localContext.UnGroupDatas.Add(new RltEquipinFloor(dutyId,cloudContext.FloorId){Operator = DocumentChangedOperator.Add});
+                            }
+                                
+                        }
+                    }
+                    else
+                    {
+                        lduty.Id = dutyId;
                     }
                 }
                 cduty = cdutys.FirstOrDefault();