From 0bf4a3d86b017fc4cadddda4182e682386dfee82 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期四, 03 七月 2025 18:08:52 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/TcpServer.cs | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/TcpServer.cs" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/TcpServer.cs"
index 4ebf30c..3023c94 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/TcpServer.cs"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/TcpServer.cs"
@@ -8,6 +8,7 @@
using System.Net;
using System.Text;
using System.Threading.Tasks;
+using GZ.Modular.Redis;
namespace GZ.Projects.AuxAllWCS
{
@@ -27,6 +28,7 @@
{
//灏嗚socket缁戝畾鍒颁富鏈轰笂闈㈢殑鏌愪釜绔彛
socket.Bind(new IPEndPoint(IPAddress.Parse(ip), 2025));
+ Console.WriteLine($"TCPServer socket 鐩戝惉{ip}:{2025} ");
//鍚姩鐩戝惉锛屽苟涓旇缃竴涓渶澶х殑闃熷垪闀垮害
socket.Listen(30);
//寮�鎺ュ彈瀹㈡埛绔繛鎺ヨ姹�@@ -117,19 +119,25 @@
//{
Console.WriteLine($"銆怲CP淇℃伅鍗忚 {DateTime.Now.Millisecond}銆戯細IP锛歿remote_ip},MSG锛歿message}");
var mg = Encoding.ASCII.GetString(PlcHelper.Hex2Bin(message));
+ if (mg.Length > 10)
+ {
+ mg = mg.Substring(0, 10);
+ }
Console.WriteLine(mg);
- if (mg.StartsWith("DK") && mg.Trim().Length == "DK01000024".Length)
+ if (mg.StartsWith("DK"))//&& mg.Trim().Length == "DK01000024".Length
{
LogHelper.Info($"鎵爜鍣�>{remote_ip} -{mg}");
if (TrayIps.TryGetValue(remote_ip, out string traycode))
{
- TrayIps[remote_ip] = traycode;
+ TrayIps[remote_ip] = mg;
}
- else TrayIps.Add(remote_ip, traycode);
+ else TrayIps.Add(remote_ip, mg);
- Console.WriteLine("TOFF");
- var mst = PlcHelper.Hex2Bin("544F4646");
- TcpServer.TcpServerSend(remote_ip, mst);
+ RedisHelper.Add("S鎵爜鍣� + (remote_ip.Split('.').LastOrDefault()), mg, out string msg);
+ RedisHelper.Add("S鎵爜鍣� + (remote_ip.Split('.').LastOrDefault()) + "#time", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"), out msg);
+ //Console.WriteLine("TOFF");
+ //var mst = PlcHelper.Hex2Bin("544F4646");
+ //TcpServer.TcpServerSend(remote_ip, mst);
}
//}
}
@@ -170,7 +178,7 @@
{
try
{
- client.Send(msg);
+ client.Send(msg);
LogHelper.Info($"TcpServerSend > 鍙戦�鎴愬姛銆�);
return true;
}
--
Gitblit v1.9.1