成航发调试

IMCS_CCS/Controllers/JobTasksController.cs

@@ -161,5 +161,17 @@ namespace IMCS.CCS.Controllers
         {
             return await _taskJobService.DataCollectS7JobWarn();
         }
+
+
+        /// <summary>
+        /// 定时清楚redis缓存
+        /// </summary> 
+        /// <returns></returns>
+        [HttpPost("remoteRedis")]
+        public async Task<string> remoteRedis()
+        {
+            return await _taskJobService.remoteRedis();
+        }
+
     }
 }

IMCS_CCS/IMCS.CCS.xml

@@ -453,6 +453,18 @@
             </summary> 
             <returns></returns>
         </member>
+        <member name="M:IMCS.CCS.Controllers.JobTasksController.DataCollectS7JobWarn">
+            <summary>
+            采集数据S7报警数据
+            </summary> 
+            <returns></returns>
+        </member>
+        <member name="M:IMCS.CCS.Controllers.JobTasksController.remoteRedis">
+            <summary>
+            定时清楚redis缓存
+            </summary> 
+            <returns></returns>
+        </member>
         <member name="T:IMCS.CCS.Controllers.ProjectController">
             <summary>
             项目控制器
@@ -1791,6 +1803,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:IMCS.CCS.Service.Impl.TaskJobService.DataCollectS7JobWarn">
+            <summary>
+            采集数据S7报警数据
+            </summary> 
+            <returns></returns>
+        </member>
         <member name="T:IMCS.CCS.Service.Impl.TaskService">
             <summary>
             任务服务
@@ -1971,6 +1989,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:IMCS.CCS.Service.ITaskJobService.DataCollectS7JobWarn">
+            <summary>
+            S7采集报警数据
+            </summary>
+            <returns></returns>
+        </member>
         <member name="T:IMCS.CCS.Service.ITaskService">
             <summary>
             任务 Job 服务

IMCS_CCS/Model/vo/RequestOpcUaData.cs

@@ -22,6 +22,9 @@ namespace IMCS_CCS.Model.vo
         public string Path
         { get; set; }
 
+        public string Ip
+        { get; set; }
+
         public List<string> Addresses
         { get; set; }
 

IMCS_CCS/Service/ITaskJobService.cs

@@ -86,5 +86,7 @@ namespace IMCS.CCS.Service
         /// </summary>
         /// <returns></returns>
         Task<List<string>> DataCollectS7JobWarn();
+
+        Task<string> remoteRedis();
     }
 }

IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -296,7 +296,7 @@ namespace IMCS.CCS.Services
                                 Log.Instance.WriteLogAdd(ActionTypeEnum.RobotAction + "异常===>>" + "点位" + req.data.location + "取条件不满足【" + getResult + "】,等待允许取料中" + JsonConvert.SerializeObject(req),
                                                             EnumHelper.GetDescription(ActionTypeEnum.RobotAction));
                                 responseData.result = "false";
-                                responseData.msg = "异常===>>" + "点位" + req.data.location + "取条件不满足【" + getResult + "】,等待允许取料中";
+                                responseData.msg = "异常===>>" + "点位" + req.data.location + "取条件不满足【" + getResult + "】,等待允许取料中,请按装载站上的允许卸料按钮";
                                 s7.ConnectClose();
                                 return responseData;
                             }
@@ -351,7 +351,7 @@ namespace IMCS.CCS.Services
                                 Log.Instance.WriteLogAdd(ActionTypeEnum.RobotAction + "异常===>>" + "点位" + req.data.location + "放条件不满足【" + getResult + "】,等待允许放料中" + JsonConvert.SerializeObject(req),
                                                             EnumHelper.GetDescription(ActionTypeEnum.RobotAction));
                                 responseData.result = "false";
-                                responseData.msg = "异常===>>" + "点位" + req.data.location + "放条件不满足【" + getResult + "】,等待允许放料中";
+                                responseData.msg = "异常===>>" + "点位" + req.data.location + "放条件不满足【" + getResult + "】,等待允许放料中,请按装载站上的允许装载按钮";
                                 s7.ConnectClose();
                                 return responseData;
                             }
@@ -627,6 +627,7 @@ namespace IMCS.CCS.Services
                         deviceReq.Type = OpcUaActionTypeEnum.UploadFileList.ToString();
                         deviceReq.prgName = req.data.fileName;
                         deviceReq.subFileList = req.data.subFileList;
+                        deviceReq.Ip = req.url;
                         var Result = await _apiRequestService.RequestAsync(RequsetModeEnum.Post, mazakUrlContext, deviceReq, null);
                         ResponseOpcUaData responseOpcUaData = JsonConvert.DeserializeObject<ResponseOpcUaData>(Result.Message);
                         if (!Result.IsSuccess || !responseOpcUaData.result)

IMCS_CCS/Service/Impl/TaskJobService.cs

@@ -559,7 +559,7 @@ namespace IMCS.CCS.Service.Impl
                     }
 
                     // RFID ============= 比对开始
-                    string rfidFlag = _redisService.Database.StringGetAsync(RFID+ task.TaskId + task.TaskNodeId).Result;
+                   /* string rfidFlag = _redisService.Database.StringGetAsync(RFID+ task.TaskId + task.TaskNodeId).Result;
 
                     if (rfidFlag.IsNullOrEmpty()) {
                         Rfid aa = await this.CheckRFid(task);
@@ -586,7 +586,7 @@ namespace IMCS.CCS.Service.Impl
                             plcS7.ConnectClose();
                             return "等待二次读命令完成RFID读命令已下发";
                         }
-                    }
+                    }*/
                     // RFID ============= 比对结束
 
                     CcsTagValue callBacktagValue = tagValues.Where(o => o.Address == task.Address).FirstOrDefault();
@@ -1821,7 +1821,7 @@ namespace IMCS.CCS.Service.Impl
             var data = await _redisService.Database.StringGetAsync("PLC_COSTOM_ADDRESS");
             List<string> returnList=new List<string>();
             List<string> dataList = data.ToString().Split(',').ToList();
-            /*SiemensS7Net s7 = DevicePlcS7.SiemensS7("10.161.30.248");
+            SiemensS7Net s7 = DevicePlcS7.SiemensS7("10.161.30.248");
             OperateResult ConnectionResult = s7.ConnectServer();
             if (!ConnectionResult.IsSuccess)
             {
@@ -1839,11 +1839,24 @@ namespace IMCS.CCS.Service.Impl
                 }
 
             }
-            s7.ConnectClose();*/
-            returnList.Add("True");
+            s7.ConnectClose();
             return returnList;
 
 
+        }
+
+
+        public async Task<string> remoteRedis()
+        {
+            _redisService.Database.KeyDelete("IMCS_CCS:10.161.30.248:S7_1500");
+            _redisService.Database.KeyDelete("IMCS_CCS:ALLDeviceList");
+            _redisService.Database.KeyDelete("IMCS_CCS:ALLUseDeviceList");
+            _redisService.Database.KeyDelete("IMCS_CCS:DeviceList");
+            _redisService.Database.KeyDelete("IMCS_CCS:MonitorEquipmentStatusJob");
+            _redisService.Database.KeyDelete("IMCS_CCS:CallbackTaskList");
+            return "清除成功";
+
+
         }
     }
 }