联调修改

IMCS_CCS/Model/vo/ResponseECSCallbackData.cs

@@ -7,10 +7,8 @@ namespace IMCS.CCS.Models.vo
 {
     public class ResponseECSCallbackData
     {
-        public string code { get; set; }
-
-        public bool data { get; set; }
-
+        public int code { get; set; }
+          
         public string msg { get; set; } = "ok";
 
         public bool isSuccess { get; set; }

IMCS_CCS/Service/Impl/ApiRequestService.cs

@@ -39,6 +39,7 @@ namespace IMCS.CCS.Service.Impl
                 }
 
                 IFlurlRequest flurlRequest = apiUrl.WithHeader(headerKey, headerValue);
+                flurlRequest.WithTimeout(10);
                 if (flurlRequest == null)
                 {
                     return (false, "flurlRequest 空指针！");

IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -201,8 +201,7 @@ namespace IMCS.CCS.Services
                 }
                 s7.Close();
 
-                //插入回调 
-
+                //插入回调
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.GetIntelligenceUnit.ToString(),
                     EnumHelper.GetDescription(ActionTypeEnum.GetIntelligenceUnit), req.taskId, req.taskNodeId); 
 
@@ -949,11 +948,11 @@ namespace IMCS.CCS.Services
 
 
                 }
