From 17e3ef45fe0a6b6f8a147b50740834ac734f9317 Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期二, 15 七月 2025 17:30:13 +0800
Subject: [PATCH] 1111
---
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/util/HttpHelper.cs | 121 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 118 insertions(+), 3 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/util/HttpHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/util/HttpHelper.cs
index 09a1818..22092a9 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/util/HttpHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/util/HttpHelper.cs
@@ -288,7 +288,7 @@
var r = WebPost(url, date);
LogHelper.Info($"鑾峰彇璁惧鐘舵�锛氳繑鍥炲唴瀹癸細{r}");
deviceStatus = JsonConvert.DeserializeObject<Result<DeviceStatusModel>>(r);
- if (deviceStatus.Code == 200)
+ if (deviceStatus != null && deviceStatus.Code == 200)
{
LogHelper.Info($"鑾峰彇璁惧鐘舵�鎴愬姛");
}
@@ -325,13 +325,12 @@
taskPushModel.TaskType = task.S_TYPE;
taskPushModel.CntrNo = task.S_CNTR_CODE;
-
string date = JsonConvert.SerializeObject(taskPushModel);
LogHelper.Info($"涓嬪彂浠诲姟锛氬湴鍧�{url}锛屽唴瀹癸細{date}");
var r = WebPost(url, date);
LogHelper.Info($"涓嬪彂浠诲姟锛氳繑鍥炲唴瀹癸細{r}");
result = JsonConvert.DeserializeObject<Result<Empty>>(r);
- if (result.Code == 200)
+ if (result!=null&&result.Code == 200)
{
LogHelper.Info($"涓嬪彂浠诲姟鎴愬姛");
}
@@ -349,5 +348,121 @@
}
}
+
+ /// <summary>
+ /// 浠诲姟鍙栨秷
+ /// </summary>
+ /// <param name="task">浠诲姟</param>
+ /// <param name="url">鍦板潃</param>
+ public Result<Empty> CancelTask(WCSTask task, string url)
+ {
+ //杩斿洖淇℃伅
+ Result<Empty> result = new Result<Empty>();
+ try
+ {
+ string taskno=task.S_CODE;
+ string date = JsonConvert.SerializeObject(taskno);
+ LogHelper.Info($"浠诲姟鍙栨秷锛氬湴鍧�{url}锛屽唴瀹癸細{date}");
+ var r = WebPost(url, date);
+ LogHelper.Info($"浠诲姟鍙栨秷锛氳繑鍥炲唴瀹癸細{r}");
+ result = JsonConvert.DeserializeObject<Result<Empty>>(r);
+ if (result != null && result.Code == 200)
+ {
+ LogHelper.Info($"浠诲姟鍙栨秷鎴愬姛");
+ }
+ else
+ {
+ LogHelper.Info($"浠诲姟鍙栨秷澶辫触=>msg:{result.Msg}");
+ }
+ return result;
+ }
+ catch (Exception ex)
+ {
+
+ LogHelper.Info($"浠诲姟鍙栨秷=>閿欒锛歟rror锛歿ex.Message}锛岃鍙�{ex.StackTrace}");
+ return result;
+ }
+
+ }
+
+ /// <summary>
+ /// 璁惧鐘舵�鍒囨崲
+ /// </summary>
+ /// <param name="task"></param>
+ /// <param name="url"></param>
+ /// <returns></returns>
+ public Result<Empty> ChangeStatus(string type, string url)
+ {
+ //杩斿洖淇℃伅
+ Result<Empty> result = new Result<Empty>();
+ try
+ {
+ ChangeStatusModel changeStatusModel=new ChangeStatusModel();
+
+ changeStatusModel.Type = type;
+ changeStatusModel.DeviceNo = "2";
+ string date = JsonConvert.SerializeObject(changeStatusModel);
+ LogHelper.Info($"璁惧鐘舵�鍒囨崲锛氬湴鍧�{url}锛屽唴瀹癸細{date}");
+ var r = WebPost(url, date);
+ LogHelper.Info($"璁惧鐘舵�鍒囨崲锛氳繑鍥炲唴瀹癸細{r}");
+ result = JsonConvert.DeserializeObject<Result<Empty>>(r);
+ if (result != null && result.Code == 200)
+ {
+ LogHelper.Info($"璁惧鐘舵�鍒囨崲鎴愬姛");
+ }
+ else
+ {
+ LogHelper.Info($"璁惧鐘舵�鍒囨崲澶辫触=>msg:{result.Msg}");
+ }
+ return result;
+ }
+ catch (Exception ex)
+ {
+
+ LogHelper.Info($"璁惧鐘舵�鍒囨崲=>閿欒锛歟rror锛歿ex.Message}锛岃鍙�{ex.StackTrace}");
+ return result;
+ }
+
+ }
+
+ /// <summary>
+ /// 淇敼浠诲姟浼樺厛绾�+ /// </summary>
+ /// <param name="task"></param>
+ /// <param name="url"></param>
+ /// <returns></returns>
+ public Result<Empty> ChangePriority(string taskno,int priority, string url)
+ {
+ //杩斿洖淇℃伅
+ Result<Empty> result = new Result<Empty>();
+ try
+ {
+ ChangePriorityModel model = new ChangePriorityModel();
+
+ model.TaskNo = taskno;
+ model.Priority = priority;
+ string date = JsonConvert.SerializeObject(model);
+ LogHelper.Info($"淇敼浠诲姟浼樺厛绾э細鍦板潃:{url}锛屽唴瀹癸細{date}");
+ var r = WebPost(url, date);
+ LogHelper.Info($"淇敼浠诲姟浼樺厛绾э細杩斿洖鍐呭锛歿r}");
+ result = JsonConvert.DeserializeObject<Result<Empty>>(r);
+ if (result != null && result.Code == 200)
+ {
+ LogHelper.Info($"淇敼浠诲姟浼樺厛绾ф垚鍔�);
+ }
+ else
+ {
+ LogHelper.Info($"淇敼浠诲姟浼樺厛绾уけ璐�>msg:{result.Msg}");
+ }
+ return result;
+ }
+ catch (Exception ex)
+ {
+
+ LogHelper.Info($"淇敼浠诲姟浼樺厛绾�>閿欒锛歟rror锛歿ex.Message}锛岃鍙�{ex.StackTrace}");
+ return result;
+ }
+
+ }
}
}
--
Gitblit v1.9.1