From c944d37fcf25d9c217949a171fde868078049f02 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 20 五月 2025 16:32:09 +0800
Subject: [PATCH] 修改设置检修权限接口
---
project/后台管理/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs | 84 ++++++++++++++----------------------------
1 files changed, 28 insertions(+), 56 deletions(-)
diff --git "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs" "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs"
index 3f6b351..8f64b67 100644
--- "a/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs"
+++ "b/project/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs"
@@ -107,61 +107,6 @@
-
-
- /// <summary>
- /// 鎵嬪姩鎺у埗锛屼几缂╂潌鐨勭缉鍥炲拰浼稿嚭閫熷害
- /// </summary>
- /// <param name="position">浼哥缉鏉嗙殑浣嶇疆锛堝乏鍙筹級</param>
- /// <param name="ExtendedState">浼�/缂╃姸鎬�</param>
- /// <returns></returns>
- ///
- //public WebResponseContent ManualOperation(string position, string ExtendedState)
- //{
- // try
- // {
- // //淇╀釜plc宸﹀彸鍚勪竴涓�
- // OtherDevice liftotherDevice = (OtherDevice)Storage.Devices.Find(x => x.DeviceCode == "SSG001");
- // OtherDevice rightotherDevice = (OtherDevice)Storage.Devices.Find(x => x.DeviceCode == "SSG002");
- // //鎵惧埌Dt_Parameters涓殑鏈�鏂颁竴鏉℃暟鎹�
- // var para = BaseDal.QueryData().OrderBy(x => x.CreateDate).FirstOrDefault();
- // int ext = (int)para.ManualExtend;//鑷姩浼稿嚭閫熷害
- // int ret = (int)para.ManualRetraction;//鑷姩缂╁洖閫熷害
- // if (position == "宸�" && ExtendedState == "浼稿嚭")
- // {
- // var values = liftotherDevice.Communicator.Write<int>("D500", ext);//閫熷害
- // var button = liftotherDevice.Communicator.Write<bool>("M100", true);//浼稿嚭鎸夐挳
- // Console.WriteLine($"{position}浼哥缉鏉嗕几鍑簕ext}");
- // }
- // if (position == "宸�" && ExtendedState == "缂╁洖")
- // {
- // var values = liftotherDevice.Communicator.Write<int>("D501", ret);
- //var button = liftotherDevice.Communicator.Write<bool>("M101", true);//缂╁洖鎸夐挳
- //Console.WriteLine($"{position}浼哥缉鏉嗙缉鍥瀧ret}");
- // }
- // if (position == "鍙�" && ExtendedState == "浼稿嚭")
- // {
- // var values = rightotherDevice.Communicator.Write<int>("D500", ext);//閫熷害
- // var button = rightotherDevice.Communicator.Write<bool>("M100", true);//浼稿嚭鎸夐挳
- // Console.WriteLine($"{position}浼哥缉鏉嗕几鍑簕ext}");
- // }
- // if (position == "鍙�" && ExtendedState == "缂╁洖")
- // {
- // var values = rightotherDevice.Communicator.Write<int>("D501", ret);
- // var button = rightotherDevice.Communicator.Write<bool>("M101", true);//缂╁洖鎸夐挳
- // Console.WriteLine($"{position}浼哥缉鏉嗙缉鍥瀧ret}");
- // }
- // return new WebResponseContent { Status = true, Message = "鎴愬姛" };
- // }
- // catch (Exception ex)
- // {
- // return new WebResponseContent { Status = false, Message = ex.Message };
-
- // }
- //}
-
-
-
/// <summary>
/// 鎵嬪姩鎺у埗锛屼几缂╂潌鐨勭缉鍥炲拰浼稿嚭閫熷害
/// </summary>
@@ -256,6 +201,33 @@
/// <summary>
+ /// 浼哥缉鏉嗗綋鍓嶄綅缃�
+ /// <param name="deptid">杞ㄩ亾绔欏彿</param>
+ public WebResponseContent CurrentLocation(int deptid)
+ {
+ try
+ {
+ var devices = GetDevicesByDeptId(deptid);
+ if (devices == null)
+ return new WebResponseContent { Status = false, Message = "璁惧鏈壘鍒�" };
+ var deviceslift = devices.Value.left.Communicator.Read<float>("D80");
+ var devicesright = devices.Value.right.Communicator.Read<float>("D80");
+ Console.WriteLine($"褰撳墠宸﹀彸浼哥缉鏉嗚繑鍥為�熷害鍒嗗埆涓轰负{deviceslift}");
+ return new WebResponseContent
+ {
+ Status = true,
+ Data = new { lift = deviceslift, Right = devicesright }
+ };
+ }
+ catch (Exception ex)
+ {
+
+ return new WebResponseContent { Status=false,Message=ex.Message};
+ }
+ }
+
+
+ /// <summary>
/// 鑾峰彇璁惧鍙�
/// </summary>
/// <param name="deptId"></param>
@@ -276,7 +248,7 @@
return (left, right);
}
-
+
}
}
--
Gitblit v1.9.3