Compare commits

...

3 Commits

Author SHA1 Message Date
高国正 fae0eadeda 修改程序集名 2023-02-25 17:40:47 +08:00
高国正 fd301cd13d 修改名称 2023-02-25 15:32:15 +08:00
高国正 7b564c5994 init 2023-02-24 16:12:19 +08:00
85 changed files with 125 additions and 52 deletions

View File

@ -1,4 +0,0 @@
------------------------------------------------
2023-02-21 17:55:27,859 [1] INFO loginfo - ½ÓÊÕ:40 3A 00 48 15 13 34 50 23 03 81 E0 3E E7 1E 83 3E D0 1F 31 8A 6B AE DD 42 65 D7 8C 96 B1 84 51 36 32 95 E8 D6 D8 CA 96 51 D4 3F 91 03 20 97 26 50 E7 4A C5 7F CF A2 12 74 7A F8 BA 15 2A AD B6 C0 6A 37 49 B2 E1 35 24 01 EB 85 9E 0D 0A
------------------------------------------------
2023-02-21 17:55:41,547 [1] INFO loginfo - ½ÓÊÕ:40 3A 00 48 15 13 34 50 23 03 81 E0 3E E7 1E 83 3E D0 1F 31 8A 6B AE DD 42 65 D7 8C 96 B1 84 51 36 32 95 E8 D6 D8 CA 96 51 D4 3F 91 03 20 97 26 50 E7 4A C5 7F CF A2 12 74 7A F8 BA 15 2A AD B6 C0 6A 37 49 B2 E1 35 24 01 EB 85 9E 0D 0A

View File

