From 461ccbda1d9d3fef42f250771c2fd30702755c16 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 24 四月 2025 17:18:35 +0800
Subject: [PATCH] PLC
---
项目代码/WIDESEAWCS_Server 正式/SerialPortService/PutakeServer.cs | 80 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 78 insertions(+), 2 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/PutakeServer.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/PutakeServer.cs"
index 550fa3f..5be34c8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/PutakeServer.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/PutakeServer.cs"
@@ -1,6 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
using System.Linq;
+using System.Net.NetworkInformation;
using System.Text;
using System.Threading.Tasks;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Information;
@@ -14,6 +15,8 @@
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_QuartzJob;
+using static OfficeOpenXml.ExcelErrorValue;
namespace WIDESEAWCS_TaskInfoService
{
@@ -34,8 +37,8 @@
{
OrderByParameters = new Dictionary<string, SqlSugar.OrderByType>
{
- { nameof(Dt_Putake.Pustatus),SqlSugar.OrderByType.Asc },
- // { nameof(Dt_Putake.CreateDate),SqlSugar.OrderByType.Asc }//鎸夌姸鎬佸拰鍒涘缓鏃堕棿鍗囧簭鎺掑簭
+ //{ nameof(Dt_Putake.Pustatus),SqlSugar.OrderByType.Asc },
+ { nameof(Dt_Putake.CreateDate),SqlSugar.OrderByType.Desc }//鎸夌姸鎬佸拰鍒涘缓鏃堕棿闄嶅簭鎺掑簭
};
return base.GetPageData(options);
}
@@ -240,5 +243,78 @@
return new WebResponseContent { Status=false, Message="閿欒淇℃伅锛�"+ex.Message};
}
}
+
+ public WebResponseContent Getstatus()
+ {
+ try
+ {
+ //// 鑾峰彇 Pustatus == 0 鐨勪换鍔′腑锛孌ispatchtime 鏈�鏃╃殑涓�鏉�
+ var result = BaseDal.QueryData(x => x.Pustatus == 0);
+ if (result == null)
+ {
+ return new WebResponseContent { Status = false, Message = "娌℃壘鍒拌浠诲姟" };
+ }
+ return new WebResponseContent { Status = true, Data=new { result } };
+ }
+ catch (Exception ex)
+ {
+ return new WebResponseContent { Status = false, Message = "閿欒淇℃伅锛�" + ex.Message };
+ }
+ }
+
+ public WebResponseContent OpenDoor(string group)
+ {
+ try
+ {
+ OtherDevice otherDevice = (OtherDevice)Storage.Devices.Find(x => x.DeviceName == "PLC");
+ if (otherDevice == null) return new WebResponseContent { Status = false, Message = "鏈繛鎺�" };
+ if (group=="鐢垫皵")
+ {
+ var values = otherDevice.Communicator.Read<bool>("M27");
+ }
+ if(group=="鏈烘")
+ {
+ var values = otherDevice.Communicator.Read<bool>("M29");
+ }
+ if (group == "鍦版矡")
+ {
+ var values = otherDevice.Communicator.Read<bool>("M31");
+ var values2 = otherDevice.Communicator.Read<bool>("M33");
+ }
+ return new WebResponseContent { Status = true,Message=$"{group}缁勫紑闂ㄦ垚鍔�" };
+ }
+ catch (Exception ex)
+ {
+ return new WebResponseContent { Status = false, Message = ex.Message };
+ }
+ }
+
+ public WebResponseContent ClosedDoor(string group)
+ {
+ try
+ {
+ OtherDevice otherDevice = (OtherDevice)Storage.Devices.Find(x => x.DeviceName == "PLC");
+ if (otherDevice == null) return new WebResponseContent { Status = false, Message = "鏈繛鎺�" };
+ if (group == "鐢垫皵")
+ {
+ var values = otherDevice.Communicator.Read<bool>("M28");
+ }
+ if (group == "鏈烘")
+ {
+ var values = otherDevice.Communicator.Read<bool>("M30");
+ }
+ if (group == "鍦版矡")
+ {
+ var values = otherDevice.Communicator.Read<bool>("M32");
+ var values2 = otherDevice.Communicator.Read<bool>("M34");
+ }
+ return new WebResponseContent { Status = true, Message = $"{group}缁勫叧闂ㄦ垚鍔�" };
+
+ }
+ catch (Exception ex)
+ {
+ return new WebResponseContent { Status = false, Message = ex.Message };
+ }
+ }
}
}
--
Gitblit v1.9.3