bugs

IMCS_CCS/IMCS.CCS.xml

@@ -1311,10 +1311,6 @@
             采集数据OPCUA
             </summary> 
             <returns></returns>
-            <summary>
-            采集数据OPCUA
-            </summary> 
-            <returns></returns>
         </member>
         <member name="M:IMCS.CCS.Service.Impl.TaskJobService.DataCollectS7Job">
             <summary>

IMCS_CCS/Service/ITaskCallbackService.cs

@@ -18,6 +18,7 @@ namespace IMCS.CCS.Services
 
         //更新
         Task<bool> Update(TaskCallback vo);
-          
+
+        Task<bool> CreateOrUpdateAndCache(TaskCallback vo);
     }
 }

IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -206,7 +206,7 @@ namespace IMCS.CCS.Services
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.GetIntelligenceUnit.ToString(),
                     EnumHelper.GetDescription(ActionTypeEnum.GetIntelligenceUnit), req.taskId, req.taskNodeId); 
 
-                await _taskCallbackService.Create(setCallBackValue(CcsActionAddresses, taskCallbackData));
+                await _taskCallbackService.CreateOrUpdateAndCache(setCallBackValue(CcsActionAddresses, taskCallbackData));
                 Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.GetIntelligenceUnit) + "取物品成功===>>" + JsonConvert.SerializeObject(req)
                    , EnumHelper.GetDescription(ActionTypeEnum.GetIntelligenceUnit));
                 return responseData;
@@ -295,7 +295,7 @@ namespace IMCS.CCS.Services
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.GetFlexibleWire.ToString(),
                     EnumHelper.GetDescription(ActionTypeEnum.GetFlexibleWire), req.taskId, req.taskNodeId); 
 
-                await _taskCallbackService.Create(setCallBackValue(CcsActionAddresses, taskCallbackData));
+                await _taskCallbackService.CreateOrUpdateAndCache(setCallBackValue(CcsActionAddresses, taskCallbackData));
                 Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.GetFlexibleWire) + "取物品成功===>>" + JsonConvert.SerializeObject(req)
                    , EnumHelper.GetDescription(ActionTypeEnum.GetFlexibleWire));
                 return responseData;
@@ -383,7 +383,7 @@ namespace IMCS.CCS.Services
                 //插入回调
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.GetQualityCenter.ToString(),
                     EnumHelper.GetDescription(ActionTypeEnum.GetQualityCenter), req.taskId, req.taskNodeId); 
-                await _taskCallbackService.Create(setCallBackValue(CcsActionAddresses, taskCallbackData));
+                await _taskCallbackService.CreateOrUpdateAndCache(setCallBackValue(CcsActionAddresses, taskCallbackData));
                 Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.GetQualityCenter) + "取物品成功===>>" + JsonConvert.SerializeObject(req)
                    , EnumHelper.GetDescription(ActionTypeEnum.GetQualityCenter));
                 return responseData;
@@ -471,7 +471,7 @@ namespace IMCS.CCS.Services
                 //插入回调
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.SendIntelligenceUnit.ToString(),
                     EnumHelper.GetDescription(ActionTypeEnum.SendIntelligenceUnit), req.taskId, req.taskNodeId);
-                await _taskCallbackService.Create(setCallBackValue(CcsActionAddresses, taskCallbackData));
+                await _taskCallbackService.CreateOrUpdateAndCache(setCallBackValue(CcsActionAddresses, taskCallbackData));
                 Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.SendIntelligenceUnit) + "放物品成功===>>" + JsonConvert.SerializeObject(req)
                    , EnumHelper.GetDescription(ActionTypeEnum.SendIntelligenceUnit));
                 return responseData;
@@ -558,7 +558,7 @@ namespace IMCS.CCS.Services
                 //插入回调
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.SendFlexibleWire.ToString(),
                     EnumHelper.GetDescription(ActionTypeEnum.SendFlexibleWire), req.taskId, req.taskNodeId); 
