From ee91fab34fcd79f3da55956897633b9cdf3e2f59 Mon Sep 17 00:00:00 2001
From: qiuyao <qiuyao@hnkhzn.com>
Date: 星期一, 31 三月 2025 08:36:31 +0800
Subject: [PATCH] Merge branch 'qy0227' of http://115.159.85.185:8098/r/MeiXinLaiRui/NiuJuKongZhi into qy0311
---
项目代码/WIDESEAWCS_Server 正式/ISerialPortService/ITorqueOpServer.cs | 10 +++++
项目代码/WIDESEAWCS_Server 正式/SerialPortService/NjTaskServer.cs | 1
项目代码/WIDESEAWCS_Server 正式/SerialPortService/PutakeServer.cs | 20 +++++++++-
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_Server/Controllers/SerialPort/PutakeController.cs | 5 ++
项目代码/WIDESEAWCS_Server 正式/SerialPortService/TorqueOpServer.cs | 13 ++++++
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_Server/Controllers/SerialPort/TorqueOpController.cs | 6 +++
项目代码/WIDESEAWCS_Server 正式/ISerialPortService/IPutakeServer.cs | 8 +++
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_Tasks/SerialPort/SerialPortJob.cs | 57 +++++++++++++++++++++-------
8 files changed, 101 insertions(+), 19 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/ISerialPortService/IPutakeServer.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/ISerialPortService/IPutakeServer.cs"
index 00a8393..68c05dd 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/ISerialPortService/IPutakeServer.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/ISerialPortService/IPutakeServer.cs"
@@ -20,8 +20,14 @@
//鏌ョ湅鍏蜂綋璇︽儏(鏍规嵁Ntakeid)
WebResponseContent GetNjtake(string njid);
+ /// <summary>
+ /// 鎵煩鎵虫墜涓涓�鏉¤鎵ц鐨勪换鍔�
+ /// </summary>
+ /// <param name="group">缁勫埆</param>
+ /// <returns></returns>
+ WebResponseContent PerformTasks(string group);
-
+
}
}
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 286341f..9fac0a4 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"
@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_DTO.SerialPort;
@@ -19,5 +20,14 @@
WebResponseContent Checkvalue(GetTorDTO getTorDTO);
WebResponseContent AddTorqueOp(Dt_TorqueOp torqueOp);
+
+ /// <summary>
+ /// 鍒ゆ柇op琛ㄤ腑杩欎釜鍊兼槸鍚︽湁璇ユ潯浠诲姟鐨勬暟鎹�
+ /// </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/NjTaskServer.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/NjTaskServer.cs"
index d23ec3c..d202eec 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/NjTaskServer.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/NjTaskServer.cs"
@@ -97,7 +97,6 @@
existtepm.TakeName = njtakeDTO.takename;
existtepm.jiShuYuan = njtakeDTO.jishuyuan;
existtepm.gongZhang = njtakeDTO.gongzhang;
-
existtepm.zhiJianYuan_Dq = njtakeDTO.zhijianyuan_dq;
existtepm.zhiJianYuan_Lc = njtakeDTO.zhijianyuan_lc;
existtepm.zhiJianYuan_Dg = njtakeDTO.zhijianyuan_dg;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/PutakeServer.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/PutakeServer.cs"
index 82cd6af..550fa3f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/PutakeServer.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/PutakeServer.cs"
@@ -221,8 +221,24 @@
}
}
+ public WebResponseContent PerformTasks(string group)
+ {
+ try
+ {
+ var putake=BaseDal.QueryData(x=>x.Grouptype==group&&x.Pustatus==1)
+ .OrderBy(x=>x.Dispatchtime)
+ .FirstOrDefault();
+ if (putake == null)
+ {
+ return new WebResponseContent { Status = false, Message = "娌℃壘鍒拌浠诲姟" };
+ }
+ return new WebResponseContent { Status = true,Data=putake};
+ }
+ catch (Exception ex)
+ {
-
-
+ 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/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 65e4ee4..2c60365 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"
@@ -82,5 +82,18 @@
}
}
+ public WebResponseContent WhetherSaveValueData(string takeid, string group, int setpunm)
+ {
+ try
+ {
+ var tor = BaseDal.QueryData(x => x.TakeId == takeid && x.GroupOp == group && x.ProcessSte == setpunm);
+ return new WebResponseContent { Status = true,Data=tor };
+ }
+ catch (Exception ex)
+ {
+
+ 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/Controllers/SerialPort/PutakeController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/Controllers/SerialPort/PutakeController.cs"
index 7d1cc93..7e624dc 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/Controllers/SerialPort/PutakeController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/Controllers/SerialPort/PutakeController.cs"
@@ -36,6 +36,11 @@
return Service.GetNjtake(njid);
}
+ [HttpGet, Route("PerformTasks"), AllowAnonymous]
+ public WebResponseContent PerformTasks(string group)
+ {
+ return Service.PerformTasks(group);
+ }
}
}
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/Controllers/SerialPort/TorqueOpController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/Controllers/SerialPort/TorqueOpController.cs"
index a1c17fb..b85a18f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/Controllers/SerialPort/TorqueOpController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/Controllers/SerialPort/TorqueOpController.cs"
@@ -31,5 +31,11 @@
return Service.AddTorqueOp(torqueOp);
}
+ [HttpPost,Route("WhetherSaveValueData"), AllowAnonymous]
+ public WebResponseContent WhetherSaveValueData(string takeid, string group, int setpunm)
+ {
+ return Service.WhetherSaveValueData(takeid, group, setpunm);
+ }
+
}
}
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 94f6b98..cab0415 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"
@@ -58,8 +58,9 @@
private WebSocketServer _webSocketContext;
private readonly IProcessServer _processServer;
private readonly IPutakeServer _putakeServer;
+ private readonly ITorqueOpServer _torqueOpServer;
- public SerialPortJob(IPutakeServer putakeServer,IProcessServer processServer, IPutakeRepository putakeRepository, IProcessRepository processRepository, ITorqueOpRepository torqueOpRepository, WebSocketServer webSocketContext)
+ public SerialPortJob(ITorqueOpServer torqueOpServer,IPutakeServer putakeServer,IProcessServer processServer, IPutakeRepository putakeRepository, IProcessRepository processRepository, ITorqueOpRepository torqueOpRepository, WebSocketServer webSocketContext)
{
_putakeRepository = putakeRepository;
_processRepository = processRepository;
@@ -67,6 +68,7 @@
_webSocketContext = webSocketContext;
_processServer = processServer;
_putakeServer = putakeServer;
+ _torqueOpServer= torqueOpServer;
}
public Task Execute(IJobExecutionContext context)
@@ -133,10 +135,6 @@
string group = item.DeviceProDataBlock; // 璁惧鎵�灞炵粍鍒�
string devicecode = item.DeviceChildCode;//璁惧缂栧彿
string torqueValue = ExtractTorqueValue(receiveData);//璋冪敤杞�兼柟娉�
-
-
-
-
if (group == "鐢垫皵" || group == "鍦版矡" || group == "鏈烘")
{
SaveTorqueOpData(group, devicecode, torqueValue);
@@ -203,13 +201,20 @@
/// <param name="deviceProtocolDetail">璁惧鍗忚璇︽儏</param>
private void ProcessElectricTask(string group, SerialPortDevice serialPortDevice, DeviceProDTO item, DeviceProtocolDetailDTO deviceProtocolDetail)
{
- //鑾峰彇褰撳墠浠诲姟鍙� //IPutakeServer閲岄潰鐨勫緟鎵ц鐨勭涓�鏉′换鍔★紱
- var take = _putakeRepository.QueryData(x => x.Grouptype == group)
- .OrderBy(x => x.Dispatchtime)
- .FirstOrDefault();
+ //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;//鎷垮埌浠诲姟鍙�
- //璋冪敤Getcircuit鎷垮埌褰撳墠姝ラ
+ //2.璋冪敤Getcircuit鎷垮埌褰撳墠姝ラ
var process = _processServer.Getcircuit(group, takeid);
if (process != null && process.Status)
@@ -230,7 +235,18 @@
//鍒ゆ柇op琛ㄤ腑杩欎釜鍊兼槸鍚︽湁璇ユ潯浠诲姟鐨勬暟鎹�
- var op = _orqueOpRepository.QueryData(x => x.TakeId == takeid && x.GroupOp == group && x.ProcessSte == setpNum);
+ //var op = _orqueOpRepository.QueryData(x => x.TakeId == takeid && x.GroupOp == group && x.ProcessSte == setpNum);
+ // 3. 鏌ヨ鎵煩璁板綍
+ var opResponse = _torqueOpServer.WhetherSaveValueData(takeid, group, setpNum);
+ if (opResponse == null || !opResponse.Status || opResponse.Data == null)
+ {
+ Console.WriteLine($"WhetherSaveValueData鎺ュ彛閿欒锛歿opResponse?.Message}");
+ return;
+ }
+
+ var op = JsonConvert.DeserializeObject<List<Dt_TorqueOp>>(JsonConvert.SerializeObject(opResponse.Data)); // 纭繚杞崲姝ｇ‘
+
+
if (op.Any())//鍒ゆ柇鏄惁鏈夋暟鎹�
{
//鎵惧埌浜嗗氨瑕佸姣旂幇鍦╫p琛ㄤ腑鏈夊灏戞潯锛屾槸鍚﹀拰宸ヨ壓琛ㄤ腑鐨勭洰鏍囦竴鑷�
@@ -321,9 +337,17 @@
/// </summary>
private void SaveTorqueOpData(string group, string devicecode, string torqueValue)
{
- var take = _putakeRepository.QueryData(x => x.Grouptype == group)
- .OrderBy(x => x.Dispatchtime)
- .FirstOrDefault();
+ //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鎷垮埌褰撳墠姝ラ
@@ -352,7 +376,10 @@
TorqueSize = float.TryParse(torqueValue, out float torque) ? torque : 0.0f, // 杩欓噷杩涜瀛楃涓插埌float鐨勮浆鎹�
CreateDate = DateTime.Now,
};
- _orqueOpRepository.AddData(Addop);
+ //_orqueOpRepository.AddData(Addop);
+ _torqueOpServer.AddData(Addop);
+
+
}
}
}
--
Gitblit v1.9.3