From 9ccc290da5093ec8f3a46cd0206b021e0f3620a1 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期五, 28 二月 2025 09:54:01 +0800
Subject: [PATCH] 通信2
---
/dev/null | 74 ------------------
项目代码/WIDESEAWCS_Server 正式/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json | 99 ++++++++++++++----------
项目代码/WIDESEAWCS_Server 正式/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json | 21 +---
3 files changed, 65 insertions(+), 129 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json"
index 016c22b..11e7684 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json"
@@ -7,12 +7,16 @@
"RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\serialport\\serialporttestservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|d:\\vs\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_server\\controllers\\serialport\\serialportcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\controllers\\serialport\\serialportcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\vs\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_tasks\\stackercranejob\\commonstackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\stackercranejob\\commonstackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|d:\\vs\\wideseawcs_server \u6B63\u5F0F\\serialportservice\\serialportservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|solutionrelative:serialportservice\\serialportservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|d:\\vs\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_server\\controllers\\serialport\\serialportcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\controllers\\serialport\\serialportcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{87427726-AA28-437C-B9D7-C7B536EA1830}|SerialPortRepository\\WIDESEA_SerialPortRepository.csproj|d:\\vs\\wideseawcs_server \u6B63\u5F0F\\serialportrepository\\serialportrepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -161,11 +165,24 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 1,
+ "SelectedChildIndex": 2,
"Children": [
{
"$type": "Bookmark",
"Name": "ST:0:0:{cce594b6-0c39-4442-ba28-10c64ac7e89f}"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 1,
+ "Title": "CommonStackerCraneJob.cs",
+ "DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs",
+ "ToolTip": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs",
+ "RelativeToolTip": "WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAAA0AAAAbAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-02-28T01:46:09.493Z",
+ "EditorCaption": ""
},
{
"$type": "Document",
@@ -175,7 +192,7 @@
"RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestService.cs",
"ToolTip": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestService.cs",
"RelativeToolTip": "WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestService.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAABYAAAAJAAAAAAAAAA==",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAAAuAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-02-27T06:09:27.847Z",
"EditorCaption": ""
@@ -188,14 +205,14 @@
"RelativeDocumentMoniker": "SerialPortService\\SerialPortService.cs",
"ToolTip": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\SerialPortService.cs",
"RelativeToolTip": "SerialPortService\\SerialPortService.cs",
- "ViewState": "AgIAAC8AAAAAAAAAAAApwEMAAAAIAAAAAAAAAA==",
+ "ViewState": "AgIAAAEAAAAAAAAAAAAlwCEAAAAMAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-02-25T03:19:36.75Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 4,
+ "DocumentIndex": 5,
"Title": "TaskService.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_TaskInfoService\\TaskService.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
@@ -208,7 +225,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 5,
+ "DocumentIndex": 6,
"Title": "Program.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\Program.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Server\\Program.cs",
@@ -221,7 +238,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 3,
"Title": "SerialPortController.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\Controllers\\SerialPort\\SerialPortController.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\SerialPort\\SerialPortController.cs",
@@ -234,7 +251,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 3,
+ "DocumentIndex": 4,
"Title": "SerialPortRepository.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortRepository\\SerialPortRepository.cs",
"RelativeDocumentMoniker": "SerialPortRepository\\SerialPortRepository.cs",
@@ -247,7 +264,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 7,
+ "DocumentIndex": 8,
"Title": "WIDESEAWCS_Model.csproj",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj",
"RelativeDocumentMoniker": "WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj",
@@ -259,7 +276,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 6,
+ "DocumentIndex": 7,
"Title": "Dt_TorqueOp.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Model\\Models\\SerialPort\\Dt_TorqueOp.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\SerialPort\\Dt_TorqueOp.cs",
@@ -272,7 +289,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 8,
+ "DocumentIndex": 9,
"Title": "appsettings.json",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\appsettings.json",
"RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json",
@@ -284,7 +301,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 9,
+ "DocumentIndex": 10,
"Title": "Dt_Process.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Model\\Models\\SerialPort\\Dt_Process.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\SerialPort\\Dt_Process.cs",
@@ -296,7 +313,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 10,
+ "DocumentIndex": 11,
"Title": "Sys_DictionaryService.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_SystemServices\\Sys_DictionaryService.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_DictionaryService.cs",
@@ -308,7 +325,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 11,
+ "DocumentIndex": 12,
"Title": "ISys_DictionaryService.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_ISystemServices\\ISys_DictionaryService.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_ISystemServices\\ISys_DictionaryService.cs",
@@ -320,7 +337,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 12,
+ "DocumentIndex": 13,
"Title": "ISys_DictionaryListService.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_ISystemServices\\ISys_DictionaryListService.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_ISystemServices\\ISys_DictionaryListService.cs",
@@ -332,7 +349,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 13,
+ "DocumentIndex": 14,
"Title": "Sys_DictionaryListService.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_SystemServices\\Sys_DictionaryListService.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_DictionaryListService.cs",
@@ -344,7 +361,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 14,
+ "DocumentIndex": 15,
"Title": "WIDESEAWCS_Tasks.csproj",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj",
"RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj",
@@ -356,7 +373,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 16,
+ "DocumentIndex": 17,
"Title": "DeviceProtocolController.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\Controllers\\QuartzJob\\DeviceProtocolController.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\QuartzJob\\DeviceProtocolController.cs",
@@ -368,7 +385,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 17,
+ "DocumentIndex": 18,
"Title": "DeviceInfoController.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\Controllers\\QuartzJob\\DeviceInfoController.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\QuartzJob\\DeviceInfoController.cs",
@@ -380,7 +397,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 15,
+ "DocumentIndex": 16,
"Title": "index.html",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\index.html",
"RelativeDocumentMoniker": "WIDESEAWCS_Server\\index.html",
@@ -392,7 +409,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 22,
+ "DocumentIndex": 23,
"Title": "RoleAuthor.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Model\\Models\\System\\RoleAuthor.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\System\\RoleAuthor.cs",
@@ -404,7 +421,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 23,
+ "DocumentIndex": 24,
"Title": "Sys_Role.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Model\\Models\\System\\Sys_Role.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\System\\Sys_Role.cs",
@@ -416,7 +433,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 20,
+ "DocumentIndex": 21,
"Title": "RoleNodes.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Model\\Models\\System\\RoleNodes.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\System\\RoleNodes.cs",
@@ -428,7 +445,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 21,
+ "DocumentIndex": 22,
"Title": "Sys_Actions.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Model\\Models\\System\\Sys_Actions.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\System\\Sys_Actions.cs",
@@ -440,7 +457,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 19,
+ "DocumentIndex": 20,
"Title": "Sys_Dictionary.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Model\\Models\\System\\Sys_Dictionary.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\System\\Sys_Dictionary.cs",
@@ -452,7 +469,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 18,
+ "DocumentIndex": 19,
"Title": "Sys_DictionaryList.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Model\\Models\\System\\Sys_DictionaryList.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\System\\Sys_DictionaryList.cs",
@@ -464,7 +481,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 25,
+ "DocumentIndex": 26,
"Title": "WIDESEA_SerialPortRepository.csproj",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortRepository\\WIDESEA_SerialPortRepository.csproj",
"RelativeDocumentMoniker": "SerialPortRepository\\WIDESEA_SerialPortRepository.csproj",
@@ -476,7 +493,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 24,
+ "DocumentIndex": 25,
"Title": "WIDESEA_ISerialPortService.csproj",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\ISerialPortService\\WIDESEA_ISerialPortService.csproj",
"RelativeDocumentMoniker": "ISerialPortService\\WIDESEA_ISerialPortService.csproj",
@@ -488,7 +505,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 37,
+ "DocumentIndex": 38,
"Title": "ISerialPortRepository.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\ISerialPortRepository\\ISerialPortRepository.cs",
"RelativeDocumentMoniker": "ISerialPortRepository\\ISerialPortRepository.cs",
@@ -500,7 +517,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 26,
+ "DocumentIndex": 27,
"Title": "TaskExecuteDetailService.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_TaskInfoService\\TaskExecuteDetailService.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoService\\TaskExecuteDetailService.cs",
@@ -512,7 +529,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 27,
+ "DocumentIndex": 28,
"Title": "WIDESEA_SerialPortService.csproj",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\WIDESEA_SerialPortService.csproj",
"RelativeDocumentMoniker": "SerialPortService\\WIDESEA_SerialPortService.csproj",
@@ -524,7 +541,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 28,
+ "DocumentIndex": 29,
"Title": "TaskRepository.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_TaskInfoRepository\\TaskRepository.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoRepository\\TaskRepository.cs",
@@ -536,7 +553,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 29,
+ "DocumentIndex": 30,
"Title": "TaskExecuteDetailRepository.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_TaskInfoRepository\\TaskExecuteDetailRepository.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoRepository\\TaskExecuteDetailRepository.cs",
@@ -548,7 +565,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 30,
+ "DocumentIndex": 31,
"Title": "ITaskRepository.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_ITaskInfoRepository\\ITaskRepository.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_ITaskInfoRepository\\ITaskRepository.cs",
@@ -560,7 +577,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 31,
+ "DocumentIndex": 32,
"Title": "ITaskExecuteDetailRepository.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_ITaskInfoRepository\\ITaskExecuteDetailRepository.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_ITaskInfoRepository\\ITaskExecuteDetailRepository.cs",
@@ -572,7 +589,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 32,
+ "DocumentIndex": 33,
"Title": "WIDESEAWCS_TaskInfoRepository.csproj",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_TaskInfoRepository\\WIDESEAWCS_TaskInfoRepository.csproj",
"RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoRepository\\WIDESEAWCS_TaskInfoRepository.csproj",
@@ -584,7 +601,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 33,
+ "DocumentIndex": 34,
"Title": "Sys_LogService.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_SystemServices\\Sys_LogService.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_LogService.cs",
@@ -596,7 +613,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 35,
+ "DocumentIndex": 36,
"Title": "SerialPortTestController.cs",
"DocumentMoniker": "E:\\\u9879\u76EE\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server - \u526F\u672C\\WIDESEAWCS_Server\\Controllers\\SerialPortTest\\SerialPortTestController.cs",
"ToolTip": "E:\\\u9879\u76EE\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server - \u526F\u672C\\WIDESEAWCS_Server\\Controllers\\SerialPortTest\\SerialPortTestController.cs",
@@ -606,7 +623,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 36,
+ "DocumentIndex": 37,
"Title": "WIDESEAWCS_SerialPortServices.csproj",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPort\\WIDESEAWCS_SerialPortServices.csproj",
"RelativeDocumentMoniker": "SerialPort\\WIDESEAWCS_SerialPortServices.csproj",
@@ -618,7 +635,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 34,
+ "DocumentIndex": 35,
"Title": "RouterController.cs",
"DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\Controllers\\BasicInfo\\RouterController.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\BasicInfo\\RouterController.cs",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json"
index 11e7684..f626633 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json"
@@ -181,8 +181,7 @@
"RelativeToolTip": "WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAA0AAAAbAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-02-28T01:46:09.493Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-02-28T01:46:09.493Z"
},
{
"$type": "Document",
@@ -207,8 +206,7 @@
"RelativeToolTip": "SerialPortService\\SerialPortService.cs",
"ViewState": "AgIAAAEAAAAAAAAAAAAlwCEAAAAMAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-02-25T03:19:36.75Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-02-25T03:19:36.75Z"
},
{
"$type": "Document",
@@ -220,8 +218,7 @@
"RelativeToolTip": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
"ViewState": "AgIAACwAAAAAAAAAAAAYwHMAAAAlAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-02-25T06:02:36.626Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-02-25T06:02:36.626Z"
},
{
"$type": "Document",
@@ -233,8 +230,7 @@
"RelativeToolTip": "WIDESEAWCS_Server\\Program.cs",
"ViewState": "AgIAAEcAAAAAAAAAAAAhwFsAAAAPAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-02-14T08:06:57.888Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-02-14T08:06:57.888Z"
},
{
"$type": "Document",
@@ -246,8 +242,7 @@
"RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\SerialPort\\SerialPortController.cs",
"ViewState": "AgIAACwAAAAAAAAAAAApwEEAAAAIAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-02-25T03:20:09.708Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-02-25T03:20:09.708Z"
},
{
"$type": "Document",
@@ -259,8 +254,7 @@
"RelativeToolTip": "SerialPortRepository\\SerialPortRepository.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAAoAAAAIAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-02-25T03:15:38.124Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-02-25T03:15:38.124Z"
},
{
"$type": "Document",
@@ -284,8 +278,7 @@
"RelativeToolTip": "WIDESEAWCS_Model\\Models\\SerialPort\\Dt_TorqueOp.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAABAAAAA4AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-02-25T03:11:29.816Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-02-25T03:11:29.816Z"
},
{
"$type": "Document",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/SerialPortTestService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/SerialPortTestService.cs"
deleted file mode 100644
index 5bfb1ca..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/SerialPortTestService.cs"
+++ /dev/null
@@ -1,159 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using RJCP.IO.Ports;
-
-namespace WIDESEA_SerialPortService
-{
- public class SerialPortTestService
- {
-
- private readonly SerialPortStream _serialPortStream;
- private CancellationTokenSource _cancellationTokenSource;
- private Task _sendTask;
- private int commandType = 2;
-
- //// 浜嬩欢 - 鐢ㄤ簬閫氱煡鏁版嵁鎺ユ敹鍒�
- //public event Action<string> DataReceivedEvent;
-
- // 鍛戒护瀛楃涓�
- private string command0 = ""; // 涓嶅彂閫佸懡浠�
- private string command1 = "824070241JNT\r"; //鍙戦�佷俊鍙�
- private string command2 = "824070241JNT,0004000,+0001000[+TOL],-0001000[-TOL]\r"; //璁惧��
-
- // 鐢ㄤ簬瀛樺偍鎺ユ敹鍒扮殑鏁版嵁
- private List<string> receivedDataList = new List<string>();
-
- // 鏋勯�犲嚱鏁�
- public SerialPortTestService(string port)
- {
- _serialPortStream = new SerialPortStream(port)
- {
- BaudRate = 9600,
- Parity = Parity.None,
- DataBits = 8,
- StopBits = StopBits.One,
- DtrEnable = true,
- RtsEnable = true
- };
- //涓插彛鎺ユ敹鍒版暟鎹椂锛宊serialPortStream 浼氳嚜鍔ㄨЕ鍙� DataReceived 浜嬩欢
- _serialPortStream.DataReceived += OnDataReceived; //鎺ユ敹涓插彛鍙戝嚭鐨勬暟鎹�
- }
-
- // 鎵撳紑涓插彛骞跺紑濮嬫寔缁彂閫佷俊鍙�
- public void OpenSerialPort()
- {
- if (!_serialPortStream.IsOpen)
- {
- _serialPortStream.Open();
- StartSendingData();//寮�鍚悗鍙板惊鐜�
- }
- }
-
- // 鍏抽棴涓插彛骞跺仠姝㈠彂閫佷俊鍙�
- public void CloseSerialPort()
- {
- if (_serialPortStream.IsOpen)
- {
- _serialPortStream.Close();
- }
- }
-
- // 鍙戦�佹暟鎹竴娆�
- public void SendData(string data)
- {
- if (_serialPortStream.IsOpen)
- {
- byte[] bytesToSend = Encoding.ASCII.GetBytes(data);
- _serialPortStream.Write(bytesToSend, 0, bytesToSend.Length);//灏嗘暟鎹彂閫佸埌涓插彛
- }
- }
-
- // 鑾峰彇涓插彛鐘舵��
- public bool GetSerialPortStatus()
- {
- return _serialPortStream.IsOpen;
- }
-
- // 鑾峰彇鎺ユ敹鍒扮殑鎵�鏈夋暟鎹�
- public List<string> GetReceivedData()
- {
- return receivedDataList;
- }
-
- // 澶勭悊鎺ユ敹鍒扮殑鏁版嵁
- //姣忓綋涓插彛鏀跺埌鏁版嵁鏃讹紝浼氳Е鍙戞鏂规硶
- private void OnDataReceived(object sender, SerialDataReceivedEventArgs e)
- {
- //浠庝覆鍙ｆ帴鏀舵暟鎹紝骞跺皢鎺ユ敹鍒扮殑鏁版嵁杞崲涓哄瓧绗︿覆
- byte[] buffer = new byte[1024];//涓�涓瓧鑺傛暟缁� buffer锛屽ぇ灏忎负 1024 瀛楄妭
- int bytesRead = _serialPortStream.Read(buffer, 0, buffer.Length);//浠庝覆鍙ｆ祦 _serialPortStream 涓鍙栨暟鎹苟灏嗗叾瀛樺叆 buffer 鏁扮粍涓��
- string receivedData = Encoding.ASCII.GetString(buffer, 0, bytesRead);//灏嗘帴鏀跺埌鐨勫瓧鑺傛暟鎹浆鎹㈡垚涓�涓瓧绗︿覆
-
- //杩欓噷鍐欎竴涓柟娉曠敤浜庡垽鏂瘡娆eceivedDat鏄惁婊¤冻鏉′欢
- //鎴彇璁惧缂栧彿鍚庣殑淇╀负鏄惁涓�03锛�03鎴愬姛灏辫繘琛屼笅姝�
- string deviceCodePostfix = receivedData.Substring(9, 2); // 绱㈠紩浠� 9 寮�濮嬶紝闀垮害涓� 2锛屽嵆鎻愬彇 "04"
- // 鎻愬彇浠庣24浣嶅悗鐨勬暟鎹紙渚嬪 "0008000"锛�
- //string dataAfter24th = receivedData.Substring(23, 7); // 浠庣23浣嶅紑濮嬫彁鍙�7涓瓧绗︼紝寰楀埌 "0008000"
- //if (deviceCodePostfix == "03")
- //{
-
- // receivedDataList.Add(receivedData);
- // // 瑙﹀彂鎺ユ敹鍒版暟鎹簨浠�
- ////DataReceivedEvent?.Invoke(receivedData); // 閫氱煡鏁版嵁宸叉帴鏀跺埌
- //}
-
-
- receivedDataList.Add(receivedData);
-
-
-
-
- // 澶勭悊鍛戒护鍒囨崲閫昏緫
- if (commandType == 2 && receivedData.Contains("ParseOK"))
- {
- commandType = 1;
- }
- else if (commandType == 1 && (receivedData.Contains("82407024103") || receivedData.Contains("82407024104")))
- {
- commandType = 2;
- }
- }
-
- // 鍚姩鍚庡彴浠诲姟锛屾瘡闅斾竴娈垫椂闂村彂閫佷俊鍙�
- private void StartSendingData()
- {
- _cancellationTokenSource = new CancellationTokenSource();
- _sendTask = Task.Run(() =>
- {
- while (_serialPortStream.IsOpen)
- {
- string command = command0;
- //鍏堝垽鏂璫ommandType
- if (commandType == 1)
- {
- command = command1;
- }
- else if (commandType == 2)
- {
- command = command2;
- }
-
-
- //鍐嶆鏌� command 瀛楃涓叉槸鍚︿负绌烘垨 null
- if (!string.IsNullOrEmpty(command))
- {
- byte[] dataToSend = Encoding.ASCII.GetBytes(command);//灏哻ommand杞垚瀛楄妭鏁扮粍
- //锛堜笁涓弬鏁扮殑鍚箟锛�1鏁扮粍锛�2浠庣0浣嶅紑濮嬫埅鍙栵紝3鏄鍙戦�佺殑瀛楄妭鏁帮紝杩欓噷琛ㄧず鏁翠釜瀛楄妭鏁扮粍鐨勯暱搴︼級
- _serialPortStream.Write(dataToSend, 0, dataToSend.Length);//鏈�鍚庡悜涓插彛鍙戦�佹暟鎹�
-
- }
-
- Thread.Sleep(1000); // 姣忛殧1绉掑彂閫佷竴娆″懡浠�
- }
- });
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/Controllers/SerialPort/SerialPortTestController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/Controllers/SerialPort/SerialPortTestController.cs"
deleted file mode 100644
index 2a64c58..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/Controllers/SerialPort/SerialPortTestController.cs"
+++ /dev/null
@@ -1,74 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_SerialPortService;
-
-
-namespace WIDESEAWCS_Server.Controllers.SerialPortTest
-{
- [Route("api/[controller]")]
- [ApiController]
- public class SerialPortTestController : ControllerBase
- {
- //寮曠敤鏈嶅姟灞�
- private readonly SerialPortTestService _serialPortService;
-
- //娣诲姞鏋勯�犲嚱鏁�
- public SerialPortTestController(SerialPortTestService serialPortService)
- {
- _serialPortService = serialPortService;
- }
-
- // 鎵撳紑涓插彛骞跺紑濮嬫寔缁彂閫佷俊鍙�
- [HttpPost("open")]
- public IActionResult OpenSerialPort()
- {
- if (_serialPortService.GetSerialPortStatus())
- {
- return Ok("涓插彛宸叉墦寮�");
- }
-
- _serialPortService.OpenSerialPort();
- return Ok("涓插彛鎵撳紑鎴愬姛锛屽紑濮嬪彂閫佷俊鍙�");
- }
-
- // 鍏抽棴涓插彛骞跺仠姝㈠彂閫佷俊鍙�
- [HttpPost("close")]
- public IActionResult CloseSerialPort()
- {
- if (!_serialPortService.GetSerialPortStatus())
- {
- return Ok("涓插彛宸插叧闂�");
- }
-
- _serialPortService.CloseSerialPort();
- return Ok("涓插彛鍏抽棴鎴愬姛锛屽仠姝㈠彂閫佷俊鍙�");
- }
-
- // 鍙戦�佹暟鎹竴娆�
- [HttpPost("send")]
- public IActionResult SendData([FromBody] string data)
- {
- if (!_serialPortService.GetSerialPortStatus())
- {
- return BadRequest("涓插彛鏈墦寮�");
- }
-
- _serialPortService.SendData(data);
- return Ok("鏁版嵁鍙戦�佹垚鍔�");
- }
-
- // 鑾峰彇涓插彛鐘舵��
- [HttpGet("status")]
- public IActionResult GetSerialPortStatus()
- {
- return Ok(new { IsOpen = _serialPortService.GetSerialPortStatus() });
- }
-
- // 鑾峰彇鎺ユ敹鍒扮殑鎵�鏈夋暟鎹�
- [HttpGet("receivedData")]
- public IActionResult GetReceivedData()
- {
- return Ok(_serialPortService.GetReceivedData());
- }
- }
-}
\ No newline at end of file
--
Gitblit v1.9.3