-                await _taskCallbackService.Create(setCallBackValue(CcsActionAddresses, taskCallbackData));
+                await _taskCallbackService.CreateOrUpdateAndCache(setCallBackValue(CcsActionAddresses, taskCallbackData));
                 Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.SendFlexibleWire) + "放物品成功===>>" + JsonConvert.SerializeObject(req)
                    , EnumHelper.GetDescription(ActionTypeEnum.SendFlexibleWire));
                 return responseData;
@@ -646,7 +646,7 @@ namespace IMCS.CCS.Services
                 //插入回调
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.SendQualityCenter.ToString(),
                     EnumHelper.GetDescription(ActionTypeEnum.SendQualityCenter), req.taskId, req.taskNodeId); 
-                await _taskCallbackService.Create(setCallBackValue(CcsActionAddresses, taskCallbackData));
+                await _taskCallbackService.CreateOrUpdateAndCache(setCallBackValue(CcsActionAddresses, taskCallbackData));
                 Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.SendQualityCenter) + "放物品成功===>>" + JsonConvert.SerializeObject(req)
                    , EnumHelper.GetDescription(ActionTypeEnum.SendQualityCenter));
                 return responseData;
@@ -734,7 +734,7 @@ namespace IMCS.CCS.Services
                 //插入回调
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.MoveRobotPosition.ToString(),
                     EnumHelper.GetDescription(ActionTypeEnum.MoveRobotPosition), req.taskId, req.taskNodeId); 
-                await _taskCallbackService.Create(setCallBackValue(CcsActionAddresses, taskCallbackData));
+                await _taskCallbackService.CreateOrUpdateAndCache(setCallBackValue(CcsActionAddresses, taskCallbackData));
                 Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.MoveRobotPosition) + "移动物品成功===>>" + JsonConvert.SerializeObject(req)
                    , EnumHelper.GetDescription(ActionTypeEnum.MoveRobotPosition));
                 return responseData;
@@ -829,7 +829,7 @@ namespace IMCS.CCS.Services
                 //插入回调
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.UploadFile.ToString(),
                 EnumHelper.GetDescription(ActionTypeEnum.UploadFile), req.taskId, req.taskNodeId);
-                await _taskCallbackService.Create(taskCallbackData);
+                await _taskCallbackService.CreateOrUpdateAndCache(taskCallbackData);
                 Log.Instance.WriteLogAdd(ActionTypeEnum.UploadFile + "上传成功===>>" + JsonConvert.SerializeObject(req),
                     EnumHelper.GetDescription(ActionTypeEnum.UploadFile));
                 return responseData;
@@ -879,7 +879,7 @@ namespace IMCS.CCS.Services
                     opcUaReq.UserName = device.UserName;
                     opcUaReq.Password = device.Password;
                     opcUaReq.Path = actionInfo.FilePath + req.data.remotePath;
-                    opcUaReq.Type = OpcUaActionTypeEnum.StartNcProgram.ToString();
+                    opcUaReq.Type = OpcUaActionTypeEnum.Connect.ToString();
                     var Result = await _apiRequestService.RequestAsync(RequsetModeEnum.Post, opcuacUrlContext, opcUaReq, null);
                     ResponseOpcUaData responseOpcUaData = JsonConvert.DeserializeObject<ResponseOpcUaData>(Result.Message);
                     if (Result.IsSuccess && responseOpcUaData.result)
@@ -926,7 +926,7 @@ namespace IMCS.CCS.Services
                             //插入回调
                             TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.StartNCProgram.ToString(),
                             EnumHelper.GetDescription(ActionTypeEnum.StartNCProgram), req.taskId, req.taskNodeId);
-                            await _taskCallbackService.Create(setCallBackValue(CcsActionAddresses, taskCallbackData));
+                            await _taskCallbackService.CreateOrUpdateAndCache(setCallBackValue(CcsActionAddresses, taskCallbackData));
                             Log.Instance.WriteLogAdd(ActionTypeEnum.StartNCProgram + "启动成功===>>" + JsonConvert.SerializeObject(req),
                                 EnumHelper.GetDescription(ActionTypeEnum.StartNCProgram));
                             return responseData;
@@ -959,7 +959,7 @@ namespace IMCS.CCS.Services
                         //插入回调
                         TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.StartNCProgram.ToString(),
                         EnumHelper.GetDescription(ActionTypeEnum.StartNCProgram), req.taskId, req.taskNodeId);
