aibox

.env

@@ -2,4 +2,4 @@
 #Development
 #Staging
 DEV_ENVIRONMENT=Development 
-version=1.3.16
+version=1.3.17

Ropin.Environmentally.WebScada/Work/HostedService.cs

@@ -108,6 +108,7 @@ namespace Ropin.Environmentally.WebScada.Work
             _aPIUrlData = aPIUrlData;
         }
         private object _locker = new object();
+        private int FirstTask1Run = 0;//是否第一次运行
         public Task StartAsync(CancellationToken cancellationToken)
         {
             //Task.Run(async () =>
@@ -154,56 +155,62 @@ namespace Ropin.Environmentally.WebScada.Work
             #region
             Task.Run(async () =>
             {
-
                 while (true)
                 {
                     try
                     {
-                        //await this._dispatcher.Broadcast(new DevEvent("niu","aa"));
-                        //var services = new ServiceCollection();
-                        //var provider = services.BuildServiceProvider();
-                        //var dispatcher = provider.GetRequiredService<IDispatcher>() as Dispatcher;
-
-                        //dispatcher.Register<DevEvent>()
-                        //    .Subscribe<DevEventListener>();
-                        //await dispatcher.Broadcast(new DevEvent("niu"));
-
-
-
-                        //List<Task> tasks = new List<Task>();
-                        //tasks.Add();
                         IList<TDEV_DevStore> devStore = null;
                         IList<TDEV_WebScadaDevSpot> devStoreSpot = null;
                         using (var scope = _provider.GetRequiredService<IServiceScopeFactory>().CreateScope())
                         {
                             var _redisService = scope.ServiceProvider.GetService<ICacheService>();
-                            //var _tmtnDevOpsRecordRepository = scope.ServiceProvider.GetService<ITmtnDevOpsRecordRepository>();
-                            //var solidWasteRecordItems = await _tmtnDevOpsRecordRepository.GetRecordsConditionAsync(new TmtnDevOpsRecordDetailSearchModel { bSolidWaste = true, C_DevStoreCode = "8793c6c8-d855-421e-9fa1-d25f914bb730", IsPagination = false, Start = DateTime.Now.AddDays(-1), End = DateTime.Now });
-                            //var devAccountConfig = await _devDevOpeAccountConfigService.GetByConditionAsync(t => t.C_DevStoreCode == "8793c6c8-d855-421e-9fa1-d25f914bb730");
+                            string devStoreIsUpdate = "0";
+                            string devStoreSpotIsUpdate = "0";
+                            bool devStoreIsExist = _redisService.Exists(RedisEnum.TdevDevStoreUpdateRedisKey);
+                            bool devStoreSpotIsExist = _redisService.Exists(RedisEnum.WebScadaDevSpotUpdateRedisKey);
+                            if (devStoreIsExist)
+                            {
+                                devStoreIsUpdate = _redisService.Get(RedisEnum.TdevDevStoreUpdateRedisKey);
+                            }
+                            if (devStoreSpotIsExist)
+                            {
+                                devStoreSpotIsUpdate = _redisService.Get(RedisEnum.WebScadaDevSpotUpdateRedisKey);
+                            }
                             using (var dbContext = scope.ServiceProvider.GetService<InspectionDbContext>())
                             {
-                                devStore = dbContext.TDEV_DevStore.AsQueryable().ToList();
-                                devStoreSpot = dbContext.TDEV_WebScadaDevSpot.AsQueryable().ToList();
-                                if (devStore != null && devStore.Count > 0)
+                                if (FirstTask1Run == 0 || devStoreIsUpdate == "1" || devStoreSpotIsUpdate == "1")
                                 {
-                                    //devStore = devStore.Where(t => t.C_Status != "0" && t.C_Status != "5").ToList();
-                                    devStore = devStore.Where(t => t.C_Status != "0").ToList();
+                                    devStore = dbContext.TDEV_DevStore.AsQueryable().ToList();
+                                    devStoreSpot = dbContext.TDEV_WebScadaDevSpot.AsQueryable().ToList();
+                                    if (devStore != null && devStore.Count > 0)
+                                    {
+                                        //devStore = devStore.Where(t => t.C_Status != "0" && t.C_Status != "5").ToList();
+                                        devStore = devStore.Where(t => t.C_Status != "0").ToList();
+                                    }
+                                    if (FirstTask1Run == 0 || devStoreIsUpdate == "1")
+                                    {
+                                        await _redisService.SetAsync("fanyibox_devStore", devStore);
+                                        if (devStoreIsExist) { await _redisService.RemoveAsync(RedisEnum.TdevDevStoreUpdateRedisKey); }
+                                    }
                                 }
-                                await _redisService.SetAsync("fanyibox_devStore", devStore);
                             }
 
                             if (devStore != null)
                             {
-                                foreach (var devstore in devStore)
+                                if (FirstTask1Run == 0|| devStoreSpotIsUpdate == "1")
                                 {
-                                    var predicate = PredicateBuilder.New<TDEV_WebScadaDevSpot>(true);//查询条件,推荐后台使用这种方式灵活筛选
-                                    predicate = predicate.And(i => i.C_Status.Equals("1"));
-                                    predicate = predicate.And(i => i.C_DevCode.Equals(devstore.C_ID));
-                                    IEnumerable<TDEV_WebScadaDevSpot> items = devStoreSpot.Where(predicate).OrderBy(x => x.I_Sort).AsEnumerable();
-                                    await _redisService.SetAsync("fanyibox_devStore_" + devstore.C_ID + "_spot", items);
+                                    foreach (var devstore in devStore)
+                                    {
+                                        var predicate = PredicateBuilder.New<TDEV_WebScadaDevSpot>(true);//查询条件,推荐后台使用这种方式灵活筛选
+                                        predicate = predicate.And(i => i.C_Status.Equals("1"));
+                                        predicate = predicate.And(i => i.C_DevCode.Equals(devstore.C_ID));
+                                        IEnumerable<TDEV_WebScadaDevSpot> items = devStoreSpot.Where(predicate).OrderBy(x => x.I_Sort).AsEnumerable();
+                                        await _redisService.SetAsync("fanyibox_devStore_" + devstore.C_ID + "_spot", items);
+                                    }
+                                    if (devStoreSpotIsExist) { await _redisService.RemoveAsync(RedisEnum.WebScadaDevSpotUpdateRedisKey); }
                                 }
                             }
-
+                            FirstTask1Run = 1;
                         };
 
                         await Task.Delay(10000);

Ropin.Inspection.Api/Controllers/LGS/LargeScreenControlController.cs

@@ -14,6 +14,7 @@ using Ropin.Inspection.Common.Accessor.Interface;
 using System.Security.Claims;
 using NPOI.POIFS.Crypt.Dsig;
 using System.Collections.Generic;
+using Ropin.Inspection.Common;
 
 namespace Ropin.Inspection.Api.Controllers.LGS
 {
@@ -222,8 +223,7 @@ namespace Ropin.Inspection.Api.Controllers.LGS
             }
             try
             {
-                string key= "LargeScreenControl_ID";
-                await _redisService.Set(key, Id, TimeSpan.FromDays(7));
+                await _redisService.Set(RedisEnum.LargeScreenControlIdRedisKey, Id, TimeSpan.FromDays(7));
                 return new ApiResult(ReturnCode.Success);
             }
             catch (Exception ex)
@@ -242,8 +242,7 @@ namespace Ropin.Inspection.Api.Controllers.LGS
         {
             try
             {
-                string key = "LargeScreenControl_ID";
-                string val=  await _redisService.GetValue(key);
+                string val=  await _redisService.GetValue(RedisEnum.LargeScreenControlIdRedisKey);
                 var data = new
                 {
                     Value = val

Ropin.Inspection.Api/TdevBoxDevSpotController.cs

@@ -4,6 +4,7 @@ using Microsoft.Extensions.Logging;
 using Ropin.Core.Extensions.Redis;
 using Ropin.Inspection.Api.Common;
 using Ropin.Inspection.Api.Controllers;
+using Ropin.Inspection.Common;
 using Ropin.Inspection.Model;
 using Ropin.Inspection.Service;
 using System;
@@ -47,7 +48,7 @@ namespace Ropin.Inspection.Api
             try
             {
                 await _TdevBoxDevSpotService.CreateOneAsync(content);
-                await _redisService.Set("mqtt_BoxDevSpot_IsUpdate", "1", TimeSpan.FromDays(7));
+                await _redisService.Set(RedisEnum.BoxDevSpotUpdateRedisKey, "1", TimeSpan.FromDays(7));
             }
             catch (Exception ex)
             {
@@ -96,7 +97,7 @@ namespace Ropin.Inspection.Api
             try
             {
                 await _TdevBoxDevSpotService.UpdateAsync(id, updateModel);
-                await _redisService.Set("mqtt_BoxDevSpot_IsUpdate", "1", TimeSpan.FromDays(7));
+                await _redisService.Set(RedisEnum.BoxDevSpotUpdateRedisKey, "1", TimeSpan.FromDays(7));
             }
             catch (Exception ex)
             {

Ropin.Inspection.Api/TdevDevStoreController.cs

@@ -20,6 +20,7 @@ using System.Text.RegularExpressions;
 using Ropin.Inspection.Common.Helper;
 using Microsoft.Extensions.FileSystemGlobbing.Internal;
 using K4os.Compression.LZ4.Internal;
+using Ropin.Inspection.Common;
 
 namespace Ropin.Inspection.Api
 {
@@ -32,12 +33,13 @@ namespace Ropin.Inspection.Api
         private readonly IRedisBasketRepository _redisBasketRepository;
         private readonly ITdevDevOpeAccountService _tdevDevOpeAccountService;
         private readonly IDevDevOpeAccountConfigService _devDevOpeAccountConfigService;
+        private readonly IRedisBasketRepository _redisService;
         /// <summary>
         /// 构造函数
         /// </summary>
         /// <param name="TdevDevStoreService"></param>
         /// <param name="logger"></param>
-        public TdevDevStoreController(ITdevDevStoreService TdevDevStoreService, ITdevDevOpeAccountService tdevDevOpeAccountService,IRedisBasketRepository redisBasketRepository, IPushMsgService pushMsgService, ILogger<TdevDevStoreController> logger, IDevDevOpeAccountConfigService devDevOpeAccountConfigService)
+        public TdevDevStoreController(ITdevDevStoreService TdevDevStoreService, ITdevDevOpeAccountService tdevDevOpeAccountService,IRedisBasketRepository redisBasketRepository, IPushMsgService pushMsgService, ILogger<TdevDevStoreController> logger, IDevDevOpeAccountConfigService devDevOpeAccountConfigService, IRedisBasketRepository redisService)
         {
             _TdevDevStoreService = TdevDevStoreService;
             _logger = logger;
@@ -45,8 +47,8 @@ namespace Ropin.Inspection.Api
             _redisBasketRepository = redisBasketRepository;
             _tdevDevOpeAccountService = tdevDevOpeAccountService;
             _devDevOpeAccountConfigService = devDevOpeAccountConfigService;
+            _redisService = redisService;
         }
-
         /// <summary>
         /// 通过id获取业主设备信息
         /// </summary>
@@ -230,6 +232,7 @@ namespace Ropin.Inspection.Api
             try
             {
                 await _TdevDevStoreService.CreateOneAsync(content);
+                await _redisService.Set(RedisEnum.TdevDevStoreUpdateRedisKey, "1", TimeSpan.FromDays(7));
             }
             catch (Exception ex)
             {
@@ -253,6 +256,7 @@ namespace Ropin.Inspection.Api
             try
             {
                 await _TdevDevStoreService.DeleteAsync(id);
+                await _redisService.Set(RedisEnum.TdevDevStoreUpdateRedisKey, "1", TimeSpan.FromDays(7));
             }
             catch (Exception ex)
             {
@@ -277,6 +281,7 @@ namespace Ropin.Inspection.Api
             try
             {
                 await _TdevDevStoreService.UpdateAsync(id, updateModel);
+                await _redisService.Set(RedisEnum.TdevDevStoreUpdateRedisKey, "1", TimeSpan.FromDays(7));
             }
             catch (Exception ex)
             {
@@ -451,6 +456,7 @@ namespace Ropin.Inspection.Api
             try
             {
                 await _TdevDevStoreService.UpdateDevStoreUserConfigAsync(id, updateModel);
+                await _redisService.Set(RedisEnum.TdevDevStoreUpdateRedisKey, "1", TimeSpan.FromDays(7));
             }
             catch (Exception ex)
             {
@@ -506,6 +512,7 @@ namespace Ropin.Inspection.Api
             try
             {
                 await _TdevDevStoreService.CopyCreateOneAsync(id);
+                await _redisService.Set(RedisEnum.TdevDevStoreUpdateRedisKey, "1", TimeSpan.FromDays(7));
                 return new ApiResult(ReturnCode.Success);
             }
             catch (Exception ex)

Ropin.Inspection.Api/TdevDevStoreMigrateController.cs

@@ -1,8 +1,10 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+using Ropin.Core.Extensions.Redis;
 using Ropin.Inspection.Api.Common;
 using Ropin.Inspection.Api.Controllers;
+using Ropin.Inspection.Common;
 using Ropin.Inspection.Model;
 using Ropin.Inspection.Service;
 using System;
@@ -17,18 +19,19 @@ namespace Ropin.Inspection.Api
     {
         public ILogger<TdevDevStoreMigrateController> _logger { get; }
         private readonly ITdevDevStoreMigrateService _TdevDevStoreMigrateService;
+        private readonly IRedisBasketRepository _redisService;
         /// <summary>
         /// 构造函数
         /// </summary>
         /// <param name="TdevDevStoreMigrateService"></param>
         /// <param name="logger"></param>
-        public TdevDevStoreMigrateController(ITdevDevStoreMigrateService TdevDevStoreMigrateService, ILogger<TdevDevStoreMigrateController> logger)
+        public TdevDevStoreMigrateController(ITdevDevStoreMigrateService TdevDevStoreMigrateService, ILogger<TdevDevStoreMigrateController> logger, IRedisBasketRepository redisService)
         {
             _TdevDevStoreMigrateService = TdevDevStoreMigrateService;
             _logger = logger;
+            _redisService = redisService;
         }
 
-        
         /// <summary>
         /// 创建业主设备迁移记录
         /// </summary>
@@ -44,6 +47,7 @@ namespace Ropin.Inspection.Api
             try
             {
                 await _TdevDevStoreMigrateService.CreateOneAsync(content);
+                await _redisService.Set(RedisEnum.TdevDevStoreUpdateRedisKey, "1", TimeSpan.FromDays(7));
             }
             catch (Exception ex)
             {

Ropin.Inspection.Api/TdevWebScadaDevSpotController.cs

@@ -8,6 +8,7 @@ using Ropin.Core.Common;
 using Ropin.Core.Extensions.Redis;
 using Ropin.Inspection.Api.Common;
 using Ropin.Inspection.Api.Controllers;
+using Ropin.Inspection.Common;
 using Ropin.Inspection.Common.Helper;
 using Ropin.Inspection.Model;
 using Ropin.Inspection.Model.Entities;
@@ -27,17 +28,19 @@ namespace Ropin.Inspection.Api
         public ILogger<TdevWebScadaDevSpotController> _logger { get; }
         private readonly ITdevWebScadaDevSpotService _TdevWebScadaDevSpotService;
         private readonly IPushMsgService _pushMsgService;
+        private readonly IRedisBasketRepository _redisService;
         /// <summary>
         /// 构造函数
         /// </summary>
         /// <param name="TdevWebScadaDevSpotService"></param>
         /// <param name="pushMsgService"></param>
         /// <param name="logger"></param>
-        public TdevWebScadaDevSpotController(ITdevWebScadaDevSpotService TdevWebScadaDevSpotService, IPushMsgService pushMsgService, ILogger<TdevWebScadaDevSpotController> logger)
+        public TdevWebScadaDevSpotController(ITdevWebScadaDevSpotService TdevWebScadaDevSpotService, IPushMsgService pushMsgService, ILogger<TdevWebScadaDevSpotController> logger, IRedisBasketRepository redisService)
         {
             _TdevWebScadaDevSpotService = TdevWebScadaDevSpotService;
             _logger = logger;
             _pushMsgService = pushMsgService;
+            _redisService = redisService;
         }
 
         /// <summary>
@@ -404,6 +407,7 @@ namespace Ropin.Inspection.Api
             try
             {
                 await _TdevWebScadaDevSpotService.CreateAsync(content);
+                await _redisService.Set(RedisEnum.WebScadaDevSpotUpdateRedisKey, "1", TimeSpan.FromDays(7));
             }
             catch (Exception ex)
             {
@@ -427,6 +431,7 @@ namespace Ropin.Inspection.Api
             try
             {
                 await _TdevWebScadaDevSpotService.DeleteAsync(id);
+                await _redisService.Set(RedisEnum.WebScadaDevSpotUpdateRedisKey, "1", TimeSpan.FromDays(7));
             }
             catch (Exception ex)
             {
@@ -449,6 +454,7 @@ namespace Ropin.Inspection.Api
             try
             {
                 await _TdevWebScadaDevSpotService.DeleteDataAsync(id);
+                await _redisService.Set(RedisEnum.WebScadaDevSpotUpdateRedisKey, "1", TimeSpan.FromDays(7));
             }
             catch (Exception ex)
             {
@@ -472,6 +478,7 @@ namespace Ropin.Inspection.Api
             try
             {
                 await _TdevWebScadaDevSpotService.UpdateAsync(id, updateModel);
+                await _redisService.Set(RedisEnum.WebScadaDevSpotUpdateRedisKey, "1", TimeSpan.FromDays(7));
             }
             catch (Exception ex)
             {
@@ -495,6 +502,7 @@ namespace Ropin.Inspection.Api
             try
             {
                 await _TdevWebScadaDevSpotService.UpdateSortAsync(ids);
+                await _redisService.Set(RedisEnum.WebScadaDevSpotUpdateRedisKey, "1", TimeSpan.FromDays(7));
             }
             catch (Exception ex)
             {

Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Api.xml

@@ -3887,7 +3887,7 @@
             <param name="updateModel"></param>
             <returns></returns>
         </member>
-        <member name="M:Ropin.Inspection.Api.TdevDevStoreController.#ctor(Ropin.Inspection.Service.ITdevDevStoreService,Ropin.Inspection.Service.ITdevDevOpeAccountService,Ropin.Core.Extensions.Redis.IRedisBasketRepository,Ropin.Inspection.Service.IPushMsgService,Microsoft.Extensions.Logging.ILogger{Ropin.Inspection.Api.TdevDevStoreController},Ropin.Inspection.Service.DEV.Interface.IDevDevOpeAccountConfigService)">
+        <member name="M:Ropin.Inspection.Api.TdevDevStoreController.#ctor(Ropin.Inspection.Service.ITdevDevStoreService,Ropin.Inspection.Service.ITdevDevOpeAccountService,Ropin.Core.Extensions.Redis.IRedisBasketRepository,Ropin.Inspection.Service.IPushMsgService,Microsoft.Extensions.Logging.ILogger{Ropin.Inspection.Api.TdevDevStoreController},Ropin.Inspection.Service.DEV.Interface.IDevDevOpeAccountConfigService,Ropin.Core.Extensions.Redis.IRedisBasketRepository)">
             <summary>
             构造函数
             </summary>
@@ -4113,7 +4113,7 @@
             <param name="updateModel"></param>
             <returns></returns>
         </member>
-        <member name="M:Ropin.Inspection.Api.TdevDevStoreMigrateController.#ctor(Ropin.Inspection.Service.ITdevDevStoreMigrateService,Microsoft.Extensions.Logging.ILogger{Ropin.Inspection.Api.TdevDevStoreMigrateController})">
+        <member name="M:Ropin.Inspection.Api.TdevDevStoreMigrateController.#ctor(Ropin.Inspection.Service.ITdevDevStoreMigrateService,Microsoft.Extensions.Logging.ILogger{Ropin.Inspection.Api.TdevDevStoreMigrateController},Ropin.Core.Extensions.Redis.IRedisBasketRepository)">
             <summary>
             构造函数
             </summary>
@@ -4423,7 +4423,7 @@
             <param name="searchModel"></param>
             <returns></returns>
         </member>
-        <member name="M:Ropin.Inspection.Api.TdevWebScadaDevSpotController.#ctor(Ropin.Inspection.Service.ITdevWebScadaDevSpotService,Ropin.Inspection.Service.IPushMsgService,Microsoft.Extensions.Logging.ILogger{Ropin.Inspection.Api.TdevWebScadaDevSpotController})">
+        <member name="M:Ropin.Inspection.Api.TdevWebScadaDevSpotController.#ctor(Ropin.Inspection.Service.ITdevWebScadaDevSpotService,Ropin.Inspection.Service.IPushMsgService,Microsoft.Extensions.Logging.ILogger{Ropin.Inspection.Api.TdevWebScadaDevSpotController},Ropin.Core.Extensions.Redis.IRedisBasketRepository)">
             <summary>
             构造函数
             </summary>

Ropin.Inspection.Api/obj/Debug/net5.0/Ropin.Inspection.Api.xml

@@ -3887,7 +3887,7 @@
             <param name="updateModel"></param>
             <returns></returns>
         </member>
-        <member name="M:Ropin.Inspection.Api.TdevDevStoreController.#ctor(Ropin.Inspection.Service.ITdevDevStoreService,Ropin.Inspection.Service.ITdevDevOpeAccountService,Ropin.Core.Extensions.Redis.IRedisBasketRepository,Ropin.Inspection.Service.IPushMsgService,Microsoft.Extensions.Logging.ILogger{Ropin.Inspection.Api.TdevDevStoreController},Ropin.Inspection.Service.DEV.Interface.IDevDevOpeAccountConfigService)">
+        <member name="M:Ropin.Inspection.Api.TdevDevStoreController.#ctor(Ropin.Inspection.Service.ITdevDevStoreService,Ropin.Inspection.Service.ITdevDevOpeAccountService,Ropin.Core.Extensions.Redis.IRedisBasketRepository,Ropin.Inspection.Service.IPushMsgService,Microsoft.Extensions.Logging.ILogger{Ropin.Inspection.Api.TdevDevStoreController},Ropin.Inspection.Service.DEV.Interface.IDevDevOpeAccountConfigService,Ropin.Core.Extensions.Redis.IRedisBasketRepository)">
             <summary>
             构造函数
             </summary>
@@ -4113,7 +4113,7 @@
             <param name="updateModel"></param>
             <returns></returns>
         </member>
-        <member name="M:Ropin.Inspection.Api.TdevDevStoreMigrateController.#ctor(Ropin.Inspection.Service.ITdevDevStoreMigrateService,Microsoft.Extensions.Logging.ILogger{Ropin.Inspection.Api.TdevDevStoreMigrateController})">
+        <member name="M:Ropin.Inspection.Api.TdevDevStoreMigrateController.#ctor(Ropin.Inspection.Service.ITdevDevStoreMigrateService,Microsoft.Extensions.Logging.ILogger{Ropin.Inspection.Api.TdevDevStoreMigrateController},Ropin.Core.Extensions.Redis.IRedisBasketRepository)">
             <summary>
             构造函数
             </summary>
@@ -4423,7 +4423,7 @@
             <param name="searchModel"></param>
             <returns></returns>
         </member>
-        <member name="M:Ropin.Inspection.Api.TdevWebScadaDevSpotController.#ctor(Ropin.Inspection.Service.ITdevWebScadaDevSpotService,Ropin.Inspection.Service.IPushMsgService,Microsoft.Extensions.Logging.ILogger{Ropin.Inspection.Api.TdevWebScadaDevSpotController})">
+        <member name="M:Ropin.Inspection.Api.TdevWebScadaDevSpotController.#ctor(Ropin.Inspection.Service.ITdevWebScadaDevSpotService,Ropin.Inspection.Service.IPushMsgService,Microsoft.Extensions.Logging.ILogger{Ropin.Inspection.Api.TdevWebScadaDevSpotController},Ropin.Core.Extensions.Redis.IRedisBasketRepository)">
             <summary>
             构造函数
             </summary>

Ropin.Inspection.Common/CommonEnum.cs

@@ -33,5 +33,23 @@ namespace Ropin.Inspection.Common
     {
         public Dictionary<string, string> devMessageType = new Dictionary<string, string>();
     }
-   
+   public class RedisEnum
+    {
+        /// <summary>
+        /// 业主设备是否修改【设备新增、修改、删除、拷贝、迁移、用户配置】
+        /// </summary>
+        public const string TdevDevStoreUpdateRedisKey = "redis_TdevDevStore_IsUpdate";
+        /// <summary>
+        /// 业主设备设备点是【新增、修改、禁用、删除、顺序】
+        /// </summary>
+        public const string WebScadaDevSpotUpdateRedisKey = "redis_WebScadaDevSpot_IsUpdate";
+        /// <summary>
+        /// 盒子设备【新增、修改】
+        /// </summary>
+        public const string BoxDevSpotUpdateRedisKey = "mqtt_BoxDevSpot_IsUpdate";
+        /// <summary>
+        /// 大屏控件ID存储
+        /// </summary>
+        public const string LargeScreenControlIdRedisKey = "LargeScreenControl_ID";
+    }
 }

Ropin.Inspection.Model/ViewModel/VMC/VmcCameraViewModel.cs

@@ -62,6 +62,7 @@ namespace Ropin.Inspection.Model.ViewModel.VMC
         public string C_CameraTypeValue { get; set; }
         public string C_RunStatus {get;set;}
         public string C_CameraStatus { get; set; }
+        public string C_VideoURL { get;set; }
         public string C_DevStoreCode { get; set; }
         public string C_DevStoreName { get; set; }
         public string C_NumberCode { get; set; }

Ropin.Inspection.Repository/VMC/VmcCameraRepository.cs

@@ -144,7 +144,7 @@ LEFT JOIN TPNT_Store s2 on (c.C_CurrentStoreCode=s2.C_Code)
             sql.Append(@"select * from (
 select dc.*,c.C_Name as C_CameraName,c.C_CameraNo,c.C_RunStatus,c.C_Status as C_CameraStatus,
 c.C_Serial,c.C_CameraCode as Codes,c.C_Type as C_CameraType,de.C_Value as C_CameraTypeValue,
-d.C_Name as C_DevStoreName,d.C_NumberCode 
+d.C_Name as C_DevStoreName,d.C_NumberCode,c.C_VideoURL 
 from TVMC_DevCamera dc
 left JOIN TVMC_Camera c on (dc.C_CameraCode=c.C_ID)
 LEFT JOIN TDEV_DevStore d on (dc.C_DevStoreCode=d.C_ID)