-                else if (actionInfo.ProtocolType == ProtocalTypeEnum.FANUC.ToString())
+               /* else if (actionInfo.ProtocolType == ProtocalTypeEnum.FANUC.ToString())
                 {
                     string Url = fanucUrlContext + "?ip=" + device.Ip + "&port=" + device.Port;
                     //调用发那科是否连接接口
-                    var Result = await _apiRequestService.RequestAsync(RequsetModeEnum.Get, Url + "&fun=" + ActionTypeEnum.StartNCProgram.ToString(), null, null);
+                    var Result = await _apiRequestService.RequestAsync(RequsetModeEnum.Get, Url + "&fun=" + ActionTypeEnum.StartNCProgram.ToString()+ "&prgname="+req.data.remotePath, null, null);
                     if (Result.IsSuccess && Result.Message == "0")
                     {
                         //插入回调
@@ -971,12 +970,12 @@ namespace IMCS.CCS.Services
                         responseData.result = "false";
                         return responseData;
                     }
-                }
+                }*/
                 else if (actionInfo.ProtocolType == ProtocalTypeEnum.FANUC.ToString())
                 {
                     string Url = fanucUrlContext + "?ip=" + device.Ip + "&port=" + device.Port;
                     //调用发那科是否连接接口
-                    var Result = await _apiRequestService.RequestAsync(RequsetModeEnum.Get, Url + "&fun=" + OpcUaActionTypeEnum.SelectNcProgram.ToString(), null, null);
+                    var Result = await _apiRequestService.RequestAsync(RequsetModeEnum.Get, Url + "&fun=" + OpcUaActionTypeEnum.SelectNcProgram.ToString()+"&prgname=" + req.data.remotePath, null, null);
                     if(!Result.IsSuccess || Result.Message != "0")
                     {
                         Log.Instance.WriteLogAdd(ActionTypeEnum.StartNCProgram + "启动程序异常===>>"  + JsonConvert.SerializeObject(req),

IMCS_CCS/Service/Impl/TaskJobService.cs

@@ -3,6 +3,7 @@ using HslCommunication.Profinet.Siemens;
 using IMCS.CCS.Common.Redis;
 using IMCS.CCS.DeviceProtocol;
 using IMCS.CCS.Entitys;
+using IMCS.CCS.Models.vo;
 using IMCS.CCS.Services;
 using IMCS_CCS.Model.vo;
 using IMCS_CCS.Utils;
@@ -444,7 +445,8 @@ namespace IMCS.CCS.Service.Impl
                         requestData.taskId = long.Parse(task.TaskId);
                         requestData.taskNodeId = long.Parse(task.TaskNodeId);
                         var result = await _apiRequestService.RequestAsync(RequsetModeEnum.Post, ecsUrlContext, requestData, null);
-                        if (result.IsSuccess)
+                        ResponseECSCallbackData responseECSCallback = JsonConvert.DeserializeObject<ResponseECSCallbackData>(result.Message);
+                        if (result.IsSuccess && responseECSCallback.code == 0)
                         {
                             task.State = false;
                             task.UpdateTime = DateTime.Now;
@@ -455,7 +457,7 @@ namespace IMCS.CCS.Service.Impl
                         else
                         {
                             message = message + JsonConvert.SerializeObject(task) + ",请求失败! WebApi 返回结果" + ";";
-                            Log.Instance.WriteLogAdd("回调异常，请求接口失败" + JsonConvert.SerializeObject(task), LOG_TITLE_CALLBACK);
+                            Log.Instance.WriteLogAdd("回调异常，请求接口失败" + JsonConvert.SerializeObject(result), LOG_TITLE_CALLBACK);
                         }
 
                     }
@@ -528,7 +530,8 @@ namespace IMCS.CCS.Service.Impl
                         requestData.taskId = long.Parse(task.TaskId);
                         requestData.taskNodeId = long.Parse(task.TaskNodeId);
                         var result = await _apiRequestService.RequestAsync(RequsetModeEnum.Post, ecsUrlContext, requestData, null);
-                        if (result.IsSuccess)
+                        ResponseECSCallbackData responseECSCallback = JsonConvert.DeserializeObject<ResponseECSCallbackData>(result.Message);
+                        if (result.IsSuccess && responseECSCallback.code == 0)
                         {
                             task.State = false;
                             task.UpdateTime = DateTime.Now;
@@ -539,7 +542,7 @@ namespace IMCS.CCS.Service.Impl
                         else
                         {
                             message = message + JsonConvert.SerializeObject(task) + ",请求失败! WebApi 返回结果" + ";";
-                            Log.Instance.WriteLogAdd("回调异常，请求接口失败" + JsonConvert.SerializeObject(task), LOG_TITLE_CALLBACK);
+                            Log.Instance.WriteLogAdd("回调异常，请求接口失败" + JsonConvert.SerializeObject(result), LOG_TITLE_CALLBACK);
                         }
 
                     }
@@ -656,7 +659,8 @@ namespace IMCS.CCS.Service.Impl
                         requestData.taskId = long.Parse(task.TaskId);
                         requestData.taskNodeId = long.Parse(task.TaskNodeId);
                         var result = await _apiRequestService.RequestAsync(RequsetModeEnum.Post, ecsUrlContext, requestData, null);
-                        if (result.IsSuccess)
+                        ResponseECSCallbackData responseECSCallback = JsonConvert.DeserializeObject<ResponseECSCallbackData>(result.Message);
+                        if (result.IsSuccess && responseECSCallback.code == 0)
                         {
                             if (!string.IsNullOrEmpty(task.SuccessResetAddress))
                             {
@@ -724,7 +728,8 @@ namespace IMCS.CCS.Service.Impl
                             requestData.code = "0";
                             requestData.msg = "操作失败";
                             var result = await _apiRequestService.RequestAsync(RequsetModeEnum.Post, ecsUrlContext, requestData, null);
-                            if (result.IsSuccess)
+                            ResponseECSCallbackData responseECSCallback = JsonConvert.DeserializeObject<ResponseECSCallbackData>(result.Message);
+                            if (result.IsSuccess && responseECSCallback.code == 0)
                             {
                                 task.State = false;
                                 task.UpdateTime = DateTime.Now;
@@ -735,7 +740,7 @@ namespace IMCS.CCS.Service.Impl
                             else
                             {
                                 message = message + JsonConvert.SerializeObject(task) + ",请求失败! WebApi 返回结果" + ";";
-                                Log.Instance.WriteLogAdd("回调异常，请求接口失败" + JsonConvert.SerializeObject(task), LOG_TITLE_CALLBACK);
+                                Log.Instance.WriteLogAdd("回调异常，请求接口失败" + JsonConvert.SerializeObject(result), LOG_TITLE_CALLBACK);
                             }
                         }
                     }
@@ -799,7 +804,8 @@ namespace IMCS.CCS.Service.Impl
                         requestData.taskId = long.Parse(task.TaskId);
                         requestData.taskNodeId = long.Parse(task.TaskNodeId);
                         var result = await _apiRequestService.RequestAsync(RequsetModeEnum.Post, ecsUrlContext, requestData, null);
-                        if (result.IsSuccess)
+                        ResponseECSCallbackData responseECSCallback = JsonConvert.DeserializeObject<ResponseECSCallbackData>(result.Message);
+                        if (result.IsSuccess && responseECSCallback.code == 0)
                         {
                             task.State = false;
                             task.UpdateTime = DateTime.Now;
@@ -810,7 +816,7 @@ namespace IMCS.CCS.Service.Impl
                         else
                         {
                             message = message + JsonConvert.SerializeObject(task) + ",请求失败! WebApi 返回结果" + ";";
-                            Log.Instance.WriteLogAdd("回调异常，请求接口失败" + JsonConvert.SerializeObject(task), LOG_TITLE_CALLBACK);
+                            Log.Instance.WriteLogAdd("回调异常，请求接口失败" + JsonConvert.SerializeObject(result), LOG_TITLE_CALLBACK);
                         }
                     }
 
@@ -853,7 +859,8 @@ namespace IMCS.CCS.Service.Impl
                             requestData.code = "0";
                             requestData.msg = "操作失败";
                             var result = await _apiRequestService.RequestAsync(RequsetModeEnum.Post, ecsUrlContext, requestData, null);
-                            if (result.IsSuccess)
+                            ResponseECSCallbackData responseECSCallback = JsonConvert.DeserializeObject<ResponseECSCallbackData>(result.Message);
+                            if (result.IsSuccess && responseECSCallback.code == 0)
                             {
                                 task.State = false;
                                 task.UpdateTime = DateTime.Now;
@@ -864,7 +871,7 @@ namespace IMCS.CCS.Service.Impl
                             else
                             {
                                 message = message + JsonConvert.SerializeObject(task) + ",请求失败! WebApi 返回结果" + ";";
-                                Log.Instance.WriteLogAdd("回调异常，请求接口失败" + JsonConvert.SerializeObject(task), LOG_TITLE_CALLBACK);
+                                Log.Instance.WriteLogAdd("回调异常，请求接口失败" + JsonConvert.SerializeObject(result), LOG_TITLE_CALLBACK);
                             }
                         }
                     }
@@ -925,7 +932,8 @@ namespace IMCS.CCS.Service.Impl
                         requestData.taskId = long.Parse(task.TaskId);
                         requestData.taskNodeId = long.Parse(task.TaskNodeId);
                         var result = await _apiRequestService.RequestAsync(RequsetModeEnum.Post, ecsUrlContext, requestData, null);
-                        if (result.IsSuccess)
+                        ResponseECSCallbackData responseECSCallback = JsonConvert.DeserializeObject<ResponseECSCallbackData>(result.Message);
+                        if (result.IsSuccess && responseECSCallback.code == 0)
                         {
                             task.State = false;
                             task.UpdateTime = DateTime.Now;
@@ -936,7 +944,7 @@ namespace IMCS.CCS.Service.Impl
                         else
                         {
                             message = message + JsonConvert.SerializeObject(task) + ",请求失败! WebApi 返回结果" + ";";
-                            Log.Instance.WriteLogAdd("回调异常，请求接口失败" + JsonConvert.SerializeObject(task), LOG_TITLE_CALLBACK);
+                            Log.Instance.WriteLogAdd("回调异常，请求接口失败" + JsonConvert.SerializeObject(result), LOG_TITLE_CALLBACK);
                         }
                     }
 
@@ -979,7 +987,8 @@ namespace IMCS.CCS.Service.Impl
                             requestData.code = "0";
                             requestData.msg = "操作失败";
                             var result = await _apiRequestService.RequestAsync(RequsetModeEnum.Post, ecsUrlContext, requestData, null);
-                            if (result.IsSuccess)
+                            ResponseECSCallbackData responseECSCallback = JsonConvert.DeserializeObject<ResponseECSCallbackData>(result.Message);
+                            if (result.IsSuccess && responseECSCallback.code == 0)
                             {
                                 task.State = false;
                                 task.UpdateTime = DateTime.Now;
@@ -990,7 +999,7 @@ namespace IMCS.CCS.Service.Impl
                             else
                             {
                                 message = message + JsonConvert.SerializeObject(task) + ",请求失败! WebApi 返回结果" + ";";
-                                Log.Instance.WriteLogAdd("回调异常，请求接口失败" + JsonConvert.SerializeObject(task), LOG_TITLE_CALLBACK);
+                                Log.Instance.WriteLogAdd("回调异常，请求接口失败" + JsonConvert.SerializeObject(result), LOG_TITLE_CALLBACK);
                             }
                         }
                     }
@@ -1053,7 +1062,8 @@ namespace IMCS.CCS.Service.Impl
                         requestData.taskId = long.Parse(task.TaskId);
                         requestData.taskNodeId = long.Parse(task.TaskNodeId);
                         var result = await _apiRequestService.RequestAsync(RequsetModeEnum.Post, ecsUrlContext, requestData, null);
-                        if (result.IsSuccess)
+                        ResponseECSCallbackData responseECSCallback = JsonConvert.DeserializeObject<ResponseECSCallbackData>(result.Message);
+                        if (result.IsSuccess && responseECSCallback.code == 0)
                         {
                             task.State = false;
                             task.UpdateTime = DateTime.Now;
@@ -1064,7 +1074,7 @@ namespace IMCS.CCS.Service.Impl
                         else
                         {
                             message = message + JsonConvert.SerializeObject(task) + ",请求失败! WebApi 返回结果" + ";";
-                            Log.Instance.WriteLogAdd("回调异常，请求接口失败" + JsonConvert.SerializeObject(task), LOG_TITLE_CALLBACK);
+                            Log.Instance.WriteLogAdd("回调异常，请求接口失败" + JsonConvert.SerializeObject(result), LOG_TITLE_CALLBACK);
                         }
                     }
 
@@ -1107,7 +1117,8 @@ namespace IMCS.CCS.Service.Impl
                             requestData.code = "0";
                             requestData.msg = "操作失败";
                             var result = await _apiRequestService.RequestAsync(RequsetModeEnum.Post, ecsUrlContext, requestData, null);
-                            if (result.IsSuccess)
+                            ResponseECSCallbackData responseECSCallback = JsonConvert.DeserializeObject<ResponseECSCallbackData>(result.Message);
+                            if (result.IsSuccess && responseECSCallback.code == 0)
                             {
                                 task.State = false;
                                 task.UpdateTime = DateTime.Now;
@@ -1118,7 +1129,7 @@ namespace IMCS.CCS.Service.Impl
                             else
                             {
                                 message = message + JsonConvert.SerializeObject(task) + ",请求失败! WebApi 返回结果" + ";";
-                                Log.Instance.WriteLogAdd("回调异常，请求接口失败" + JsonConvert.SerializeObject(task), LOG_TITLE_CALLBACK);
+                                Log.Instance.WriteLogAdd("回调异常，请求接口失败" + JsonConvert.SerializeObject(result), LOG_TITLE_CALLBACK);
                             }
                         }
                     }

IMCS_CCS/appsettings.json

@@ -27,7 +27,7 @@
   "RedisConnectionString": "127.0.0.1:6379,password=123456,defaultDatabase=0",
   //Êý¾ÝÁ¬½ÓÅäÖÃ
   "ConnectionStrings": {
-    "mysqlContext": "server=localhost;port=3306;database=imcs_ccs_new;uid=root;pwd=123456;CharSet=utf8;Allow Zero Datetime=True",
+    "mysqlContext": "server=localhost;port=3306;database=ccs_yj;uid=root;pwd=123456;CharSet=utf8;Allow Zero Datetime=True",
     "ecsUrlContext": "http://192.168.170.24:8760/api/authority/taskNode/taskNodeCallback",
     //"FTPServer": "192.168.170.25",
     //"FTPUser": "PROG",

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

@@ -27,7 +27,7 @@
   "RedisConnectionString": "127.0.0.1:6379,password=123456,defaultDatabase=0",
   //Êý¾ÝÁ¬½ÓÅäÖÃ
   "ConnectionStrings": {
-    "mysqlContext": "server=localhost;port=3306;database=imcs_ccs_new;uid=root;pwd=123456;CharSet=utf8;Allow Zero Datetime=True",
+    "mysqlContext": "server=localhost;port=3306;database=ccs_yj;uid=root;pwd=123456;CharSet=utf8;Allow Zero Datetime=True",
     "ecsUrlContext": "http://192.168.170.24:8760/api/authority/taskNode/taskNodeCallback",
     //"FTPServer": "192.168.170.25",
     //"FTPUser": "PROG",

IMCS_CCS/obj/Debug/netcoreapp3.1/CCS.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-f9920f3bb6b9f8499f934ef5812a75e909151e3b
+1916eb695b7352c19378f9497edb2dfac43ce779