@ -1,37 +0,0 @@
------------------------------------------------
2023-02-22 08:54:18,549 [1] INFO loginfo - 接收:40 3A 00 46 15 13 32 70 24 76 01 46 00 23 02 21 17 01 38 00 01 41 01 4A 26 48 5A 47 39 36 5F 32 30 31 32 30 37 56 31 2D 31 2E 31 23 4B 18 4C 0E 10 4D 66 34 31 35 31 33 33 32 37 30 32 34 37 36 4F 07 00 00 00 00 00 00 00 F7 0D 0A
2023-02-22 08:54:18,559 [1] INFO loginfo - 发送:40 3A 00 09 15 13 32 70 24 76 01 00 6E 0D 0A
------------------------------------------------
2023-02-22 08:55:45,541 [1] INFO loginfo - 接收:40 3A 00 46 15 13 32 70 24 76 01 46 00 23 02 21 17 01 38 00 01 41 01 4A 26 48 5A 47 39 36 5F 32 30 31 32 30 37 56 31 2D 31 2E 31 23 4B 18 4C 0E 10 4D 66 34 31 35 31 33 33 32 37 30 32 34 37 36 4F 07 00 00 00 00 00 00 00 F7 0D 0A
2023-02-22 08:55:45,562 [1] INFO loginfo - 发送:40 3A 00 09 15 13 32 70 24 76 01 00 6E 0D 0A
------------------------------------------------
2023-02-22 08:59:02,157 [1] INFO loginfo - 接收:40 3A 00 46 15 13 32 70 24 76 01 46 00 23 02 21 17 01 38 00 01 41 01 4A 26 48 5A 47 39 36 5F 32 30 31 32 30 37 56 31 2D 31 2E 31 23 4B 18 4C 0E 10 4D 66 34 31 35 31 33 33 32 37 30 32 34 37 36 4F 07 00 00 00 00 00 00 00 F7 0D 0A
2023-02-22 08:59:02,167 [1] INFO loginfo - 发送:40 3A 00 09 15 13 32 70 24 76 01 00 6E 0D 0A
------------------------------------------------
2023-02-22 08:59:20,581 [1] INFO loginfo - 接收:40 3A 00 46 15 13 32 70 24 76 01 46 00 23 02 21 17 01 38 00 01 41 01 4A 26 48 5A 47 39 36 5F 32 30 31 32 30 37 56 31 2D 31 2E 31 23 4B 18 4C 0E 10 4D 66 34 31 35 31 33 33 32 37 30 32 34 37 36 4F 07 00 00 00 00 00 00 00 F7 0D 0A
2023-02-22 08:59:20,591 [1] INFO loginfo - 发送:40 3A 00 09 15 13 32 70 24 76 01 00 6E 0D 0A
------------------------------------------------
2023-02-22 08:59:43,197 [1] INFO loginfo - 接收:40 3A 00 46 15 13 32 70 24 76 01 46 00 23 02 21 17 01 38 00 01 41 01 4A 26 48 5A 47 39 36 5F 32 30 31 32 30 37 56 31 2D 31 2E 31 23 4B 18 4C 0E 10 4D 66 34 31 35 31 33 33 32 37 30 32 34 37 36 4F 07 00 00 00 00 00 00 00 F7 0D 0A
2023-02-22 08:59:43,207 [1] INFO loginfo - 发送:40 3A 00 09 15 13 32 70 24 76 01 00 6E 0D 0A
------------------------------------------------
2023-02-22 09:00:47,189 [1] INFO loginfo - 接收:40 3A 00 46 15 13 32 70 24 76 01 46 00 23 02 21 17 01 38 00 01 41 01 4A 26 48 5A 47 39 36 5F 32 30 31 32 30 37 56 31 2D 31 2E 31 23 4B 18 4C 0E 10 4D 66 34 31 35 31 33 33 32 37 30 32 34 37 36 4F 07 00 00 00 00 00 00 00 F7 0D 0A
2023-02-22 09:00:47,199 [1] INFO loginfo - 发送:40 3A 00 09 15 13 32 70 24 76 01 00 6E 0D 0A
------------------------------------------------
2023-02-22 09:01:05,493 [1] INFO loginfo - 接收:40 3A 00 46 15 13 32 70 24 76 01 46 00 23 02 21 17 01 38 00 01 41 01 4A 26 48 5A 47 39 36 5F 32 30 31 32 30 37 56 31 2D 31 2E 31 23 4B 18 4C 0E 10 4D 66 34 31 35 31 33 33 32 37 30 32 34 37 36 4F 07 00 00 00 00 00 00 00 F7 0D 0A
2023-02-22 09:01:05,502 [1] INFO loginfo - 发送:40 3A 00 09 15 13 32 70 24 76 01 00 6E 0D 0A
------------------------------------------------
2023-02-22 09:02:56,181 [1] INFO loginfo - 接收:40 3A 00 46 15 13 32 70 24 76 01 46 00 23 02 21 17 01 38 00 01 41 01 4A 26 48 5A 47 39 36 5F 32 30 31 32 30 37 56 31 2D 31 2E 31 23 4B 18 4C 0E 10 4D 66 34 31 35 31 33 33 32 37 30 32 34 37 36 4F 07 00 00 00 00 00 00 00 F7 0D 0A
2023-02-22 09:02:56,190 [1] INFO loginfo - 发送:40 3A 00 09 15 13 32 70 24 76 01 00 6E 0D 0A
------------------------------------------------
2023-02-22 17:45:31,521 [1] INFO loginfo - 接收到 172.16.1.49:64367: 40 3A 00 46 15 13 04 90 07 14 01 49 00 20 03 27 06 50 46 00 01 41 84 4A 26 48 5A 47 39 36 5F 32 30 31 32 30 37 56 31 2D 31 2E 31 23 4B 18 4C 0E 10 4D 66 34 31 35 31 33 30 34 39 30 30 37 31 34 4F 07 00 00 00 00 00 00 00 31 0D 0A
2023-02-22 17:45:31,530 [1] INFO loginfo - 登录帧校验失败: 403A0046151304900714014900200327065046000141844A26485A4739365F32303132303756312D312E31234B184C0E104D66343135313330343930303731344F0700000000000000310D0A
2023-02-22 17:45:33,798 [1] INFO loginfo - 接收到 172.16.1.49:64367: 40 3A 00 46 15 13 04 90 07 14 01 49 00 20 03 27 06 50 46 00 01 41 84 4A 26 48 5A 47 39 36 5F 32 30 31 32 30 37 56 31 2D 31 2E 31 23 4B 18 4C 0E 10 4D 66 34 31 35 31 33 30 34 39 30 30 37 31 34 4F 07 00 00 00 00 00 00 00 31 0D 0A
2023-02-22 17:45:33,799 [1] INFO loginfo - 登录帧校验失败: 403A0046151304900714014900200327065046000141844A26485A4739365F32303132303756312D312E31234B184C0E104D66343135313330343930303731344F0700000000000000310D0A
2023-02-22 17:45:35,470 [1] INFO loginfo - 接收到 172.16.1.49:64367: 40 3A 00 46 15 13 04 90 07 14 01 49 00 20 03 27 06 50 46 00 01 41 84 4A 26 48 5A 47 39 36 5F 32 30 31 32 30 37 56 31 2D 31 2E 31 23 4B 18 4C 0E 10 4D 66 34 31 35 31 33 30 34 39 30 30 37 31 34 4F 07 00 00 00 00 00 00 00 31 0D 0A
2023-02-22 17:45:35,471 [1] INFO loginfo - 登录帧校验失败: 403A0046151304900714014900200327065046000141844A26485A4739365F32303132303756312D312E31234B184C0E104D66343135313330343930303731344F0700000000000000310D0A
2023-02-22 17:46:10,950 [1] INFO loginfo - 接收到 172.16.1.49:64367: 40 3A 00 46 15 13 04 90 07 14 01 49 00 20 03 27 06 50 46 00 01 41 84 4A 26 48 5A 47 39 36 5F 32 30 31 32 30 37 56 31 2D 31 2E 31 23 4B 18 4C 0E 10 4D 66 34 31 35 31 33 30 34 39 30 30 37 31 34 4F 07 00 00 00 00 00 00 00 31 0D 0A
------------------------------------------------
2023-02-22 17:46:56,616 [1] INFO loginfo - 接收到 172.16.1.49:64367: 40 3A 00 46 15 13 04 90 07 14 01 49 00 20 03 27 06 50 46 00 01 41 84 4A 26 48 5A 47 39 36 5F 32 30 31 32 30 37 56 31 2D 31 2E 31 23 4B 18 4C 0E 10 4D 66 34 31 35 31 33 30 34 39 30 30 37 31 34 4F 07 00 00 00 00 00 00 00 31 0D 0A
2023-02-22 17:47:53,006 [1] INFO loginfo - 登录帧校验失败: 403A0046151304900714014900200327065046000141844A26485A4739365F32303132303756312D312E31234B184C0E104D66343135313330343930303731344F0700000000000000310D0A
------------------------------------------------
2023-02-22 17:49:49,256 [1] INFO loginfo - 接收到 172.16.1.49:64367: 40 3A 00 3B 15 13 04 90 07 14 08 01 01 01 41 84 00 20 03 27 06 50 26 0A 00 00 01 76 00 00 15 23 00 00 01 00 00 00 12 00 00 00 01 50 00 00 28 32 00 00 09 01 10 91 CA 0D 0A

