From 543f0a71b763660a1b5d12ac2bc0e1259e1ea4cb Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 31 三月 2025 08:47:02 +0800
Subject: [PATCH] Merge branch 'qy0227' of http://115.159.85.185:8098/r/MeiXinLaiRui/NiuJuKongZhi into qy0227
---
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_Server/Controllers/SerialPort/PutakeController.cs | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
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/PutakeController.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/PutakeController.cs"
index eebcc5e..7e624dc 100644
--- "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/PutakeController.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/PutakeController.cs"
@@ -36,16 +36,10 @@
return Service.GetNjtake(njid);
}
- //[HttpGet, Route("seletTaskeStatus"), AllowAnonymous]
- //public WebResponseContent seletTaskeStatus(string status)
- //{
- // return Service.seletTaskeStatus(status);
- //}
-
- [HttpGet, Route("GetNJandPu"), AllowAnonymous]
- public WebResponseContent GetNJandPu()
+ [HttpGet, Route("PerformTasks"), AllowAnonymous]
+ public WebResponseContent PerformTasks(string group)
{
- return Service.GetNJandPu();
+ return Service.PerformTasks(group);
}
}
--
Gitblit v1.9.3