回调bugs

IMCS_CCS/Entitys/TaskCallback.cs

@@ -85,7 +85,7 @@ namespace IMCS.CCS.Entitys
         public string CallbackFailValue3 { get; set; }
 
         [Column("state")]
-        public bool State { get; set; }
+        public bool State { get; set; } = true;
 
         [Column("create_time")]
         public DateTime CreateTime { get; set; } = DateTime.Now;

IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -331,7 +331,7 @@ namespace IMCS.CCS.Services
                 actionQuery.Ip = req.url;
                 CcsAction actionInfo = _ccsActionService.GetList(actionQuery).FirstOrDefault(); 
 
-                Plc s7 = DevicePlcS7.S7(req.url, ProtocalTypeEnum.S7_1500.ToString());
+                /*Plc s7 = DevicePlcS7.S7(req.url, ProtocalTypeEnum.S7_1500.ToString());
                 if (s7.IsConnected != true)
                 {
                     s7.Close();
@@ -339,7 +339,7 @@ namespace IMCS.CCS.Services
                     EnumHelper.GetDescription(ActionTypeEnum.GetQualityCenter));
                     responseData.result = "false";
                     return responseData;
-                }
+                }*/
 
                 CcsActionAddress actionAddressQuery = new CcsActionAddress();
                 actionAddressQuery.ActionId = actionInfo.Id;
@@ -351,7 +351,7 @@ namespace IMCS.CCS.Services
                 {
                     if (!string.IsNullOrEmpty(actionAddress.Address) && !string.IsNullOrEmpty(actionAddress.Value))
                     {
-                        string CheckAddress = ToolUtils.AddressConvertDBW(actionAddress.Address);
+                      /*  string CheckAddress = ToolUtils.AddressConvertDBW(actionAddress.Address);
                         var operateResult = ((ushort)s7.Read(CheckAddress)).ConvertToShort();
                         if (actionAddress.CheckType ? operateResult.ToString().Equals(actionAddress.Value) : operateResult.ToString() != actionAddress.Value)
                         {
@@ -360,7 +360,7 @@ namespace IMCS.CCS.Services
                             EnumHelper.GetDescription(ActionTypeEnum.GetQualityCenter));
                             responseData.result = "false";
                             return responseData;
-                        }
+                        }*/
                     }
                 }
 
@@ -368,14 +368,14 @@ namespace IMCS.CCS.Services
                 List<CcsActionAddress> CcsActionAddressWrites = CcsActionAddresses.Where(o => o.Type == ActionAddressTypeEnum.WRITE.ToString()).ToList();
                 foreach (CcsActionAddress actionAddress in CcsActionAddressWrites)
                 {
-                    if (!string.IsNullOrEmpty(actionAddress.Address))
+                   /* if (!string.IsNullOrEmpty(actionAddress.Address))
                     {
                         string Address = ToolUtils.AddressConvertDBW(actionAddress.Address);
                         s7.Write(Address, Convert.ToInt16(string.IsNullOrEmpty(actionAddress.Value) ? req.data.Location : actionAddress.Value)); ;
                         Thread.Sleep(SLEEP_TIME);
-                    }
+                    }*/
                 }
-                s7.Close();
+                //s7.Close();
 
                 //插入回调
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.GetQualityCenter.ToString(),

IMCS_CCS/bin/Debug/netcoreapp3.1/wwwroot/db/Tasks.json

