From 9dd01fc3eb30b0d3b1f64d9e4c5baa4173e6d056 Mon Sep 17 00:00:00 2001
From: qiuyao <qiuyao@hnkhzn.com>
Date: 星期一, 31 三月 2025 17:35:59 +0800
Subject: [PATCH] Merge branch 'qy0227' of http://115.159.85.185:8098/r/MeiXinLaiRui/NiuJuKongZhi into qy0311
---
项目代码/WIDESEAWCS_Server 正式/ISerialPortService/ITorqueOpServer.cs | 5 +
项目代码/WIDESEAWCS_Server 正式/SerialPortService/TorqueOpServer.cs | 4 +
项目代码/WIDESEAWCS_Server 正式/.vs/WIDESEAWCS_Server/v17/HierarchyCache.v1.txt | 0
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_Server/appsettings.json | 2
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_Tasks/SerialPort/SerialPortJob.cs | 128 ++++++++++++++++++++++++++++++------------
5 files changed, 99 insertions(+), 40 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/.vs/WIDESEAWCS_Server/v17/HierarchyCache.v1.txt" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/.vs/WIDESEAWCS_Server/v17/HierarchyCache.v1.txt"
index 8a56d30..2960500 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/.vs/WIDESEAWCS_Server/v17/HierarchyCache.v1.txt"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/.vs/WIDESEAWCS_Server/v17/HierarchyCache.v1.txt"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/ISerialPortService/ITorqueOpServer.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/ISerialPortService/ITorqueOpServer.cs"
index 9fac0a4..5607ada 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/ISerialPortService/ITorqueOpServer.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/ISerialPortService/ITorqueOpServer.cs"
@@ -19,15 +19,18 @@
/// <returns></returns>
WebResponseContent Checkvalue(GetTorDTO getTorDTO);
+
+
WebResponseContent AddTorqueOp(Dt_TorqueOp torqueOp);
/// <summary>
- /// 鍒ゆ柇op琛ㄤ腑杩欎釜鍊兼槸鍚︽湁璇ユ潯浠诲姟鐨勬暟鎹�
+ /// 鍒ゆ柇op琛ㄤ腑杩欎釜鍊兼槸鍚︽湁璇ユ潯浠诲姟鐨勬暟鎹�/缁欏墠绔繑鍥炲綋鍓峯p琛ㄤ腑鐨勫��
/// </summary>
/// <param name="takeid">浠诲姟鍙�</param>
/// <param name="group">缁勫埆</param>
/// <param name="setpunm">姝ラ</param>
/// <returns></returns>
WebResponseContent WhetherSaveValueData(string takeid,string group,int setpunm);
+
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/TorqueOpServer.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/TorqueOpServer.cs"
index 2c60365..76111c3 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/TorqueOpServer.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/TorqueOpServer.cs"
@@ -14,7 +14,7 @@
namespace WIDESEAWCS_TaskInfoService
{
- public class TorqueOpServer : ServiceBase<Dt_TorqueOp, ITorqueOpRepository>,ITorqueOpServer
+ public class TorqueOpServer : ServiceBase<Dt_TorqueOp, ITorqueOpRepository>, ITorqueOpServer
{
private IProcessRepository _iprocessRepository;
public TorqueOpServer(ITorqueOpRepository BaseDal, IProcessRepository iprocessRepository) : base(BaseDal)
@@ -95,5 +95,7 @@
return new WebResponseContent { Status = false, Message = "閿欒" + ex.Message };
}
}
+
+
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/appsettings.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/appsettings.json"
index 2614333..41cf0f7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/appsettings.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/appsettings.json"
@@ -30,6 +30,6 @@
"QuartzJobAutoStart": true,
"PrintSql": false,
"WebSocketEnable": true,
- "WebSocketPort": 5000,
+ "WebSocketPort": 5174,
"LogDeubgEnable": true
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Tasks/SerialPort/SerialPortJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Tasks/SerialPort/SerialPortJob.cs"
index cab0415..e27d8df 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Tasks/SerialPort/SerialPortJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Tasks/SerialPort/SerialPortJob.cs"
@@ -9,8 +9,10 @@
using System.Threading.Tasks;
using AutoMapper;
using HslCommunication.WebSocket;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using Quartz;
@@ -27,11 +29,12 @@
using WIDESEAWCS_QuartzJob.DTO;
using WIDESEAWCS_TaskInfoService;
using WIDESEAWCS_Tasks.SerialPort;
+using static WIDESEAWCS_Tasks.SerialPortJob;
namespace WIDESEAWCS_Tasks
{
[DisallowConcurrentExecution]
- public class SerialPortJob : JobBase, IJob,IDisposable
+ public class SerialPortJob : JobBase, IJob, IDisposable
{
public void Dispose()
{
@@ -60,7 +63,9 @@
private readonly IPutakeServer _putakeServer;
private readonly ITorqueOpServer _torqueOpServer;
- public SerialPortJob(ITorqueOpServer torqueOpServer,IPutakeServer putakeServer,IProcessServer processServer, IPutakeRepository putakeRepository, IProcessRepository processRepository, ITorqueOpRepository torqueOpRepository, WebSocketServer webSocketContext)
+ static string takeid = ""; // 鍦ㄥ惊鐜紑濮嬪墠澹版槑 takeid
+
+ public SerialPortJob(ITorqueOpServer torqueOpServer, IPutakeServer putakeServer, IProcessServer processServer, IPutakeRepository putakeRepository, IProcessRepository processRepository, ITorqueOpRepository torqueOpRepository, WebSocketServer webSocketContext)
{
_putakeRepository = putakeRepository;
_processRepository = processRepository;
@@ -68,8 +73,10 @@
_webSocketContext = webSocketContext;
_processServer = processServer;
_putakeServer = putakeServer;
- _torqueOpServer= torqueOpServer;
+ _torqueOpServer = torqueOpServer;
}
+
+
public Task Execute(IJobExecutionContext context)
{
@@ -79,6 +86,7 @@
if (serialPortDevice != null)
{
List<DeviceProDTO> deviceProDTOs = serialPortDevice.DeviceProDTOs;
+
foreach (var item in deviceProDTOs)
{
if (item.DeviceProParamName != CommandType.Get.ToString() && item.DeviceProParamName != CommandType.Set.ToString())
@@ -86,11 +94,28 @@
DeviceProtocolDetailDTO? deviceProtocolDetail = serialPortDevice.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == nameof(CommandType) && x.ProtocolDetailType == nameof(CommandType.Set));
if (deviceProtocolDetail != null)
{
- string group = item.DeviceProDataBlock;
-
+ string group = item.DeviceProDataBlock;//缁勫埆
+
+ ////2.璋冪敤Getcircuit鎷垮埌褰撳墠姝ラ
+ //var process = _processServer.Getcircuit(group, takeid);
+
+
+
if (group == "鐢垫皵" || group == "鍦版矡" || group == "鏈烘")
- {
- ProcessElectricTask(group, serialPortDevice, item, deviceProtocolDetail);
+ { // 鏌ヨ浠诲姟淇℃伅涓�娆�
+ var takeResponse = _putakeServer.PerformTasks(group);//鏌ユ壘浠诲姟鍒嗚В琛ㄨ繖鏉℃渶鏃╃殑鏁版嵁
+ if (takeResponse == null || !takeResponse.Status)
+ {
+ Console.WriteLine($"浠诲姟鍒嗙骇琛ㄦ帴鍙ｉ敊璇細{takeResponse?.Message}");
+ continue;
+ }
+
+ var take = JsonConvert.DeserializeObject<Dt_Putake>(JsonConvert.SerializeObject(takeResponse.Data));
+ takeid = take?.Njtakeid; // 缂撳瓨浠诲姟鍙�
+ if (takeid != null)
+ {
+ ProcessElectricTask(group, serialPortDevice, item, deviceProtocolDetail, takeid);
+ }
}
item.DeviceProParamName = CommandType.None.ToString();
}
@@ -134,10 +159,47 @@
//鎶婅繖鏉℃暟鎹彃鍏p琛ㄤ腑
string group = item.DeviceProDataBlock; // 璁惧鎵�灞炵粍鍒�
string devicecode = item.DeviceChildCode;//璁惧缂栧彿
- string torqueValue = ExtractTorqueValue(receiveData);//璋冪敤杞�兼柟娉�
+ string torqueValue = ExtractTorqueValue(receiveData);//璋冪敤杞�兼柟娉�
if (group == "鐢垫皵" || group == "鍦版矡" || group == "鏈烘")
{
- SaveTorqueOpData(group, devicecode, torqueValue);
+ if (takeid != null)
+ {
+
+
+ //web
+ var process = _processServer.Getcircuit(group, takeid);
+ //var list = JsonConvert.SerializeObject(process.Data);//搴忓垪鍖�
+ //var dataS= JsonConvert.DeserializeObject<ProcessData>(list);//瀛楃涓插弽搴忓垪鍖栦负鍗曚釜 ProcessData 瀵硅薄
+
+ var dataS = JsonConvert.DeserializeObject<ProcessData>(JsonConvert.SerializeObject(process.Data)); // 纭繚涓哄璞�
+ int setnum = dataS.proNow.SetpNum;
+
+ //瀛樺��
+ SaveTorqueOpData(group, devicecode, torqueValue, takeid);
+
+ //op
+ var opResponse = _torqueOpServer.WhetherSaveValueData(takeid, group, setnum);
+ //var jsonResponse = JsonConvert.SerializeObject(opResponse.Data);
+ var opData = JsonConvert.DeserializeObject<List<Dt_TorqueOp>>(JsonConvert.SerializeObject(opResponse.Data)); // 纭繚涓哄璞�
+
+
+
+ // 鍒涘缓鍓嶇闇�瑕佺殑鏁版嵁瀵硅薄
+ var responseData = new
+ {
+ process = dataS, // 宸ヨ壓琛�
+ operation = opData // op琛�
+ };//杩斿洖褰撳墠宸ヨ壓姝ラ鍜宱p琛ㄤ腑婊¤冻鏉′欢鐨勫��
+
+
+
+ //寤轰竴涓璞″皢鍏朵紶缁欏墠绔�/搴忓垪鍖栧苟鎺ㄩ�佺粰鍓嶇
+ string data = JsonConvert.SerializeObject(responseData);//杩欓噷serialPortDevice鏄亣璁炬湁杩欎釜瀵硅薄
+ _webSocketContext.PublishAllClientPayload(data);
+ }
+
+
+
item.DeviceProParamName = CommandType.None.ToString();
}
@@ -151,10 +213,9 @@
}
}
+
- //寤轰竴涓璞″皢鍏朵紶缁欏墠绔�
- //string data = JsonConvert.SerializeObject(serialPortDevice);//杩欓噷serialPortDevice鏄亣璁炬湁杩欎釜瀵硅薄
- //_webSocketContext.PublishAllClientPayload(data);
+
}
}
@@ -190,7 +251,7 @@
}
-
+
/// <summary>
/// 澶勭悊鐢垫皵浠诲姟閫昏緫锛屽彂閫佹壄鐭╂寚浠ゅ埌璁惧
@@ -199,20 +260,13 @@
/// <param name="serialPortDevice">涓插彛璁惧</param>
/// <param name="item">璁惧淇℃伅</param>
/// <param name="deviceProtocolDetail">璁惧鍗忚璇︽儏</param>
- private void ProcessElectricTask(string group, SerialPortDevice serialPortDevice, DeviceProDTO item, DeviceProtocolDetailDTO deviceProtocolDetail)
+ private void ProcessElectricTask( string group, SerialPortDevice serialPortDevice, DeviceProDTO item, DeviceProtocolDetailDTO deviceProtocolDetail, string takeid)
{
//1.鑾峰彇褰撳墠浠诲姟鍙� //IPutakeServer閲岄潰鐨勫緟鎵ц鐨勭涓�鏉′换鍔★紱
//var take = _putakeRepository.QueryData(x => x.Grouptype == group)
// .OrderBy(x => x.Dispatchtime)
// .FirstOrDefault();
- var takeResponse = _putakeServer.PerformTasks(group);
- if (takeResponse == null || !takeResponse.Status)
- {
- Console.WriteLine($"浠诲姟鍒嗙骇琛ㄦ帴鍙ｉ敊璇細{takeResponse?.Message}");
- }
- var take = JsonConvert.DeserializeObject<Dt_Putake>(JsonConvert.SerializeObject(takeResponse.Data)); // 纭繚杞崲姝ｇ‘
- var takeid = take?.Njtakeid;//鎷垮埌浠诲姟鍙�
//2.璋冪敤Getcircuit鎷垮埌褰撳墠姝ラ
var process = _processServer.Getcircuit(group, takeid);
@@ -297,7 +351,7 @@
}
}
//杩欓噷杩欎釜浠诲姟绗竴娆℃墽琛岋紝op琛ㄤ腑鑲畾鏄病鏈夋暟鎹殑锛屾墍鏈夌涓�娆″氨瑕佹妸宸ヨ壓琛ㄤ腑鐨勫�肩粰瀹�
- else if(!op.Any()&& torqueone!=0)//闃叉姝ラ涓�涓璽orqueone鐨勫�间负0瀵艰嚧鎶ラ敊
+ else if (!op.Any() && torqueone != 0)//闃叉姝ラ涓�涓璽orqueone鐨勫�间负0瀵艰嚧鎶ラ敊
{
//璁惧��
var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue
@@ -310,7 +364,7 @@
{
Console.WriteLine("proNow 涓虹┖");
}
- }
+ }
else
{
Console.WriteLine($"Getcireit鎺ュ彛閿欒锛歿process?.Message}");
@@ -335,22 +389,10 @@
/// <summary>
/// 瀛樺偍鎵煩鏁版嵁鍒� `op` 琛�
/// </summary>
- private void SaveTorqueOpData(string group, string devicecode, string torqueValue)
+ private void SaveTorqueOpData(string group, string devicecode, string torqueValue, string takeid)
{
- //var take = _putakeRepository.QueryData(x => x.Grouptype == group)
- // .OrderBy(x => x.Dispatchtime)
- // .FirstOrDefault();
- //var takeid = take?.Njtakeid;//鎷垮埌浠诲姟鍙�
- var takeResponse = _putakeServer.PerformTasks(group);
- if (takeResponse == null || !takeResponse.Status)
- {
- Console.WriteLine($"浠诲姟鍒嗙骇琛ㄦ帴鍙ｉ敊璇細{takeResponse?.Message}");
- }
- var take = JsonConvert.DeserializeObject<Dt_Putake>(JsonConvert.SerializeObject(takeResponse.Data)); // 纭繚杞崲姝ｇ‘
- var takeid = take?.Njtakeid;//鎷垮埌浠诲姟鍙�
-
- //璋冪敤Getcircuit鎷垮埌褰撳墠姝ラ
+ ////璋冪敤Getcircuit鎷垮埌褰撳墠姝ラ
var process = _processServer.Getcircuit(group, takeid);
if (process != null && process.Status)
@@ -383,5 +425,17 @@
}
}
}
+
+ public class TorqueOpData
+ {
+ /// <summary>
+ /// 杩斿洖
+ /// </summary>
+ public List<Dt_TorqueOp> TorList { get; set; }
+ }
+
+
+
+
}
}
--
Gitblit v1.9.3