-                        await _taskCallbackService.Create(setCallBackValue(CcsActionAddresses, taskCallbackData));
+                        await _taskCallbackService.CreateOrUpdateAndCache(setCallBackValue(CcsActionAddresses, taskCallbackData));
                         Log.Instance.WriteLogAdd(ActionTypeEnum.StartNCProgram + "启动成功===>>" + JsonConvert.SerializeObject(req),
                             EnumHelper.GetDescription(ActionTypeEnum.StartNCProgram));
                         return responseData;
@@ -1027,7 +1027,7 @@ namespace IMCS.CCS.Services
                     //插入回调
                     TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.StartNCProgram.ToString(),
                     EnumHelper.GetDescription(ActionTypeEnum.StartNCProgram), req.taskId, req.taskNodeId);
-                    await _taskCallbackService.Create(setCallBackValue(CcsActionAddresses, taskCallbackData));
+                    await _taskCallbackService.CreateOrUpdateAndCache(setCallBackValue(CcsActionAddresses, taskCallbackData));
                     Log.Instance.WriteLogAdd(ActionTypeEnum.StartNCProgram + "启动成功===>>" + JsonConvert.SerializeObject(req),
                         EnumHelper.GetDescription(ActionTypeEnum.StartNCProgram));
                     return responseData;
@@ -1093,7 +1093,7 @@ namespace IMCS.CCS.Services
                     //插入回调
                     TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.StartNCProgram.ToString(),
                     EnumHelper.GetDescription(ActionTypeEnum.StartNCProgram), req.taskId, req.taskNodeId);
-                    await _taskCallbackService.Create(setCallBackValue(CcsActionAddresses, taskCallbackData));
+                    await _taskCallbackService.CreateOrUpdateAndCache(setCallBackValue(CcsActionAddresses, taskCallbackData));
                     Log.Instance.WriteLogAdd(ActionTypeEnum.StartNCProgram + "启动成功===>>" + JsonConvert.SerializeObject(req),
                         EnumHelper.GetDescription(ActionTypeEnum.StartNCProgram));
                     return responseData;
@@ -1361,7 +1361,7 @@ namespace IMCS.CCS.Services
                 //插入回调
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.StartCleanMachine.ToString(),
                     EnumHelper.GetDescription(ActionTypeEnum.StartCleanMachine), req.taskId, req.taskNodeId);
-                await _taskCallbackService.Create(setCallBackValue(CcsActionAddresses, taskCallbackData));
+                await _taskCallbackService.CreateOrUpdateAndCache(setCallBackValue(CcsActionAddresses, taskCallbackData));
                 Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.StartCleanMachine) + "启动成功===>>" + JsonConvert.SerializeObject(req)
                    , EnumHelper.GetDescription(ActionTypeEnum.StartCleanMachine));
                 return responseData;
@@ -1469,7 +1469,7 @@ namespace IMCS.CCS.Services
                 //插入回调
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.StartLabelMachine.ToString(),
                     EnumHelper.GetDescription(ActionTypeEnum.StartLabelMachine), req.taskId, req.taskNodeId); 
-                await _taskCallbackService.Create(taskCallbackData);
+                await _taskCallbackService.CreateOrUpdateAndCache(taskCallbackData);
                 Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.StartLabelMachine) + "启动打标机成功===>>" + JsonConvert.SerializeObject(req)
                    , EnumHelper.GetDescription(ActionTypeEnum.StartLabelMachine));
                 return responseData;
@@ -1576,7 +1576,7 @@ namespace IMCS.CCS.Services
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.StartCoordinateMeasuringMachine.ToString(),
                     EnumHelper.GetDescription(ActionTypeEnum.StartCoordinateMeasuringMachine), req.taskId, req.taskNodeId); 
 
-                await _taskCallbackService.Create(setCallBackValue(CcsActionAddresses , taskCallbackData));
+                await _taskCallbackService.CreateOrUpdateAndCache(setCallBackValue(CcsActionAddresses , taskCallbackData));
                 Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.StartCoordinateMeasuringMachine) + "启动三坐标成功===>>" + JsonConvert.SerializeObject(req)
                    , EnumHelper.GetDescription(ActionTypeEnum.StartCoordinateMeasuringMachine));
                 return responseData;