@@ -1 +1 @@
-[{"Id":"79279511-ae90-4099-adca-3aba6851070d","ProjectId":"39028940-7220-465f-9ad6-830df4bda250","ProjectName":"数据采集中心 ","Name":"任务回调","GroupName":"任务回调","Cron":"*/2 * * * * ?","ApiUrl":"http://localhost:5200/api/JobTasks/callbackJob","HeaderToken":"","RequsetMode":0,"Remark":"","State":0,"ExecuteTime":null,"CreateTime":"2022-06-13T17:18:05.0682276+08:00"},{"Id":"a96c8103-c9cc-4960-a18a-fa7d0e634f17","ProjectId":"39028940-7220-465f-9ad6-830df4bda250","ProjectName":"数据采集中心 ","Name":"PLC数据采集","GroupName":"数据采集","Cron":"*/1 * * * * ?","ApiUrl":"http://localhost:8089/api/JobTasks/DataCollectS7Job","HeaderToken":"","RequsetMode":0,"Remark":"","State":0,"ExecuteTime":"2022-08-04T17:15:55.2263861+08:00","CreateTime":"2022-07-28T16:51:54.5352637+08:00"},{"Id":"ef51c3b5-a3c6-44b4-962b-22b4aa2fb5d1","ProjectId":"39028940-7220-465f-9ad6-830df4bda250","ProjectName":"数据采集中心 ","Name":"发那科机床采集","GroupName":"数据采集","Cron":"*/1 * * * * ?","ApiUrl":"http://localhost:8089/api/JobTasks/DataCollectFanucJob","HeaderToken":"","RequsetMode":0,"Remark":"","State":0,"ExecuteTime":"2022-08-04T17:16:08.0041194+08:00","CreateTime":"2022-06-12T14:00:24.4222816+08:00"},{"Id":"07769788-3322-47e4-9fd4-65a839e13444","ProjectId":"39028940-7220-465f-9ad6-830df4bda250","ProjectName":"数据采集中心 ","Name":"设备监控","GroupName":"数据采集","Cron":"*/1 * * * * ?","ApiUrl":"http://localhost:8089/api/JobTasks/DeviceStatusJob","HeaderToken":"","RequsetMode":0,"Remark":"","State":0,"ExecuteTime":"2022-07-28T16:56:54.7369303+08:00","CreateTime":"2022-06-18T22:20:06.9675162+08:00"}]
+[{"Id":"79279511-ae90-4099-adca-3aba6851070d","ProjectId":"39028940-7220-465f-9ad6-830df4bda250","ProjectName":"数据采集中心 ","Name":"任务回调","GroupName":"任务回调","Cron":"*/2 * * * * ?","ApiUrl":"http://localhost:8089/api/JobTasks/callbackJob2","HeaderToken":"","RequsetMode":0,"Remark":"","State":1,"ExecuteTime":"2022-08-04T19:20:41.2639677+08:00","CreateTime":"2022-06-13T17:18:05.0682276+08:00"},{"Id":"a96c8103-c9cc-4960-a18a-fa7d0e634f17","ProjectId":"39028940-7220-465f-9ad6-830df4bda250","ProjectName":"数据采集中心 ","Name":"PLC数据采集","GroupName":"数据采集","Cron":"*/1 * * * * ?","ApiUrl":"http://localhost:8089/api/JobTasks/DataCollectS7Job","HeaderToken":"","RequsetMode":0,"Remark":"","State":0,"ExecuteTime":"2022-08-04T17:15:55.2263861+08:00","CreateTime":"2022-07-28T16:51:54.5352637+08:00"},{"Id":"ef51c3b5-a3c6-44b4-962b-22b4aa2fb5d1","ProjectId":"39028940-7220-465f-9ad6-830df4bda250","ProjectName":"数据采集中心 ","Name":"发那科机床采集","GroupName":"数据采集","Cron":"*/1 * * * * ?","ApiUrl":"http://localhost:8089/api/JobTasks/DataCollectFanucJob","HeaderToken":"","RequsetMode":0,"Remark":"","State":0,"ExecuteTime":"2022-08-04T17:16:08.0041194+08:00","CreateTime":"2022-06-12T14:00:24.4222816+08:00"},{"Id":"07769788-3322-47e4-9fd4-65a839e13444","ProjectId":"39028940-7220-465f-9ad6-830df4bda250","ProjectName":"数据采集中心 ","Name":"设备监控","GroupName":"数据采集","Cron":"*/1 * * * * ?","ApiUrl":"http://localhost:8089/api/JobTasks/DeviceStatusJob","HeaderToken":"","RequsetMode":0,"Remark":"","State":0,"ExecuteTime":"2022-07-28T16:56:54.7369303+08:00","CreateTime":"2022-06-18T22:20:06.9675162+08:00"}]

IMCS_CCS/wwwroot/db/Tasks.json

