From 2d3ee03961d6cfbde70342e8a97bc7b05d0b0dc3 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 21 七月 2025 17:27:34 +0800
Subject: [PATCH] 优化代码, 封装货位锁和创建任务流程, 数据库事务等
---
device/TcpServer.cs | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/device/TcpServer.cs b/device/TcpServer.cs
index 5ee2f16..3340cb5 100644
--- a/device/TcpServer.cs
+++ b/device/TcpServer.cs
@@ -1,4 +1,6 @@
锘縰sing HH.WCS.Mobox3.DSZSH.dispatch;
+using HH.WCS.Mobox3.DSZSH.util;
+
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -17,14 +19,14 @@
}
private void Init(string ip, int port)
{
- //鍒涘缓涓�釜鏂扮殑Socket,杩欓噷鎴戜滑浣跨敤鏈�父鐢ㄧ殑鍩轰簬TCP鐨凷tream Socket锛堟祦寮忓鎺ュ瓧锛�+ //鍒涘缓涓�釜鏂扮殑Socket,杩欓噷鎴戜滑浣跨敤鏈�父鐢ㄧ殑鍩轰簬TCP鐨凷tream Socket (娴佸紡濂楁帴瀛�
var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
try
{
- //灏嗚socket缁戝畾鍒颁富鏈轰笂闈㈢殑鏌愪釜绔彛锛岀鍙ｅ簲璇ユ斁鍒伴厤缃枃浠朵腑
+ //灏嗚socket缁戝畾鍒颁富鏈轰笂闈㈢殑鏌愪釜绔彛,绔彛搴旇鏀惧埌閰嶇疆鏂囦欢涓� socket.Bind(new IPEndPoint(IPAddress.Parse(ip), port));
Console.WriteLine(port);
- //鍚姩鐩戝惉锛屽苟涓旇缃竴涓渶澶х殑闃熷垪闀垮害
+ //鍚姩鐩戝惉,骞朵笖璁剧疆涓�釜鏈�ぇ鐨勯槦鍒楅暱搴� socket.Listen(30);
//寮�鎺ュ彈瀹㈡埛绔繛鎺ヨ姹� socket.BeginAccept(new AsyncCallback(ClientAccepted), socket);
@@ -80,7 +82,7 @@
}
catch (Exception ex)
{
- Console.WriteLine($"銆愭帴鏀跺鎴风鐨勬秷鎭紓甯搞�锛� + ex.Message);
+ Console.WriteLine($"銆愭帴鏀跺鎴风鐨勬秷鎭紓甯搞�:" + ex.Message);
}
//鍑嗗鎺ュ彈涓嬩竴涓鎴风璇锋眰
socket.BeginAccept(new AsyncCallback(ClientAccepted), socket);
@@ -128,7 +130,7 @@
}
}
- //LogHelper.Info($"鎺ユ敹鍒颁俊鎭紝IP锛歿remote_ip},MSG锛歿BitConverter.ToString(buffers[remote_ip])}");
+ //LogHelper.Info($"鎺ユ敹鍒颁俊鎭�IP:{remote_ip},MSG:{BitConverter.ToString(buffers[remote_ip])}");
if (buffers.Keys.Contains(remote_ip))
{
@@ -156,7 +158,7 @@
string rfids16 = BitConverter.ToString(rfid);
string rfids = Encoding.ASCII.GetString(rfid);
- //LogHelper.Info($"璇诲崱鍣ㄦ牎楠屽搴斿鍣ㄥ彿锛歿rfids}锛屽叾16杩涘埗褰㈠紡锛歿rfids16}");
+ //LogHelper.Info($"璇诲崱鍣ㄦ牎楠屽搴斿鍣ㄥ彿:{rfids},鍏�6杩涘埗褰㈠紡:{rfids16}");
//if (ScanCodeHelper.Analysis(remote_ip, rfids))//鏍￠獙RFID
//{
// isCheck[remote_ip] = false;
@@ -170,12 +172,12 @@
}
else
{
- LogHelper.Info($"涓嶆弧瓒宠鍗″櫒鏍￠獙瑙勫畾锛欼P锛歿remote_ip},MSG锛歿message}");
+ LogHelper.Info($"涓嶆弧瓒宠鍗″櫒鏍￠獙瑙勫畾:IP:{remote_ip},MSG:{message}");
}
}
catch(Exception ex)
{
- LogHelper.Info($"鎵爜鏍￠獙鍙戠敓浜嗗紓甯革細{ex.Message}");
+ LogHelper.Info($"鎵爜鏍￠獙鍙戠敓浜嗗紓甯�{ex.Message}");
saoMa[remote_ip] = 4;//鎵爜寮傚父
}
@@ -185,7 +187,7 @@
}
catch(Exception ex)
{
- LogHelper.Info($"鍗峰笜闂ㄦ牎楠屽彂鐢熶簡寮傚父锛歿ex.Message}");
+ LogHelper.Info($"鍗峰笜闂ㄦ牎楠屽彂鐢熶簡寮傚父:{ex.Message}");
}
//TcpServerSend(remote_ip, System.Text.Encoding.Default.GetBytes(msgSend));
Array.Clear(buffers[remote_ip], 0, buffers[remote_ip].Length);//娓呯┖褰撳墠IP Buffer
@@ -198,12 +200,12 @@
}
}
- //鎺ユ敹涓嬩竴涓秷鎭�鍥犱负杩欐槸涓�釜閫掑綊鐨勮皟鐢紝鎵�互杩欐牱灏卞彲浠ヤ竴鐩存帴鏀舵秷鎭簡锛�+ //鎺ユ敹涓嬩竴涓秷鎭�鍥犱负杩欐槸涓�釜閫掑綊鐨勮皟鐢�鎵�互杩欐牱灏卞彲浠ヤ竴鐩存帴鏀舵秷鎭簡)
socket.BeginReceive(buffers[remote_ip], 0, buffers[remote_ip].Length, SocketFlags.None, new AsyncCallback(ReceiveMessage), socket);
}
catch (Exception ex)
{
-
+ LogHelper.InfoEx(ex);
}
}
@@ -222,7 +224,7 @@
try
{
client.Send(msg);
- LogHelper.Info($"宸插彂閫佺粰璇GV鍦板潃{ip}锛寋msg}");
+ LogHelper.Info($"宸插彂閫佺粰璇GV鍦板潃{ip},{msg}");
return true;
}
catch (SocketException ex)
@@ -240,7 +242,7 @@
}
else
{
- LogHelper.Info("鏈壘鍒拌璁惧锛屾槸鍚﹀凡杩炴帴锛�);
+ LogHelper.Info("鏈壘鍒拌璁惧,鏄惁宸茶繛鎺ワ紵");
}
return false;
--
Gitblit v1.9.1