From 9f5cd73648a4dd6ad80d5c8e1c14746a8a27b1b6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周四, 21 11月 2024 08:45:08 +0800
Subject: [PATCH] 程序修改
---
DataCapture_MA/Form1.cs | 103 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 81 insertions(+), 22 deletions(-)
diff --git a/DataCapture_MA/Form1.cs b/DataCapture_MA/Form1.cs
index c737007..f693d48 100644
--- a/DataCapture_MA/Form1.cs
+++ b/DataCapture_MA/Form1.cs
@@ -15,6 +15,8 @@
using DataCapture_MA.Entity;
using DataCapture_MA.DataHnadle;
using DataCapture_MA.AutoMapperConfig;
+using System.IO;
+using IWshRuntimeLibrary;
namespace DataCapture_MA
{
@@ -27,20 +29,65 @@
public CaptrueForm()
{
InitializeComponent();
+
var hostName = Dns.GetHostName();
var ips = Dns.GetHostAddresses(hostName);
+ string targetSubnet = "10.133.13"; // 鐩爣缃戞
+
+ bool foundTargetSubnet = false;
+
foreach (var ip in ips)
{
if (ip.AddressFamily == AddressFamily.InterNetwork) // 鍙樉绀篒Pv4鍦板潃
{
ipSelect.Items.Add(ip);
+ // 妫�鏌ユ槸鍚﹀寘鍚洰鏍囩綉娈�
+ if (ip.ToString().StartsWith(targetSubnet))
+ {
+ ipSelect.SelectedItem = ip; // 閫変腑鍖归厤鐨� IP
+ foundTargetSubnet = true;
+ }
}
}
- ipSelect.SelectedIndex = 0;
- to_ipTxt.Text = ipSelect.SelectedItem.ToString();
- AutoMapper.Mapper.Initialize((cfg) => {
+
+ if (!foundTargetSubnet && ipSelect.Items.Count > 0)
+ {
+ //MessageBox.Show($"鏈壘鍒扮綉娈典负 {targetSubnet} 鐨処P鍦板潃锛屽皢榛樿閫変腑绗竴涓狪P銆�", "鎻愮ず", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ ipSelect.SelectedIndex = 0;
+ }
+ to_ipTxt.Text = ipSelect.SelectedItem?.ToString();
+
+ // 鍒濆鍖� AutoMapper
+ AutoMapper.Mapper.Initialize(cfg =>
+ {
cfg.AddProfile<MapperConfiguration>();
});
+
+ // 鍒涘缓蹇嵎鏂瑰紡
+ string shortcutName = "MaDataCapture"; // 蹇嵎鏂瑰紡鍚嶇О
+ string targetPath = Application.ExecutablePath; // 绋嬪簭璺緞
+ string startupPath = Environment.GetFolderPath(Environment.SpecialFolder.Startup); // 鍚姩鏂囦欢澶硅矾寰�
+ CreateShortcut(shortcutName, targetPath, startupPath); // 鍒涘缓蹇嵎鏂瑰紡
+
+ StartReceive(); // 鍚姩绋嬪簭
+ CreateDatabase(); // 鍒濆鍖栨暟鎹簱
+
+ // 鍒犻櫎涓�涓湀鍓嶇殑鏁版嵁
+ new Thread(AutoDeleteHistoryDate.Handler).Start();
+ }
+
+
+ public static void CreateShortcut(string shortcutName, string targetPath, string startupPath)
+ {
+ string shortcutPath = Path.Combine(startupPath, shortcutName + ".lnk");
+ if (System.IO.File.Exists(shortcutPath))
+ return;
+
+ WshShell shell = new WshShell();
+ IWshShortcut shortcut = (IWshShortcut)shell.CreateShortcut(shortcutPath);
+ shortcut.TargetPath = targetPath;
+ shortcut.WorkingDirectory = Path.GetDirectoryName(targetPath);
+ shortcut.Save();
}
private void ReceiveHandle()
@@ -77,6 +124,10 @@
private void start_connect_Click(object sender, EventArgs e)
{
+ StartReceive();
+ }
+ public void StartReceive()
+ {
try
{
if (skt != null)
@@ -111,7 +162,7 @@
Log4NetHelper.WriteInfoLog(LogType.Receive, "寮�鍚疷DP閫氫俊鎴愬姛" + iPEndPoint.ToString());
- ipSelect.Enabled = false;
+ //ipSelect.Enabled = false;
local_port.Enabled = false;
to_ipTxt.Enabled = false;
to_portTxt.Enabled = false;
@@ -121,7 +172,7 @@
colse_connect.Enabled = true;
r_showBox.Text += "鏁版嵁鎺ユ敹宸插惎鍔╘n";
}
- catch(Exception ex)
+ catch (Exception ex)
{
Log4NetHelper.WriteInfoLog(LogType.Receive, "寮�鍚疷DP閫氫俊澶辫触" + ex);
MessageBox.Show(ex.Message);
@@ -130,27 +181,35 @@
private void CreateDatabase()
{
- using (var context = new DbModel())
+ try
{
- // 纭繚鏁版嵁搴撳拰琛ㄥ瓨鍦紝濡傛灉涓嶅瓨鍦ㄥ垯鍒涘缓
- context.Database.EnsureCreated();
-
- // 娣诲姞涓�浜涙暟鎹�
- context.RobotInfo.Add(new RobotInfo
+ using (var context = new DbModel())
{
- WarnningNum = 0,
- //RobotStatus = "Normal",
- RobotModel = "Model X",
- RobotSerialNo = "123456",
- WarnningContent = "娓呴櫎瀵屾枃鏈鏁版嵁",
- CreateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- IsDelete = false
- });
+ // 纭繚鏁版嵁搴撳拰琛ㄥ瓨鍦紝濡傛灉涓嶅瓨鍦ㄥ垯鍒涘缓
+ context.Database.EnsureCreated();
- // 淇濆瓨鏇存敼
- context.SaveChanges();
+ // 娣诲姞涓�浜涙暟鎹�
+ context.RobotInfo.Add(new RobotInfo
+ {
+ WarnningNum = 0,
+ //RobotStatus = "Normal",
+ RobotModel = "Model X",
+ RobotSerialNo = "123456",
+ WarnningContent = "娓呴櫎瀵屾枃鏈鏁版嵁",
+ CreateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ CreateStamp = DateTimeOffset.Now.ToUnixTimeSeconds(),
+ IsDelete = false
+ });
- var xx = context.RobotInfo.ToList();
+ // 淇濆瓨鏇存敼
+ context.SaveChanges();
+
+ var xx = context.RobotInfo.ToList();
+ }
+ }
+ catch (Exception ex)
+ {
+ r_showBox.Text = "鏁版嵁搴撳垵濮嬪寲寮傚父"+ ex.Message;
}
}
--
Gitblit v1.9.3