@@ -1 +1 @@
-[{"Id":"79279511-ae90-4099-adca-3aba6851070d","ProjectId":"39028940-7220-465f-9ad6-830df4bda250","ProjectName":"数据采集中心 ","Name":"任务回调","GroupName":"任务回调","Cron":"*/2 * * * * ?","ApiUrl":"http://localhost:8089/api/JobTasks/callbackJob2","HeaderToken":"","RequsetMode":0,"Remark":"","State":1,"ExecuteTime":"2022-08-04T17:32:46.8639251+08:00","CreateTime":"2022-06-13T17:18:05.0682276+08:00"},{"Id":"a96c8103-c9cc-4960-a18a-fa7d0e634f17","ProjectId":"39028940-7220-465f-9ad6-830df4bda250","ProjectName":"数据采集中心 ","Name":"PLC数据采集","GroupName":"数据采集","Cron":"*/1 * * * * ?","ApiUrl":"http://localhost:8089/api/JobTasks/DataCollectS7Job","HeaderToken":"","RequsetMode":0,"Remark":"","State":0,"ExecuteTime":"2022-08-04T17:15:55.2263861+08:00","CreateTime":"2022-07-28T16:51:54.5352637+08:00"},{"Id":"ef51c3b5-a3c6-44b4-962b-22b4aa2fb5d1","ProjectId":"39028940-7220-465f-9ad6-830df4bda250","ProjectName":"数据采集中心 ","Name":"发那科机床采集","GroupName":"数据采集","Cron":"*/1 * * * * ?","ApiUrl":"http://localhost:8089/api/JobTasks/DataCollectFanucJob","HeaderToken":"","RequsetMode":0,"Remark":"","State":0,"ExecuteTime":"2022-08-04T17:16:08.0041194+08:00","CreateTime":"2022-06-12T14:00:24.4222816+08:00"},{"Id":"07769788-3322-47e4-9fd4-65a839e13444","ProjectId":"39028940-7220-465f-9ad6-830df4bda250","ProjectName":"数据采集中心 ","Name":"设备监控","GroupName":"数据采集","Cron":"*/1 * * * * ?","ApiUrl":"http://localhost:8089/api/JobTasks/DeviceStatusJob","HeaderToken":"","RequsetMode":0,"Remark":"","State":0,"ExecuteTime":"2022-07-28T16:56:54.7369303+08:00","CreateTime":"2022-06-18T22:20:06.9675162+08:00"}]
+[{"Id":"79279511-ae90-4099-adca-3aba6851070d","ProjectId":"39028940-7220-465f-9ad6-830df4bda250","ProjectName":"数据采集中心 ","Name":"任务回调","GroupName":"任务回调","Cron":"*/2 * * * * ?","ApiUrl":"http://localhost:8089/api/JobTasks/callbackJob2","HeaderToken":"","RequsetMode":0,"Remark":"","State":1,"ExecuteTime":"2022-08-04T19:21:43.7603217+08:00","CreateTime":"2022-06-13T17:18:05.0682276+08:00"},{"Id":"a96c8103-c9cc-4960-a18a-fa7d0e634f17","ProjectId":"39028940-7220-465f-9ad6-830df4bda250","ProjectName":"数据采集中心 ","Name":"PLC数据采集","GroupName":"数据采集","Cron":"*/1 * * * * ?","ApiUrl":"http://localhost:8089/api/JobTasks/DataCollectS7Job","HeaderToken":"","RequsetMode":0,"Remark":"","State":0,"ExecuteTime":"2022-08-04T17:15:55.2263861+08:00","CreateTime":"2022-07-28T16:51:54.5352637+08:00"},{"Id":"ef51c3b5-a3c6-44b4-962b-22b4aa2fb5d1","ProjectId":"39028940-7220-465f-9ad6-830df4bda250","ProjectName":"数据采集中心 ","Name":"发那科机床采集","GroupName":"数据采集","Cron":"*/1 * * * * ?","ApiUrl":"http://localhost:8089/api/JobTasks/DataCollectFanucJob","HeaderToken":"","RequsetMode":0,"Remark":"","State":0,"ExecuteTime":"2022-08-04T17:16:08.0041194+08:00","CreateTime":"2022-06-12T14:00:24.4222816+08:00"},{"Id":"07769788-3322-47e4-9fd4-65a839e13444","ProjectId":"39028940-7220-465f-9ad6-830df4bda250","ProjectName":"数据采集中心 ","Name":"设备监控","GroupName":"数据采集","Cron":"*/1 * * * * ?","ApiUrl":"http://localhost:8089/api/JobTasks/DeviceStatusJob","HeaderToken":"","RequsetMode":0,"Remark":"","State":0,"ExecuteTime":"2022-07-28T16:56:54.7369303+08:00","CreateTime":"2022-06-18T22:20:06.9675162+08:00"}]