三坐标回调

IMCS_CCS/Service/Impl/TaskJobService.cs

@@ -1083,7 +1083,7 @@ namespace IMCS.CCS.Service.Impl
                     }
 
                     CcsTagValue tagValue2 = tagValues.Where(o => o.Address == posValue && o.TagValue != "0").FirstOrDefault();
-                    if (tagValue != null && tagValue2 != null && (tagValue.TagValue == task.CallbackValue))
+                    if (tagValue != null && tagValue2 != null && (tagValue2.TagValue == "1"))
                     {
                         CallBackThreeCoordinatesRequestData requestData = new CallBackThreeCoordinatesRequestData();
                         requestData.taskId = long.Parse(task.TaskId);
@@ -1197,7 +1197,7 @@ namespace IMCS.CCS.Service.Impl
                     }
 
                     //回调检测到失败，回调通知ecs
-                    if (!string.IsNullOrEmpty(task.FailAddress) || !string.IsNullOrEmpty(task.FailAddress2) || !string.IsNullOrEmpty(task.FailAddress3))
+                    if (!string.IsNullOrEmpty(task.FailAddress) || !string.IsNullOrEmpty(task.FailAddress2) || !string.IsNullOrEmpty(task.FailAddress3) || tagValue2 != null)
                     {
                         bool failFalg = false;
                         if (!string.IsNullOrEmpty(task.FailAddress))
@@ -1227,6 +1227,10 @@ namespace IMCS.CCS.Service.Impl
                                 failFalg = true;
                             }
                         }
+                        if(tagValue2.TagValue == "2" || tagValue2.TagValue == "3")
+                        {
+                            failFalg = true;
+                        } 
                         if (failFalg)
                         {
                             CallBackRequestData requestData = new CallBackRequestData();