From bdc88e08328c360c2bddeedde744d858a7fd7e3d Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 15 五月 2025 13:51:44 +0800
Subject: [PATCH] 修改信号/伸缩杆速度
---
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs | 147 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 126 insertions(+), 21 deletions(-)
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs
index 45cd188..6358dba 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs
@@ -10,6 +10,7 @@
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Core.Helper;
+using WIDESEAWCS_DTO.Telescopic;
using WIDESEAWCS_ITelescopicService;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
@@ -50,23 +51,23 @@
if (para == null)
return new WebResponseContent { Status = false, Message = "鏈壘鍒板弬鏁伴厤缃�" };
- int ext = (int)para.ExtendSpeed;
- int ret = (int)para.RetractionSpeed;
+ int ext = (int)para.ExtendSpeed;//宸LC鑷姩浼稿嚭缂╁洖閫熷害
+ int ret = (int)para.RetractionSpeed;//鍙砅LC鑷姩浼稿嚭缂╁洖閫熷害
if (ExtendedState == "浼稿嚭")
{
- devices.Value.left.Communicator.Write<int>("D500", ext);//浼稿嚭閫熷害
- devices.Value.left.Communicator.Write<bool>("M100", true);//浼稿嚭鎸夐挳
- devices.Value.right.Communicator.Write<int>("D500", ext);//浼稿嚭閫熷害
- devices.Value.right.Communicator.Write<bool>("M100", true);//浼稿嚭鎸夐挳
+ devices.Value.left.Communicator.Write<int>("D1001", ext);//宸LC鑷姩浼稿嚭缂╁洖閫熷害
+ devices.Value.left.Communicator.Write<bool>("M102", true);//浼稿嚭鎸夐挳
+ devices.Value.right.Communicator.Write<int>("D1001", ret);//鍙砅LC鑷姩浼稿嚭缂╁洖閫熷害
+ devices.Value.right.Communicator.Write<bool>("M102", true);//浼稿嚭鎸夐挳
Console.WriteLine($"鑷姩浼哥缉鏉嗕几鍑� {ext}");
}
else if (ExtendedState == "缂╁洖")
{
- devices.Value.left.Communicator.Write<int>("D501", ext);//浼稿嚭閫熷害
- devices.Value.left.Communicator.Write<bool>("M101", true);//浼稿嚭鎸夐挳
- devices.Value.right.Communicator.Write<int>("D501", ext);//浼稿嚭閫熷害
- devices.Value.right.Communicator.Write<bool>("M101", true);//浼稿嚭鎸夐挳
+ devices.Value.left.Communicator.Write<int>("D1001", ext);//宸LC鑷姩浼稿嚭缂╁洖閫熷害
+ devices.Value.left.Communicator.Write<bool>("M103", true);//缂╁洖鎸夐挳
+ devices.Value.right.Communicator.Write<int>("D1001", ret);//鍙砅LC鑷姩浼稿嚭缂╁洖閫熷害
+ devices.Value.right.Communicator.Write<bool>("M103", true);//缂╁洖鎸夐挳
Console.WriteLine($"鑷姩浼哥缉鏉嗙缉鍥� {ret}");
}
else
@@ -74,7 +75,13 @@
return new WebResponseContent { Status = false, Message = "鏈煡鐨勬搷浣滃懡浠�" };
}
- return new WebResponseContent { Status = true, Message = "鎴愬姛" };
+ return new WebResponseContent { Status = true, Message = "鎴愬姛",
+ Data = new
+ {
+ ExtendSpeed = ext,//
+ RetractionSpeed = ret
+ }
+ };
}
catch (Exception ex)
{
@@ -106,42 +113,116 @@
//淇╀釜plc宸﹀彸鍚勪竴涓�
//OtherDevice liftotherDevice = (OtherDevice)Storage.Devices.Find(x => x.DeviceCode == "SSG001");
//OtherDevice rightotherDevice = (OtherDevice)Storage.Devices.Find(x => x.DeviceCode == "SSG002");
+
//鎵惧埌Dt_Parameters涓殑鏈�鏂颁竴鏉℃暟鎹牴鎹綋鍓嶇殑deid
var para = BaseDal.QueryData().Where(x => x.Deptid == deid).OrderByDescending(x => x.CreateDate).FirstOrDefault();
- int ext = (int)para.ManualExtend;//鎵嬪姩浼稿嚭閫熷害
- int ret = (int)para.ManualRetraction;//鎵嬪姩缂╁洖閫熷害
+ int ext = (int)para.ManualExtend;//宸LC鎵嬪姩浼稿嚭缂╁洖閫熷害
+ int ret = (int)para.ManualRetraction;//鍙砅LC鎵嬪姩浼稿嚭缂╁洖閫熷害
if (position == "宸�" && ExtendedState == "浼稿嚭")
{
- devices.Value.left.Communicator.Write<int>("D500", ext);//浼稿嚭閫熷害
+ devices.Value.left.Communicator.Write<int>("D1000", ext);//宸LC鎵嬪姩浼稿嚭缂╁洖閫熷害
devices.Value.left.Communicator.Write<bool>("M100", true);//浼稿嚭鎸夐挳
- Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄤ几鍑簕ext}");
+ Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄤ几鍑虹缉鍥瀧ext}");
}
else if (position == "宸�" && ExtendedState == "缂╁洖")
{
- devices.Value.left.Communicator.Write<int>("D501", ret);//缂╁洖閫熷害
+ devices.Value.left.Communicator.Write<int>("D1000", ext);//宸LC鎵嬪姩浼稿嚭缂╁洖閫熷害
devices.Value.left.Communicator.Write<bool>("M101", true);
- Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄧ缉鍥瀧ret}");
+
+ Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄤ几鍑虹缉鍥瀧ext}");
}
else if (position == "鍙�" && ExtendedState == "浼稿嚭")
{
- devices.Value.right.Communicator.Write<int>("D500", ext);
+ devices.Value.right.Communicator.Write<int>("D1000", ret);//鍙砅LC鎵嬪姩浼稿嚭缂╁洖閫熷害
devices.Value.right.Communicator.Write<bool>("M100", true);
- Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄤ几鍑簕ext}");
+ Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄤ几鍑簕ret}");
}
else if (position == "鍙�" && ExtendedState == "缂╁洖")
{
- devices.Value.right.Communicator.Write<int>("D501", ret);
+ devices.Value.right.Communicator.Write<int>("D1000", ret);//鍙砅LC鎵嬪姩浼稿嚭缂╁洖閫熷害
devices.Value.right.Communicator.Write<bool>("M101", true);
Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄧ缉鍥瀧ret}");
}
- return new WebResponseContent { Status = true, Message = "鎴愬姛" };
+ return new WebResponseContent { Status = true,
+ Message = "鎴愬姛" ,
+ Data = new
+ {
+ ManualExtend = ext,
+ ManualRetraction = ret
+ }
+ };//杩欓噷瑕佸姞杩斿洖閫熷害
}
catch (Exception ex)
{
return new WebResponseContent { Status = false, Message = ex.Message };
}
+
}
+
+
+ /// <summary>
+ /// 鏍规嵁鐢ㄦ埛娣诲姞閫熷害
+ /// </summary>
+ /// <param name="entity"></param>
+ /// <returns></returns>
+ public WebResponseContent AddSpeed(SpeedDTO entity)
+ {
+ try
+ {
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+ var user = _user.QueryData(x => x.UserName == entity.account).FirstOrDefault();
+ // 鍒ゆ柇锛氬鏋滀笉鏄鐞嗗憳 && Dept_Id 涓虹┖锛屽垯鎻愮ず閿欒
+ if (user.UserName != "admin" && user.Dept_Id == null)
+ {
+ return new WebResponseContent { Status = false, Message = "浣犵殑璐﹀彿娌℃湁璁剧疆杞ㄩ亾绔欏彿锛屾棤娉曟坊鍔狅紝璇疯仈绯荤鐞嗗憳" };
+ }
+
+ var dept = user.Dept_Id;
+
+ // 鑾峰彇閰嶇疆鏂囦欢涓殑 DepartmentID锛堢鐞嗗憳涓撶敤锛�
+ if (!int.TryParse(AppSettings.Get("DepartmentID"), out int deid))
+ {
+ return new WebResponseContent
+ {
+ Status = false,
+ Message = "閰嶇疆椤� DepartmentID 鏃犳硶杞崲涓烘暣鏁�"
+ };
+ }
+
+
+ // 鍒ゆ柇鏄惁涓虹鐞嗗憳璐﹀彿
+ bool isAdmin = user?.UserName?.Equals("admin") == true; //濡傛灉褰撳墠鐢ㄦ埛涓嶄负绌猴紝涓旂敤鎴峰悕鏄� "admin"锛屽氨璁や负杩欎釜鐢ㄦ埛鏄鐞嗗憳
+
+ // 鏍规嵁鏄惁鏄鐞嗗憳鍐冲畾浣跨敤鍝釜 Deptid
+ var parmet = new Dt_Parameters
+ {
+ ExtendSpeed = entity.ExtendSpeed,
+ RetractionSpeed = entity.RetractionSpeed,
+ ManualExtend = entity.ManualExtend,
+ ManualRetraction = entity.ManualRetraction,
+ Deptid = isAdmin ? deid : dept.GetValueOrDefault()//濡傛灉褰撳墠鐢ㄦ埛鏄鐞嗗憳锛屽氨鐢ㄩ厤缃枃浠朵腑鐨� DepartmentID锛屽惁鍒欑敤浼犲叆鐨� entity 鍙傛暟涓殑 Deptid
+ };
+ // 娣诲姞鏁版嵁
+ AddData(parmet);
+
+
+ return new WebResponseContent
+ {
+ Status = true,
+ Message = "娣诲姞鎴愬姛",
+ Data = parmet
+ };
+ }
+ catch (Exception ex)
+ {
+
+ return new WebResponseContent { Status = false, Message = ex.Message };
+ }
+ }
+
+
+
/// <summary>
@@ -165,6 +246,30 @@
return (left, right);
}
+
+
+ public WebResponseContent BackfillSpeed()
+ {
+ try
+ {
+ if (!int.TryParse(AppSettings.Get("DepartmentID"), out int deid))
+ {
+ return new WebResponseContent { Status = false, Message = "閰嶇疆椤� DepartmentID 鏃犳硶杞崲涓烘暣鏁�" };
+
+ }
+ var para = BaseDal.QueryData().Where(x => x.Deptid == deid).OrderByDescending(x => x.CreateDate).FirstOrDefault();
+ if (para==null)
+ {
+ return new WebResponseContent { Message = "浣犺繕娌℃湁閰嶇疆閫熷害" };
+ }
+ return new WebResponseContent { Status = true, Data = para };
+ }
+ catch (Exception ex)
+ {
+
+ return new WebResponseContent { Status = false, Message = ex.Message };
+ }
+ }
}
}
--
Gitblit v1.9.3