@@ -1666,7 +1666,7 @@ namespace IMCS.CCS.Services
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.GetServoStacker.ToString(),
                     EnumHelper.GetDescription(ActionTypeEnum.GetServoStacker), req.taskId, req.taskNodeId);
  
-                await _taskCallbackService.Create(setCallBackValue(CcsActionAddresses, taskCallbackData));
+                await _taskCallbackService.CreateOrUpdateAndCache(setCallBackValue(CcsActionAddresses, taskCallbackData));
                 Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.GetServoStacker) + "取物品成功===>>" + JsonConvert.SerializeObject(req)
                    , EnumHelper.GetDescription(ActionTypeEnum.GetServoStacker));
                 return responseData;
@@ -1755,7 +1755,7 @@ namespace IMCS.CCS.Services
                 //插入回调
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.SendServoStacker.ToString(),
                     EnumHelper.GetDescription(ActionTypeEnum.SendServoStacker), req.taskId, req.taskNodeId); 
-                await _taskCallbackService.Create(setCallBackValue(CcsActionAddresses, taskCallbackData));
+                await _taskCallbackService.CreateOrUpdateAndCache(setCallBackValue(CcsActionAddresses, taskCallbackData));
                 Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.SendServoStacker) + "放物品成功===>>" + JsonConvert.SerializeObject(req)
                    , EnumHelper.GetDescription(ActionTypeEnum.SendServoStacker));
                 return responseData;
@@ -1912,7 +1912,7 @@ namespace IMCS.CCS.Services
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.ReadRFID.ToString(),
                     EnumHelper.GetDescription(ActionTypeEnum.ReadRFID), req.taskId, req.taskNodeId); 
 
-                // await _taskCallbackService.Create(taskCallbackData);
+                // await _taskCallbackService.CreateOrUpdateAndCache(taskCallbackData);
                 Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.ReadRFID) + "读取RFID故障===>>" + JsonConvert.SerializeObject(req)
                    , EnumHelper.GetDescription(ActionTypeEnum.GetServoStacker));
                 return responseData;
@@ -1978,7 +1978,7 @@ namespace IMCS.CCS.Services
                 //插入回调
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.WriteRFID.ToString(),
                     EnumHelper.GetDescription(ActionTypeEnum.WriteRFID), req.taskId, req.taskNodeId); 
-                // await _taskCallbackService.Create(taskCallbackData);
+                // await _taskCallbackService.CreateOrUpdateAndCache(taskCallbackData);
                 Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.WriteRFID) + "写RFID故障===>>" + JsonConvert.SerializeObject(req)
                    , EnumHelper.GetDescription(ActionTypeEnum.GetServoStacker));
                 return responseData;

IMCS_CCS/Service/Impl/TaskCallbackService.cs

@@ -1,5 +1,7 @@
-using IMCS.CCS.Entitys;
-using IMCS.CCS.Repository; 
+using IMCS.CCS.Common.Redis;
+using IMCS.CCS.Entitys;
+using IMCS.CCS.Repository;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -13,9 +15,12 @@ namespace IMCS.CCS.Services
     {
         private ITaskCallbackRepository _repository;
 
-        public TaskCallbackService(ITaskCallbackRepository repository)
+        private IRedisService _redisService;
+
+        public TaskCallbackService(ITaskCallbackRepository repository,IRedisService redisService)
         {
             _repository = repository;
+            _redisService = redisService;
         }
         public async Task<List<TaskCallback>> GetList(TaskCallback vo)
         {
@@ -43,5 +48,21 @@ namespace IMCS.CCS.Services
         {
             return await _repository.Update(vo);
         }
+
+        //添加或修改，放入缓存
+        public async Task<bool> CreateOrUpdateAndCache(TaskCallback vo)
+        {
+            bool flag = false;
+            if(vo != null && (vo.Id == 0)) {
+                flag = await _repository.Create(vo);
+            }else if (vo != null && vo.Id > 0)
+            {
+                flag = await _repository.Update(vo);
+            }
+            string callback_redis_key = "IMCS_CCS:CallbackTaskList";
+            List<TaskCallback> taskCallbacks = await _repository.GetAllList();
+            await _redisService.Database.StringSetAsync(callback_redis_key, JsonConvert.SerializeObject(taskCallbacks));
+            return flag;
+        }
     }
 }

