diff --git a/DyeingComputer.csproj b/DyeingComputer.csproj
index 666b2b3..7a31519 100644
--- a/DyeingComputer.csproj
+++ b/DyeingComputer.csproj
@@ -358,9 +358,6 @@
8.0.0
-
- 13.0.3
-
3.0.81
diff --git a/UserClass/AsyncTcpServer.cs b/UserClass/AsyncTcpServer.cs
index d1e169a..07f46be 100644
--- a/UserClass/AsyncTcpServer.cs
+++ b/UserClass/AsyncTcpServer.cs
@@ -69,57 +69,98 @@ namespace DyeingComputer.UserClass
service.Received = (client, e) =>
{
string SYSAPI = e.ByteBlock.Span.ToString(Encoding.ASCII).Substring(0,5);
- string SYSDAT = e.ByteBlock.Span.ToString(Encoding.ASCII).Substring(5);
+ string DAT = e.ByteBlock.Span.ToString(Encoding.ASCII).Substring(5);
+ string SYSDAT ="";// = e.ByteBlock.Span.ToString(Encoding.ASCII).Substring(5);
+ string SYSKEY ="";
+ if(DAT.Length>=16) SYSKEY = DAT.Substring(0,16);
+ if (DAT.Length > 16) SYSDAT = DAT.Substring(16);
//LogGing.LogSQLDATA("800", "TcpServer", "API:"+ SYSAPI);
- if (SYSAPI == "SC800") client.SendAsync(MainWindowViewModel.S01);
- else if (SYSAPI == "SC801") client.SendAsync(MainWindowViewModel.S16.ToString());
- else if (SYSAPI == "SC802") client.SendAsync(MainWindowViewModel.S03);
- else if (SYSAPI == "SC803") client.SendAsync(MainWindowViewModel.S05);
- else if (SYSAPI == "SC804") client.SendAsync(MainWindowViewModel.S06);
- else if (SYSAPI == "SC810")
+ if (SYSAPI == "SC800")
{
-
+ Dictionary Chart_new = new Dictionary();//缓存函数
+ Chart_new.Add("MACHINE", MainWindowViewModel.S01);
+ Chart_new.Add("GROUP", MainWindowViewModel.S05);
+ Chart_new.Add("SYSKEY", MainWindowViewModel.SYSKEY);
+ Chart_new.Add("TIME", MainWindowViewModel.SYSTime);
+ client.SendAsync("[" + MainWindowViewModel.S01 + "]" + Chart_new.ToJsonString());
+ }
+ else if (SYSAPI == "SC810")
+ {
+ if (SYSKEY == MainWindowViewModel.SYSKEY)
+ {
+ try
+ {
+ Dictionary Chart_dat;
+ Chart_dat = SerializeConvert.JsonDeserializeFromString>(SYSDAT);
+
+ }
+ catch
+ {
+ client.SendAsync("SC910");
+ }
+ }
+ else { client.SendAsync("SC999"); }
}
else if (SYSAPI == "SC820")
{
- if (SYSDAT.Length == 21)
+ if (SYSKEY == MainWindowViewModel.SYSKEY)
{
- SYSDAT = SYSDAT.Substring(1,19);
- DateTime dt;
- if(DateTime.TryParse(SYSDAT,out dt))
- SetLocalDateTime(dt);
+ if (SYSDAT.Length == 21)
+ {
+ SYSDAT = SYSDAT.Substring(1, 19);
+ DateTime dt;
+ if (DateTime.TryParse(SYSDAT, out dt))
+ SetLocalDateTime(dt);
+ }
+ client.SendAsync("[" + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss") + "]");
}
- client.SendAsync("[" + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")+"]");
+ else { client.SendAsync("SC999"); }
}//设置系统时间
else if (SYSAPI == "SC830")
{
- Dictionary Chart_new = new Dictionary();//缓存函数
- Chart_new.Add("DYELOT", MainWindowViewModel.WorkNumder);
- Chart_new.Add("Time", MainWindowViewModel.SYSTime);
- Chart_new.Add("MST", MainWindowViewModel.TEMP_co);
- Chart_new.Add("MTT", MainWindowViewModel.Selet_dtm("1010"));
- Chart_new.Add("MTL", MainWindowViewModel.Selet_dtm("1015"));
- Chart_new.Add("MTH", MainWindowViewModel.Selet_dtm("1009"));
- Chart_new.Add("MUT", MainWindowViewModel.Selet_dtm("1011"));
- Chart_new.Add("STTA", MainWindowViewModel.Selet_dtm("1012"));
- Chart_new.Add("STLA", MainWindowViewModel.Selet_dtm("1017"));
- Chart_new.Add("STTB", MainWindowViewModel.Selet_dtm("1013"));
- Chart_new.Add("STLB", MainWindowViewModel.Selet_dtm("1018"));
- Chart_new.Add("STTC", MainWindowViewModel.Selet_dtm("1014"));
- Chart_new.Add("STLC", MainWindowViewModel.Selet_dtm("1019"));
- client.SendAsync("["+ MainWindowViewModel.S01 + "]"+Chart_new.ToJsonString());
+ if (SYSKEY == MainWindowViewModel.SYSKEY)
+ {
+ Dictionary Chart_new = new Dictionary();//缓存函数
+ Chart_new.Add("DYELOT", MainWindowViewModel.WorkNumder);
+ Chart_new.Add("Time", MainWindowViewModel.SYSTime);
+ Chart_new.Add("MST", MainWindowViewModel.TEMP_co);
+ Chart_new.Add("MTT", MainWindowViewModel.Selet_dtm("1010"));
+ Chart_new.Add("MTL", MainWindowViewModel.Selet_dtm("1015"));
+ Chart_new.Add("MTH", MainWindowViewModel.Selet_dtm("1009"));
+ Chart_new.Add("MUT", MainWindowViewModel.Selet_dtm("1011"));
+ Chart_new.Add("STTA", MainWindowViewModel.Selet_dtm("1012"));
+ Chart_new.Add("STLA", MainWindowViewModel.Selet_dtm("1017"));
+ Chart_new.Add("STTB", MainWindowViewModel.Selet_dtm("1013"));
+ Chart_new.Add("STLB", MainWindowViewModel.Selet_dtm("1018"));
+ Chart_new.Add("STTC", MainWindowViewModel.Selet_dtm("1014"));
+ Chart_new.Add("STLC", MainWindowViewModel.Selet_dtm("1019"));
+ client.SendAsync("[" + MainWindowViewModel.S01 + "]" + Chart_new.ToJsonString());
+ }
+ else { client.SendAsync("SC999"); }
}//当前信息
else if (SYSAPI == "SC851")
{
- client.SendAsync("[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_d.ToJsonString());//数字开关信息
+ if (SYSKEY == MainWindowViewModel.SYSKEY)
+ {
+ client.SendAsync("[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_d.ToJsonString());//数字开关信息
+ }
+ else { client.SendAsync("SC999"); }
}//数字开关表
else if (SYSAPI == "SC852")
{
- client.SendAsync("[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_a.ToJsonString());//寄存器信息
+ if (SYSKEY == MainWindowViewModel.SYSKEY)
+ {
+ client.SendAsync("[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_a.ToJsonString());//寄存器信息
+ }
+ else { client.SendAsync("SC999"); }
}//寄存器表
else if (SYSAPI == "SC853")
{
- client.SendAsync("[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_m.ToJsonString());//缓存信息
+ if (SYSKEY == MainWindowViewModel.SYSKEY)
+ {
+ client.SendAsync("[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_m.ToJsonString());//缓存信息
+ }
+ else { client.SendAsync("SC999"); }
}//缓存表
return EasyTask.CompletedTask;
diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs
index ae32255..8e82db5 100644
--- a/ViewModel/MainWindowViewModel.cs
+++ b/ViewModel/MainWindowViewModel.cs
@@ -63,9 +63,11 @@ namespace DyeingComputer.ViewModel
public static DataTable RUN_DATATABLE = new DataTable();//缓存工作表
public static int RUN_STEPID;//当前步骤
public static int SYS_REDYE=0;//当前重燃步
+ public static string SYSKEY;
public MainWindowViewModel()
{
+ SYSKEY = MD5check.MD5Encrypt16(HardwareSN.GetCPUSerialNumber()+HardwareSN.GetBIOSSerialNumber());
Sys_workSTEPID = -1;
WorkNumder = "----------";
SYS_SET(); //crbl