View File

@ -1 +0,0 @@
5a19b734824e0e2fc92080fabad66652b743c3cb

Binary file not shown.

View File

@ -9,9 +9,9 @@ using System.Threading.Tasks;
using static System.Net.WebRequestMethods; using static System.Net.WebRequestMethods;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace UdpServerCMD namespace ShuiBiao
{ {
internal class Program internal class ShuiBiao
{ {
/// <summary> /// <summary>
/// 基数【前置位设备数据总数和】 /// 基数【前置位设备数据总数和】
@ -1307,7 +1307,8 @@ namespace UdpServerCMD
Console.WriteLine("累积运行时间:" + RunTime + "h"); Console.WriteLine("累积运行时间:" + RunTime + "h");
Console.WriteLine("电池电压:" + cellVoltage + "v"); Console.WriteLine("电池电压:" + cellVoltage + "v");
Console.WriteLine("管径:" + pipeSize + "mm"); Console.WriteLine("管径:" + pipeSize + "mm");
Console.WriteLine("量程:" + interconvert(0, 0, capacity.ToString()));//??? capacity.Clear().Append(interconvert(0, 0, capacity.ToString()));
Console.WriteLine("量程:" + capacity);//???
typeMalfunction(diagnose); typeMalfunction(diagnose);
//数据校验 --版本号-故障代码 //数据校验 --版本号-故障代码
@ -1488,7 +1489,8 @@ namespace UdpServerCMD
Console.WriteLine("累积运行时间:" + RunTime + "h"); Console.WriteLine("累积运行时间:" + RunTime + "h");
Console.WriteLine("电池电压:" + cellVoltage + "v"); Console.WriteLine("电池电压:" + cellVoltage + "v");
Console.WriteLine("管径:" + pipeSize + "mm"); Console.WriteLine("管径:" + pipeSize + "mm");
Console.WriteLine("量程:" + interconvert(0, 0, capacity.ToString()));//??? capacity.Clear().Append(interconvert(0, 0, capacity.ToString()));
Console.WriteLine("量程:" + capacity);//???
//Console.WriteLine("阻尼系数:" + hexToASCII(dampingFactor.ToString())); //Console.WriteLine("阻尼系数:" + hexToASCII(dampingFactor.ToString()));
typeMalfunction(diagnose); typeMalfunction(diagnose);

View File

@ -6,8 +6,8 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{F09542D2-0121-40B2-83C0-5ACBA83C3FC7}</ProjectGuid> <ProjectGuid>{F09542D2-0121-40B2-83C0-5ACBA83C3FC7}</ProjectGuid>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<RootNamespace>UdpServerCMD</RootNamespace> <RootNamespace>ShuiBiao</RootNamespace>
<AssemblyName>UdpServerCMD</AssemblyName> <AssemblyName>ShuiBiao</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@ -46,7 +46,7 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Program.cs" /> <Compile Include="ShuiBiao.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -1,9 +1,9 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17 # Visual Studio Version 16
VisualStudioVersion = 17.4.33213.308 VisualStudioVersion = 16.0.32929.386
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UdpServerCMD", "UdpServerCMD.csproj", "{F09542D2-0121-40B2-83C0-5ACBA83C3FC7}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShuiBiao", "ShuiBiao.csproj", "{F09542D2-0121-40B2-83C0-5ACBA83C3FC7}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
</configSections>
<log4net>
<root>
<level value="ALL" />
<appender-ref ref="SysAppender" />
</root>
<logger name="WebLogger">
<level value="DEBUG" />
</logger>
<appender name="SysAppender" type="log4net.Appender.RollingFileAppender,log4net">
<param name="File" value="App_Data/" />
<param name="AppendToFile" value="true" />
<param name="RollingStyle" value="Date" />
<param name="DatePattern" value="&quot;Logs_&quot;yyyyMMdd&quot;.txt&quot;" />
<param name="StaticLogFileName" value="false" />
<layout type="log4net.Layout.PatternLayout,log4net">
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n" />
<param name="Header" value=" ------------------------------------------------&#xD;&#xA;" />
<param name="Footer" value=" ------------------------------------------------&#xD;&#xA;" />
</layout>
</appender>
<appender name="consoleApp" type="log4net.Appender.ConsoleAppender,log4net">
<layout type="log4net.Layout.PatternLayout,log4net">
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n" />
</layout>
</appender>
</log4net>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
</configuration>

Binary file not shown.

View File

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
</configSections>
<log4net>
<root>
<level value="ALL" />
<appender-ref ref="SysAppender" />
</root>
<logger name="WebLogger">
<level value="DEBUG" />
</logger>
<appender name="SysAppender" type="log4net.Appender.RollingFileAppender,log4net">
<param name="File" value="App_Data/" />
<param name="AppendToFile" value="true" />
<param name="RollingStyle" value="Date" />
<param name="DatePattern" value="&quot;Logs_&quot;yyyyMMdd&quot;.txt&quot;" />
<param name="StaticLogFileName" value="false" />
<layout type="log4net.Layout.PatternLayout,log4net">
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n" />
<param name="Header" value=" ------------------------------------------------&#xD;&#xA;" />
<param name="Footer" value=" ------------------------------------------------&#xD;&#xA;" />
</layout>
</appender>
<appender name="consoleApp" type="log4net.Appender.ConsoleAppender,log4net">
<layout type="log4net.Layout.PatternLayout,log4net">
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n" />
</layout>
</appender>
</log4net>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
</configuration>

View File

@ -0,0 +1 @@
0f052d2ac195e501443374a694b72da723648431

View File

@ -0,0 +1,10 @@
D:\XM\C#\ZHshuibiao\shuibiao\bin\Debug\ShuiBiao.exe.config
D:\XM\C#\ZHshuibiao\shuibiao\bin\Debug\ShuiBiao.exe
D:\XM\C#\ZHshuibiao\shuibiao\bin\Debug\ShuiBiao.pdb
D:\XM\C#\ZHshuibiao\shuibiao\bin\Debug\log4net.dll
D:\XM\C#\ZHshuibiao\shuibiao\bin\Debug\log4net.xml
D:\XM\C#\ZHshuibiao\shuibiao\obj\Debug\ShuiBiao.csproj.AssemblyReference.cache
D:\XM\C#\ZHshuibiao\shuibiao\obj\Debug\ShuiBiao.csproj.CoreCompileInputs.cache
D:\XM\C#\ZHshuibiao\shuibiao\obj\Debug\ShuiBiao.csproj.CopyComplete
D:\XM\C#\ZHshuibiao\shuibiao\obj\Debug\ShuiBiao.exe
D:\XM\C#\ZHshuibiao\shuibiao\obj\Debug\ShuiBiao.pdb

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1 @@
3d0e295de707e26ca93ee2c602da012cd3de559e

View File

@ -20,3 +20,13 @@ D:\GaoGuoZheng_U3D\C#\ZHshuibiao\UdpServerCMD\obj\Debug\UdpServerCMD.csproj.Core
D:\GaoGuoZheng_U3D\C#\ZHshuibiao\UdpServerCMD\obj\Debug\UdpServerCMD.csproj.CopyComplete D:\GaoGuoZheng_U3D\C#\ZHshuibiao\UdpServerCMD\obj\Debug\UdpServerCMD.csproj.CopyComplete
D:\GaoGuoZheng_U3D\C#\ZHshuibiao\UdpServerCMD\obj\Debug\UdpServerCMD.exe D:\GaoGuoZheng_U3D\C#\ZHshuibiao\UdpServerCMD\obj\Debug\UdpServerCMD.exe
D:\GaoGuoZheng_U3D\C#\ZHshuibiao\UdpServerCMD\obj\Debug\UdpServerCMD.pdb D:\GaoGuoZheng_U3D\C#\ZHshuibiao\UdpServerCMD\obj\Debug\UdpServerCMD.pdb
D:\XM\C#\ZHshuibiao\UdpServerCMD\bin\Debug\UdpServerCMD.exe.config
D:\XM\C#\ZHshuibiao\UdpServerCMD\bin\Debug\UdpServerCMD.exe
D:\XM\C#\ZHshuibiao\UdpServerCMD\bin\Debug\UdpServerCMD.pdb
D:\XM\C#\ZHshuibiao\UdpServerCMD\bin\Debug\log4net.dll
D:\XM\C#\ZHshuibiao\UdpServerCMD\bin\Debug\log4net.xml
D:\XM\C#\ZHshuibiao\UdpServerCMD\obj\Debug\UdpServerCMD.csproj.AssemblyReference.cache
D:\XM\C#\ZHshuibiao\UdpServerCMD\obj\Debug\UdpServerCMD.csproj.CoreCompileInputs.cache
D:\XM\C#\ZHshuibiao\UdpServerCMD\obj\Debug\UdpServerCMD.csproj.CopyComplete
D:\XM\C#\ZHshuibiao\UdpServerCMD\obj\Debug\UdpServerCMD.exe
D:\XM\C#\ZHshuibiao\UdpServerCMD\obj\Debug\UdpServerCMD.pdb

View File

@ -0,0 +1 @@
bc915a0351e6b25cc2cf099dd5f80ec55e461e24

View File

@ -0,0 +1,10 @@
D:\XM\C#\ZHshuibiao\shuibiao\bin\Release\ShuiBiao.exe.config
D:\XM\C#\ZHshuibiao\shuibiao\bin\Release\ShuiBiao.exe
D:\XM\C#\ZHshuibiao\shuibiao\bin\Release\ShuiBiao.pdb
D:\XM\C#\ZHshuibiao\shuibiao\bin\Release\log4net.dll
D:\XM\C#\ZHshuibiao\shuibiao\bin\Release\log4net.xml
D:\XM\C#\ZHshuibiao\shuibiao\obj\Release\ShuiBiao.csproj.AssemblyReference.cache
D:\XM\C#\ZHshuibiao\shuibiao\obj\Release\ShuiBiao.csproj.CoreCompileInputs.cache
D:\XM\C#\ZHshuibiao\shuibiao\obj\Release\ShuiBiao.csproj.CopyComplete
D:\XM\C#\ZHshuibiao\shuibiao\obj\Release\ShuiBiao.exe
D:\XM\C#\ZHshuibiao\shuibiao\obj\Release\ShuiBiao.pdb

Binary file not shown.

Binary file not shown.