IMCS_CCS/Service/Impl/TaskJobService.cs

@@ -51,6 +51,10 @@ namespace IMCS.CCS.Service.Impl
 
         private string LOG_TITLE_DEVICE = "设备监控";
 
+        private string callback_redis_key = "IMCS_CCS:CallbackTaskList";
+
+        private string device_redis_key = "IMCS_CCS:DeviceList";
+
         public IConfiguration Configuration { get; }
 
 
@@ -75,10 +79,6 @@ namespace IMCS.CCS.Service.Impl
             hdhUrlContext = Configuration.GetConnectionString("hdhUrlContext");
         }
 
-        /// <summary>
-        /// 采集数据OPCUA
-        /// </summary> 
-        /// <returns></returns>
         /// <summary>
         /// 采集数据OPCUA
         /// </summary> 
@@ -87,7 +87,17 @@ namespace IMCS.CCS.Service.Impl
         {
             try
             {
-                List<Device> deviceList = _deviceService.GetDeviceList();
+                List<Device> deviceList = new List<Device>();  
+                var deviceListData = await _redisService.Database.StringGetAsync(device_redis_key);
+                if (deviceListData.IsNullOrEmpty)
+                {
+                    deviceList = _deviceService.GetDeviceList(); 
+                    await _redisService.Database.StringSetAsync(device_redis_key, JsonConvert.SerializeObject(deviceList));
+                }
+                else
+                {
+                    deviceList = JsonConvert.DeserializeObject<List<Device>>(deviceListData);
+                }  
 
                 deviceList = deviceList.Where(x => x.ProtocolType.Equals(ProtocalTypeEnum.OPCUA.ToString())).ToList();
 
@@ -208,7 +218,17 @@ namespace IMCS.CCS.Service.Impl
         {
             try
             {
-                List<Device> deviceList = _deviceService.GetDeviceList();
+                List<Device> deviceList = new List<Device>();
+                var deviceListData = await _redisService.Database.StringGetAsync(device_redis_key);
+                if (deviceListData.IsNullOrEmpty)
+                {
+                    deviceList = _deviceService.GetDeviceList();
+                    await _redisService.Database.StringSetAsync(device_redis_key, JsonConvert.SerializeObject(deviceList));
+                }
+                else
+                {
+                    deviceList = JsonConvert.DeserializeObject<List<Device>>(deviceListData);
+                } 
                 deviceList = deviceList.Where(x => x.ProtocolType.Equals(ProtocalTypeEnum.S7_1500.ToString())).ToList();
                 foreach (Device device in deviceList)
                 {
@@ -307,7 +327,17 @@ namespace IMCS.CCS.Service.Impl
         {
             try
             {
-                List<Device> deviceList = _deviceService.GetDeviceList();
+                List<Device> deviceList = new List<Device>();
+                var deviceListData = await _redisService.Database.StringGetAsync(device_redis_key);
+                if (deviceListData.IsNullOrEmpty)
+                {
+                    deviceList = _deviceService.GetDeviceList();
+                    await _redisService.Database.StringSetAsync(device_redis_key, JsonConvert.SerializeObject(deviceList));
+                }
+                else
+                {
+                    deviceList = JsonConvert.DeserializeObject<List<Device>>(deviceListData);
+                }
                 deviceList = deviceList.Where(x => x.ProtocolType.Equals(ProtocalTypeEnum.FANUC.ToString())).ToList();
                 foreach (Device device in deviceList)
                 {
@@ -390,7 +420,16 @@ namespace IMCS.CCS.Service.Impl
         /// <returns></returns>
         public async Task<string> CallbackJob1()
         {
-            List<TaskCallback> list = await _taskCallbackService.GetAllList();
+            List<TaskCallback> list = new List<TaskCallback>();
+            var taskCallbackListData = await _redisService.Database.StringGetAsync(callback_redis_key);
+            if (taskCallbackListData.IsNullOrEmpty)
+            {
+                list = await _taskCallbackService.GetAllList();
+            }
+            else
+            {
+                list = JsonConvert.DeserializeObject<List<TaskCallback>>(taskCallbackListData);
+            }
 
             list = list.Where(x => x.OperateType.Equals(ActionTypeEnum.UploadFile.ToString())).ToList();
             string message = "";
@@ -409,7 +448,7 @@ namespace IMCS.CCS.Service.Impl
                         {
                             task.State = false;
                             task.UpdateTime = DateTime.Now;
-                            await _taskCallbackService.Update(task);
+                            await _taskCallbackService.CreateOrUpdateAndCache(task);
                             message = task.OperateName + "==>taskId:" + task.TaskId + ",taskNodeId:" + task.TaskNodeId + ",请求结果:" + result.Message + ";";
                             Log.Instance.WriteLogAdd(message, LOG_TITLE_CALLBACK);
                         }
@@ -436,7 +475,16 @@ namespace IMCS.CCS.Service.Impl
         /// <returns></returns>
         public async Task<string> CallbackJob2()
         {
-            List<TaskCallback> taskList = await _taskCallbackService.GetAllList();
+            List<TaskCallback> taskList = new List<TaskCallback>();
+            var taskCallbackListData = await _redisService.Database.StringGetAsync(callback_redis_key);
+            if (taskCallbackListData.IsNullOrEmpty)
+            {
+                taskList = await _taskCallbackService.GetAllList();
+            }
+            else
+            {
+                taskList = JsonConvert.DeserializeObject<List<TaskCallback>>(taskCallbackListData);
+            }
             //在线设备
             List<Device> deviceList = _deviceService.GetDeviceList();
 
@@ -484,7 +532,7 @@ namespace IMCS.CCS.Service.Impl
                         {
                             task.State = false;
                             task.UpdateTime = DateTime.Now;
-                            await _taskCallbackService.Update(task);
+                            await _taskCallbackService.CreateOrUpdateAndCache(task);
                             message = task.OperateName + "==>taskId:" + task.TaskId + ",taskNodeId:" + task.TaskNodeId + ",请求结果:" + result.Message + ";";
                             Log.Instance.WriteLogAdd(message, LOG_TITLE_CALLBACK);
                         }
@@ -538,7 +586,7 @@ namespace IMCS.CCS.Service.Impl
                             {
                                 task.State = false;
                                 task.UpdateTime = DateTime.Now;
-                                await _taskCallbackService.Update(task);
+                                await _taskCallbackService.CreateOrUpdateAndCache(task);
                                 message = task.OperateName + "==>taskId:" + task.TaskId + ",taskNodeId:" + task.TaskNodeId + message + ",请求结果:" + result.Message + ";";
                                 Log.Instance.WriteLogAdd(message, LOG_TITLE_CALLBACK);
                             }
@@ -566,7 +614,16 @@ namespace IMCS.CCS.Service.Impl
         /// <returns></returns>
         public async Task<string> CallbackJob3()
         {
-            List<TaskCallback> taskList = await _taskCallbackService.GetAllList();
+            List<TaskCallback> taskList = new List<TaskCallback>();
+            var taskCallbackListData = await _redisService.Database.StringGetAsync(callback_redis_key);
+            if (taskCallbackListData.IsNullOrEmpty)
+            {
+                taskList = await _taskCallbackService.GetAllList();
+            }
+            else
+            {
+                taskList = JsonConvert.DeserializeObject<List<TaskCallback>>(taskCallbackListData);
+            }
             //在线设备
             List<Device> deviceList = _deviceService.GetDeviceList();
 
@@ -616,7 +673,7 @@ namespace IMCS.CCS.Service.Impl
 
                             task.State = false;
                             task.UpdateTime = DateTime.Now;
-                            await _taskCallbackService.Update(task);
+                            await _taskCallbackService.CreateOrUpdateAndCache(task);
                             message = task.OperateName + "==>taskId:" + task.TaskId + ",taskNodeId:" + task.TaskNodeId + ",请求结果:" + result.Message + ";";
                             Log.Instance.WriteLogAdd(message, LOG_TITLE_CALLBACK);
                         }
@@ -671,7 +728,7 @@ namespace IMCS.CCS.Service.Impl
                             {
                                 task.State = false;
                                 task.UpdateTime = DateTime.Now;
-                                await _taskCallbackService.Update(task);
+                                await _taskCallbackService.CreateOrUpdateAndCache(task);
                                 message = task.OperateName + "==>taskId:" + task.TaskId + ",taskNodeId:" + task.TaskNodeId + message + ",请求结果:" + result.Message + ";";
                                 Log.Instance.WriteLogAdd(message, LOG_TITLE_CALLBACK);
                             }
@@ -699,7 +756,16 @@ namespace IMCS.CCS.Service.Impl
         /// <returns></returns>
         public async Task<string> CallbackJob4()
         {
-            List<TaskCallback> taskList = await _taskCallbackService.GetAllList();
+            List<TaskCallback> taskList = new List<TaskCallback>();
+            var taskCallbackListData = await _redisService.Database.StringGetAsync(callback_redis_key);
+            if (taskCallbackListData.IsNullOrEmpty)
+            {
+                taskList = await _taskCallbackService.GetAllList();
+            }
+            else
+            {
+                taskList = JsonConvert.DeserializeObject<List<TaskCallback>>(taskCallbackListData);
+            }
             //在线设备
             List<Device> deviceList = _deviceService.GetDeviceList();
 
@@ -737,7 +803,7 @@ namespace IMCS.CCS.Service.Impl
                         {
                             task.State = false;
                             task.UpdateTime = DateTime.Now;
-                            await _taskCallbackService.Update(task);
+                            await _taskCallbackService.CreateOrUpdateAndCache(task);
                             message = task.OperateName + "==>taskId:" + task.TaskId + ",taskNodeId:" + task.TaskNodeId + ",请求结果:" + result.Message + ";";
                             Log.Instance.WriteLogAdd(message, LOG_TITLE_CALLBACK);
                         }
@@ -791,7 +857,7 @@ namespace IMCS.CCS.Service.Impl
                             {
                                 task.State = false;
                                 task.UpdateTime = DateTime.Now;
-                                await _taskCallbackService.Update(task);
+                                await _taskCallbackService.CreateOrUpdateAndCache(task);
                                 message = task.OperateName + "==>taskId:" + task.TaskId + ",taskNodeId:" + task.TaskNodeId + message + ",请求结果:" + result.Message + ";";
                                 Log.Instance.WriteLogAdd(message, LOG_TITLE_CALLBACK);
                             }
@@ -817,7 +883,16 @@ namespace IMCS.CCS.Service.Impl
         /// <returns></returns>
         public async Task<string> CallbackJob5()
         {
-            List<TaskCallback> taskList = await _taskCallbackService.GetAllList();
+            List<TaskCallback> taskList = new List<TaskCallback>();
+            var taskCallbackListData = await _redisService.Database.StringGetAsync(callback_redis_key);
+            if (taskCallbackListData.IsNullOrEmpty)
+            {
+                taskList = await _taskCallbackService.GetAllList();
+            }
+            else
+            {
+                taskList = JsonConvert.DeserializeObject<List<TaskCallback>>(taskCallbackListData);
+            }
             //在线设备
             List<Device> deviceList = _deviceService.GetDeviceList();
 
@@ -854,7 +929,7 @@ namespace IMCS.CCS.Service.Impl
                         {
                             task.State = false;
                             task.UpdateTime = DateTime.Now;
-                            await _taskCallbackService.Update(task);
+                            await _taskCallbackService.CreateOrUpdateAndCache(task);
                             message = task.OperateName + "==>taskId:" + task.TaskId + ",taskNodeId:" + task.TaskNodeId + ",请求结果:" + result.Message + ";";
                             Log.Instance.WriteLogAdd(message, LOG_TITLE_CALLBACK);
                         }
@@ -908,7 +983,7 @@ namespace IMCS.CCS.Service.Impl
                             {
                                 task.State = false;
                                 task.UpdateTime = DateTime.Now;
-                                await _taskCallbackService.Update(task);
+                                await _taskCallbackService.CreateOrUpdateAndCache(task);
                                 message = task.OperateName + "==>taskId:" + task.TaskId + ",taskNodeId:" + task.TaskNodeId + message + ",请求结果:" + result.Message + ";";
                                 Log.Instance.WriteLogAdd(message, LOG_TITLE_CALLBACK);
                             }
@@ -935,7 +1010,16 @@ namespace IMCS.CCS.Service.Impl
         /// <returns></returns>
         public async Task<string> CallbackJob6()
         {
-            List<TaskCallback> taskList = await _taskCallbackService.GetAllList();
+            List<TaskCallback> taskList = new List<TaskCallback>();
+            var taskCallbackListData = await _redisService.Database.StringGetAsync(callback_redis_key);
+            if (taskCallbackListData.IsNullOrEmpty)
+            {
+                taskList = await _taskCallbackService.GetAllList();
+            }
+            else
+            {
+                taskList = JsonConvert.DeserializeObject<List<TaskCallback>>(taskCallbackListData);
+            }
             //在线设备
             List<Device> deviceList = _deviceService.GetDeviceList();
 
@@ -973,7 +1057,7 @@ namespace IMCS.CCS.Service.Impl
                         {
                             task.State = false;
                             task.UpdateTime = DateTime.Now;
-                            await _taskCallbackService.Update(task);
+                            await _taskCallbackService.CreateOrUpdateAndCache(task);
                             message = task.OperateName + "==>taskId:" + task.TaskId + ",taskNodeId:" + task.TaskNodeId + ",请求结果:" + result.Message + ";";
                             Log.Instance.WriteLogAdd(message, LOG_TITLE_CALLBACK);
                         }
@@ -1027,7 +1111,7 @@ namespace IMCS.CCS.Service.Impl
                             {
                                 task.State = false;
                                 task.UpdateTime = DateTime.Now;
-                                await _taskCallbackService.Update(task);
+                                await _taskCallbackService.CreateOrUpdateAndCache(task);
                                 message = task.OperateName + "==>taskId:" + task.TaskId + ",taskNodeId:" + task.TaskNodeId + message + ",请求结果:" + result.Message + ";";
                                 Log.Instance.WriteLogAdd(message, LOG_TITLE_CALLBACK);
                             }

IMCS_CCS/appsettings.json

@@ -28,7 +28,7 @@
   //Êý¾ÝÁ¬½ÓÅäÖÃ
   "ConnectionStrings": {
     "mysqlContext": "server=localhost;port=3306;database=imcs_ccs_new;uid=root;pwd=123456;CharSet=utf8;Allow Zero Datetime=True",
-    "ecsUrlContext": "http://localhost:5200/api/JobTasks/test",
+    "ecsUrlContext": "http://192.168.170.24:8760/api/authority/taskNode/taskNodeCallback",
     //"FTPServer": "192.168.170.25",
     //"FTPUser": "PROG",
     //"FTPPwd": "abc.1234",

IMCS_CCS/bin/Debug/netcoreapp3.1/IMCS.CCS.xml

@@ -1311,10 +1311,6 @@
             采集数据OPCUA
             </summary> 
             <returns></returns>
-            <summary>
-            采集数据OPCUA
-            </summary> 
-            <returns></returns>
         </member>
         <member name="M:IMCS.CCS.Service.Impl.TaskJobService.DataCollectS7Job">
             <summary>

IMCS_CCS/bin/Debug/netcoreapp3.1/appsettings.json

@@ -28,7 +28,7 @@
   //Êý¾ÝÁ¬½ÓÅäÖÃ
   "ConnectionStrings": {
     "mysqlContext": "server=localhost;port=3306;database=imcs_ccs_new;uid=root;pwd=123456;CharSet=utf8;Allow Zero Datetime=True",
-    "ecsUrlContext": "http://localhost:5200/api/JobTasks/test",
+    "ecsUrlContext": "http://192.168.170.24:8760/api/authority/taskNode/taskNodeCallback",
     //"FTPServer": "192.168.170.25",
     //"FTPUser": "PROG",
     //"FTPPwd": "abc.1234",