feat: 处理冲突

src/SJZY.Track.Application.Contract/Dtos/Forewarning/ForewarningRuleCacheEntry.cs

@@ -51,6 +51,11 @@ public class ForewarningRuleCacheEntry
     /// 区域
     /// </summary>
     public AreaCacheEntry? Area { get; set; }
+    
+    /// <summary>
+    /// 区域
+    /// </summary>
+    public List<AreaCacheEntry>? Areas { get; set; }
 
     /// <summary>
     /// 是否中转

src/SJZY.Track.Application/Services/ForewarningServices/ForewarningCacheService.cs

@@ -76,7 +76,7 @@ public class ForewarningCacheService: IForewarningCacheService, ISingletonDepend
                 CargoType = item.CargoType,
                 Months = string.IsNullOrEmpty(item.Months)?new List<int>():item.Months.Split('/').Select(int.Parse).ToList(),
                 IsTransit = item.IsTransit,
-                AreaId = areaList,
+                Areas = areaList,
                 ProductCode = item.ProductCode,
                 LeavePort = item.LeavePort
             };

src/SJZY.Track.Application/Services/ForewarningServices/KpiAreaService.cs

@@ -57,7 +57,7 @@ public class KpiAreaService : ApplicationService
     {
         await _ruleAreaRepository.DeleteArea(id);
         await _forewarningCacheService.ClearRedis();
-        await RedisHelper.Client.PublishAsync(GlobalConst.PublishNotifyChannelKey, "clear locl cache");
+        await RedisHelper.Client.PublishAsync(GlobalConst.PublishNotifyChannelKey, "clear local cache");
         return new UnifyResultDto(true, "删除成功");
     }