From 1cb4a8b813af00448dbedc4d1384ab56def77f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=A5=E9=A3=8E=E8=BF=87=E5=AE=A2?= <3529987066@qq.com> Date: Fri, 26 Apr 2024 17:17:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD=EF=BC=9A?= =?UTF-8?q?=201=20=E7=A0=94=E7=A9=B6=E5=9C=B0=E9=9C=87=E4=BB=AA=E7=9A=84?= =?UTF-8?q?=E9=80=9A=E4=BF=A1=E5=8D=8F=E8=AE=AE=EF=BC=8C=E7=BB=A7=E7=BB=AD?= =?UTF-8?q?=E7=BC=96=E5=86=99=E8=A7=A3=E6=9E=90=E4=BB=A3=E7=A0=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DesignTimeBuild/.dtbcache.v2 | Bin 136328 -> 136328 bytes .../.vs/JiangsuEarthquake/v17/.futdcache.v2 | Bin 540 -> 540 bytes .../.vs/JiangsuEarthquake/v17/.suo | Bin 260608 -> 254464 bytes .../JiangsuEarthquake/v17/DocumentLayout.json | 23 ++- .../jiangsuearthquake.metadata.v7.bin | Bin 215979 -> 216023 bytes .../jiangsuearthquake.projects.v7.bin | Bin 4908047 -> 5029370 bytes .../Models/SeismographModel.cs | 137 +++++++++++++++++- .../JiangsuEarthquake.AssemblyInfo.cs | 2 +- ...JiangsuEarthquake.AssemblyInfoInputs.cache | 2 +- 9 files changed, 146 insertions(+), 18 deletions(-) diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/DesignTimeBuild/.dtbcache.v2 b/JiangsuEarthquake/.vs/JiangsuEarthquake/DesignTimeBuild/.dtbcache.v2 index 5cf8cb399d90cfdecb8a33217cf8d40630f7dbf0..d5ec4b68f9134167710f62996626e605a33e4ddc 100644 GIT binary patch delta 27 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 diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json index b7f0d7d..dc74826 100644 --- a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json +++ b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json @@ -7,7 +7,7 @@ "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\seismographmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\models\\volcurcollectormodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\models\\volcurcollectormodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\volcurcollectormodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { @@ -59,8 +59,7 @@ "ViewState": "AQIAAA8AAAAAAAAAAAAAACgAAAAaAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000601|", "WhenOpened": "2024-04-24T08:54:53.626Z", - "IsPinned": true, - "EditorCaption": "" + "IsPinned": true }, { "$type": "Document", @@ -70,7 +69,7 @@ "RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\VolCurCollectorModel.cs", "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\VolCurCollectorModel.cs", "RelativeToolTip": "JiangsuEarthquake\\Models\\VolCurCollectorModel.cs", - "ViewState": "AQIAAAoAAAAAAAAAAAAkwBkAAABAAAAA", + "ViewState": "AQIAAC4AAAAAAAAAAAAkwEAAAAAtAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-04-25T08:11:58.297Z", "EditorCaption": "" @@ -83,7 +82,7 @@ "RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\SeismographModel.cs", "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\SeismographModel.cs", "RelativeToolTip": "JiangsuEarthquake\\Models\\SeismographModel.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAAAQAAAAdAAAA", + "ViewState": "AQIAAGsAAAAAAAAAAAAuwIQAAAAcAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-04-25T08:11:19.51Z", "EditorCaption": "" @@ -96,7 +95,7 @@ "RelativeDocumentMoniker": "JiangsuEarthquake\\Common\\Tools.cs", "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Common\\Tools.cs", "RelativeToolTip": "JiangsuEarthquake\\Common\\Tools.cs", - "ViewState": "AQIAAOUAAAAAAAAAAAAywBIBAAAxAAAA", + "ViewState": "AQIAAOQAAAAAAAAAAAAuwBIBAAAxAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-04-24T07:18:22.772Z", "EditorCaption": "" @@ -111,8 +110,7 @@ "RelativeToolTip": "JiangsuEarthquake\\Models\\ClientModel.cs", "ViewState": "AQIAAFcAAAAAAAAAAAAAAGYAAACDAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-22T06:58:22.442Z", - "EditorCaption": "" + "WhenOpened": "2024-04-22T06:58:22.442Z" }, { "$type": "Document", @@ -135,8 +133,7 @@ "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemControlView.xaml", "RelativeToolTip": "JiangsuEarthquake\\Views\\SystemControlView.xaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-04-15T03:01:04.303Z", - "EditorCaption": "" + "WhenOpened": "2024-04-15T03:01:04.303Z" }, { "$type": "Document", @@ -148,8 +145,7 @@ "RelativeToolTip": "JiangsuEarthquake\\ViewModels\\MainViewModel.cs", "ViewState": "AQIAAB4FAAAAAAAAAAAkwCcBAAAAAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-03-12T06:03:03.53Z", - "EditorCaption": "" + "WhenOpened": "2024-03-12T06:03:03.53Z" }, { "$type": "Document", @@ -160,8 +156,7 @@ "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\MainWindow.xaml", "RelativeToolTip": "JiangsuEarthquake\\MainWindow.xaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-03-11T05:49:43.074Z", - "EditorCaption": "" + "WhenOpened": "2024-03-11T05:49:43.074Z" } ] } diff --git a/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.metadata.v7.bin b/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.metadata.v7.bin index 4e354ed2251424634e9afb2c2ead346ea2848987..d0048b0f12e5bfc85573848bf7307d726953fdf9 100644 GIT binary patch delta 118 zcmZ2Io%i~5UN(j~d<+Z>(+_Gedo=pB`Y~?xV=BF%I}0etVQOsRY+~u;HXF#1^36|4 z%_)uvPR%UN%}*~%EXV+h=p`4cOm-BPocuwJd;5zEOal2r{7<}qCNePa0P&OX9?$)8A?^do=pB`Y~?xV=BGCs4{(`3bV>~k&8?M`9hUkoeCpa*da{~YlyA^!^ diff --git a/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.projects.v7.bin b/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.projects.v7.bin index 84aef9364400ed6bf3f47f294da6afec886032b1..3519b0b080ab89bdad84fb8341a3b32357239fc3 100644 GIT binary patch delta 238 zcmV~$yGue*0Kj3+HBIw&?P*q8T4paFrS^VVmUS;QRYTxnQ_$2DG&THIaXg?)n}b0X z(iv@R>3>LQEof;dh`z7%Qqz8ZAGI3<8aCRn%m~C=S(S&HTO= c6)8S~$MXIte4?69xpQ5PoBLP8X22-_2%8whtJ=y)c*?8!Z%O= diff --git a/JiangsuEarthquake/JiangsuEarthquake/Models/SeismographModel.cs b/JiangsuEarthquake/JiangsuEarthquake/Models/SeismographModel.cs index c5fd7a5..3453b62 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/Models/SeismographModel.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/Models/SeismographModel.cs @@ -1,4 +1,6 @@ -using System; +using JiangsuEarthquake.Common; +using JiangsuEarthquake.DataAccess; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -8,11 +10,142 @@ namespace JiangsuEarthquake.Models { public class SeismographModel { - private byte[] sync { get; set; } = new byte[4]; + private byte[] syncSend { get; set; } = new byte[4] { 0xBF, 0x13, 0x97, 0x74 }; //同步字，为0xbf139774 + + private byte[] cmdSend { get; set; } = new byte[2]; //帧标志 + + private byte[] cmdRecv { get; set; } = new byte[2]; //帧标志 + + private byte[] lengthSend { get; set; } = new byte[2]; //从DATA开始的帧长度，单位：字节 + + private byte[] lengthRecv { get; set; } = new byte[2]; //从DATA开始的帧长度，单位：字节 + + private List dataSend { get; set; } = new List(); //数据部分 + + private List dataRecv { get; set; } = new List(); //数据部分 + + private byte[] checkCode { get; set; } = new byte[2]; //从CMD到DATA结束的CRC16校验和 + + private List checkByte { get; set; } = new List(); //校验码Byte public void ParsingData(List byteList, int id) { + if (byteList.Count == 0) + return; + //原始数据存储 + string sql = $"insert into earthquakeoriginaldata(StationID,RecordTime,OriginalData) values('{id}','{DateTime.Now}','{BitConverter.ToString(byteList.ToArray())}');"; + DBHelper.ExecuteNonQuery(sql, 1); + + //同步字校验 + if (byteList[0] != 0xBF || byteList[1] != 0x13 || byteList[2] != 0x97 || byteList[3] != 0x74) + return; + + checkByte.Clear(); + //CRC16校验和校验 + for (int i = 4; i < byteList.Count - 2; i++) + checkByte.Add(byteList[i]); + if (!Tools.CompareByte(new byte[] { byteList[^2], byteList[^1] }, Tools.CRCCalc(checkCode.ToArray()))) + return; + + //长度校验 + int length = BitConverter.ToInt16(new byte[] { byteList[7], byteList[6] }, 0); + if (length != byteList.Count - 8) + return; + + cmdRecv = new byte[] { byteList[4], byteList[5] }; + + dataRecv.Clear(); + for (int i = 8; i < byteList.Count - 2; i++) + dataRecv.Add(byteList[i]); + + if (Tools.CompareByte(cmdRecv, new byte[] { 0x77, 0x00 })) //用于客户端与状态流服务器建立链接过程中消息交换 + { + if (dataRecv.Count != 2) + return; + + int response = BitConverter.ToInt16(new byte[2] { dataRecv[1], dataRecv[0] }, 0); + + if (response == 100) + { + //有空闲连接时应答 + //发送用户认证帧 + cmdSend = new byte[] { 0x77, 0x00 }; + lengthSend = new byte[] { 0x00, 0x04 }; + + string User = "Admin"; + byte[] userByte = System.Text.Encoding.ASCII.GetBytes(User); + byte[] userByteArray = new byte[16]; + if(userByte.Length != 16) + { + for (int i = 0; i < 16; i++) + { + userByteArray[i] = 0; + } + + Array.Copy(userByte, 0, userByteArray, 16, userByte.Length); + } + else + { + userByteArray = userByte; + } + + string Password = "Admin"; + byte[] passwordByte = System.Text.Encoding.ASCII.GetBytes(Password); + byte[] passwordByteArray = new byte[40]; + if (passwordByte.Length != 40) + { + for (int i = 0; i < 40; i++) + { + passwordByteArray[i] = 0; + } + + Array.Copy(passwordByte, 0, passwordByteArray, 40, passwordByte.Length); + } + else + { + passwordByteArray = passwordByte; + } + + dataSend.Clear(); + dataSend.AddRange(userByteArray); + dataSend.AddRange(passwordByteArray); + + checkByte.Clear(); + checkByte.AddRange(cmdSend); + checkByte.AddRange(lengthSend); + checkByte.AddRange(userByteArray); + checkByte.AddRange(passwordByteArray); + checkCode = Tools.CRCCalc(checkByte.ToArray()); + + dataSend.AddRange(checkCode); + if(id == 1) + { + MainWindow.mainViewModel.clientModelDZY1.SendMessage(dataSend.ToArray()); + } + else + { + MainWindow.mainViewModel.clientModelDZY2.SendMessage(dataSend.ToArray()); + } + } + else if (response == 405) + { + //没有空闲连接 + //继续尝试连接 + + } + else if (response == 200) + { + //认证成功 + //连接成功 + + } + else if (response == 400) + { + //认证失败 + //重新尝试连接 + } + } } } } diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfo.cs b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfo.cs index 758fc4c..ec7c2a1 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfo.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("JiangsuEarthquake")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+926529723ad8107d15696f2632640ee9669778e9")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+14e7fe49e9e6d49082ec0ec1a0839f6ce7695faa")] [assembly: System.Reflection.AssemblyProductAttribute("JiangsuEarthquake")] [assembly: System.Reflection.AssemblyTitleAttribute("JiangsuEarthquake")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfoInputs.cache b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfoInputs.cache index 5904e40..ad1dabd 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfoInputs.cache +++ b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfoInputs.cache @@ -1 +1 @@ -1100140aceac37e666b2696684d73d82f9991b6ee5e8275f46763dbd563b3877 +d85f7398275725d03be5e8ee96488b3727df451ccd9d9c93184d66ccb7d2bf32