From 9250e3e48760f91fbefef03331fc7b14b4b1be18 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 07 六月 2025 13:09:59 +0800
Subject: [PATCH] 修改数字大屏接口
---
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs | 286 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 153 insertions(+), 133 deletions(-)
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs
index 2c2b8d6..0454faa 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs
@@ -23,11 +23,13 @@
public IRepository<Dt_Maintenance> Repository => BaseDal;
public readonly IRepository<Dt_MaintenanceTeam> _team;
private readonly IRepository<Sys_User> _user;
+
public MaintenanceService(IRepository<Dt_Maintenance> BaseDal, IRepository<Sys_User> user, IRepository<Dt_MaintenanceTeam> team) : base(BaseDal)
{
_user = user;
- _team = team;
+ _team = team;
+
}
@@ -109,7 +111,7 @@
/// <summary>
- /// 浜哄憳鐩戞帶
+ /// 浜哄憳鐩戞帶锛堟暟瀛楀ぇ灞忥級
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
@@ -119,32 +121,12 @@
{
try
{
- // 绗竴姝ワ細鑷姩娓呯悊杩囨湡妫�淇姸鎬�
- var today = DateTime.Today;
- var recordsToUpdate = Db.Queryable<Dt_Maintenance>()
- .Where(b => b.MaintenanceDate != null &&
- b.MaintenanceDate.Value.Date < today )
- .ToList();
-
- if (recordsToUpdate.Count > 0)
- {
- foreach (var record in recordsToUpdate)//鏇存柊
- {
- record.MaintenanceDate = null;//娓呯┖妫�淇棩鏈�
- record.MaintenancStartTime = null;//娓呯┖寮�濮嬫椂闂�
- record.MaintenancEendTime = null;//娓呯┖缁撴潫鏃堕棿
- record.MaintenanceStatus = 0; // Set to false
- record.IsPossible = "NULL"; //鏇存敼鐘舵�佷负false涓嶈繍琛屾淇�//榛樿涓篘ULL
- }
- Db.Updateable(recordsToUpdate).ExecuteCommand();
- }
-
int totalCount = 0;
var sys = _user.Db.Queryable<Sys_User>();
- var main = Db.Queryable<Dt_Maintenance>();
+
var query = sys.InnerJoin<Dt_Maintenance>((a, b) => a.UserName == b.UserAccount)
- .Where((a, b) => b.IsPossible == "true"); // 灞曠ず杩愯妫�淇殑
+ .Where((a, b) => b.MaintenanceStatus==1); // 灞曠ず杩愯妫�淇殑
// 鎼滅储鍏抽敭瀛�
if (!string.IsNullOrEmpty(pagination.searchKeyword))
@@ -154,37 +136,21 @@
a.Userteam.Contains(pagination.searchKeyword));
}
- // 鐘舵�佸弬鏁�
- if (pagination.status.HasValue)
- {
- query = query.Where((a, b) => b.MaintenanceStatus == pagination.status.Value);
- }
-
- // 濡傛灉涓嶆槸绠＄悊鍛橈紝璇锋寜閮ㄩ棬杩囨护
- if (pagination.account != "admin")
- {
- var currentUser = _user.Db.Queryable<Sys_User>()
- .Where(u => u.UserName == pagination.account)
- .First();
-
- if (currentUser == null)
- {
- return new WebResponseContent { Status = false, Data = "鏈幏鍙栧埌鐢ㄦ埛淇℃伅" };
- }
-
- int? deptId = currentUser.Dept_Id;
- query = query.Where((a, b) => a.Dept_Id == deptId);
- }
+ //// 鐘舵�佸弬鏁�
+ //if (pagination.status.HasValue) //澶氫紶涓�涓姸鎬�
+ //{
+ // query = query.Where((a, b) => b.MaintenanceStatus == pagination.status.Value);
+ //}
var result = query
.Select((a, b) => new
{
a.UserTrueName,
- a.Userteam,
- a.HeadImageUrl,
- b.MaintenanceStatus,
- b.MaintenanceDate,
- b.IsPossible,
+ a.Userteam,//鐝粍
+ a.Unit,//鍗曚綅
+ b.MaintenanceStatus,//妫�淇姸鎬�
+ b.CreateDate,//鏃ユ湡
+ b.MaintenancStartTime,//寮�濮嬫椂闂�
})
.ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);
@@ -351,23 +317,7 @@
query=query.OrderByDescending((a, b) => b.Creater);
}
- // 濡傛灉涓嶆槸绠＄悊鍛橈紝鏍规嵁閮ㄩ棬杩囨护
- if (pagination.account != "admin")
- {
- var currentUser = _user.Db.Queryable<Sys_User>()
- .Where(u => u.UserName == pagination.account)
- .First();
-
- if (currentUser == null)
- {
- return new WebResponseContent { Status = false, Data = "鏈幏鍙栧埌鐢ㄦ埛淇℃伅" };
- }
-
- int? deptId = currentUser.Dept_Id;
-
- query = query.Where((a, b) => a.Dept_Id == deptId);
- }
-
+
//杩斿洖缁撴灉
var result = query.Select((a, b) => new
{
@@ -487,35 +437,52 @@
//}
+
+
+
///// <summary>
///// 寮�濮嬫淇�
///// </summary>
- ///// <param name="account"></param>
- ///// <returns></returns>(鐝暱-鏅�氬憳宸�)
- //public WebResponseContent StartMaintenceTask(string account)
+ ///// <param name="account">璐﹀彿</param>
+ ///// <param name="LocalIP">閭ｅ彴鐢佃剳鐧诲叆鐨刬p鍦板潃</param>
+ ///// <returns></returns>
+ //public WebResponseContent StartMaintenceTask(string account,string LocalIP)
//{
// try
// {
- // var today = DateTime.Today; // 浠婂ぉ鐨勯浂鐐�
- // var tomorrow = today.AddDays(1); // 鏄庡ぉ鐨勯浂鐐�
-
-
- // var maint = BaseDal.QueryData(x =>
- // x.UserAccount == account &&
- // x.IsPossible == "true" &&
- // x.MaintenanceDate >= today &&
- // x.MaintenanceDate < tomorrow
- // ).FirstOrDefault();
-
- // if (maint == null)
+ // var user = BaseDal.QueryData();
+ // var maint = user.Where(x =>x.UserAccount == account).FirstOrDefault();
+ // var sysuer = _user.QueryData(x => x.UserName == account).FirstOrDefault();//鐢ㄦ埛琛�
+ // if (maint == null || sysuer == null)
// {
- // return new WebResponseContent { Status = false, Message = "鏈壘鍒颁粖鏃ョ殑缁存姢浠诲姟璁板綍" };
+ // return new WebResponseContent { Status = false, Message = "娌℃湁鎵惧埌璇ョ敤鎴�" };
// }
+ // if (maint.IsLeader!=1)//濡傛灉璇ョ敤鎴蜂笉鏄彮闀匡紝閭ｄ箞瑕佺瓑鐝暱鍏堝仛锛屼粬鎵嶅彲浠ュ仛
+ // {
+ // bool leaderStarted = user.Any(x =>x.Roleid == maint.Roleid &&x.IsLeader == 1 &&x.MaintenanceStatus == 1); //娌℃壘鍒拌偗瀹氭槸false
+ // if (!leaderStarted)
+ // {
+ // return new WebResponseContent { Status = false, Message = "璇风瓑寰呯粍闀垮紑濮嬫淇�" };
+ // }
- // maint.MaintenancStartTime = DateTime.Now;
+ // }
+ // //濡傛灉婊¤冻涓嬮潰鐨勬潯浠跺氨寮�濮�
+ // maint.MaintenancStartTime = DateTime.Now;//璁板綍寮�濮嬫椂闂�
+ // maint.MaintenanceStatus = 1;//鏇存敼鐘舵��
// BaseDal.UpdateData(maint);
+ // //鎻掑叆璁板綍琛�
+ // var recording = new Dt_MaintenanceTeam //娣诲姞璁板綍
+ // {
+ // OperatorName = sysuer.UserTrueName,
+ // TeamName = sysuer.RoleName,
+ // DistributionTime = DateTime.Now,
+ // IPAddress= LocalIP,
+ // //Creater = "admin",
+ // //CreateDate = DateTime.Now,
+ // };
+ // _team.AddData(recording);
- // return new WebResponseContent { Status = true, Data = maint };
+ // return new WebResponseContent { Status = true, Data = maint,Message="寮�濮嬫淇�" };
// }
// catch (Exception ex)
// {
@@ -526,36 +493,52 @@
///// <summary>
///// 缁撴潫妫�淇�
- ///// </summary>
+ ///// </summary>MaintenanceStatus 0浠ｈ〃妫�淇畬鎴� 1浠ｈ〃妫�淇腑
///// <param name="account"></param>
///// <returns></returns>
//public WebResponseContent StopMaintenanceTask(string account)
//{
// try
// {
- // var today = DateTime.Today; // 浠婂ぉ鐨勯浂鐐�
- // var tomorrow = today.AddDays(1); // 鏄庡ぉ鐨勯浂鐐�
-
- // var maint = BaseDal.QueryData(x => x.UserAccount == account && x.IsPossible == "true"
- // && x.MaintenanceDate >= today &&x.MaintenanceDate < tomorrow).FirstOrDefault();
- // if (maint == null)
+ // var user = BaseDal.QueryData();//妫�淇〃
+ // var maint = user.Where(x => x.UserAccount == account).FirstOrDefault();
+ // var sysuer = _user.QueryData(x => x.UserName == account).FirstOrDefault();//鐢ㄦ埛琛�
+ // if (maint == null || sysuer == null)
// {
- // return new WebResponseContent { Status = false, Message = "鏈壘鍒板彲鐢ㄧ殑缁存姢浠诲姟璁板綍" };
+ // return new WebResponseContent { Status = false, Message = "娌℃湁鎵惧埌璇ョ敤鎴�" };
// }
- // // 淇敼鍏剁粨鏉熸椂闂�
- // maint.MaintenancEendTime = DateTime.Now;
- // maint.IsPossible = "ok";//ok灏变唬琛ㄥ畬鎴愪簡
+ // if (maint.IsLeader == 1)//濡傛灉璇ョ敤鎴锋槸鐝暱锛岄偅涔堣绛夊叏閮ㄤ汉閮芥淇畬鎴愶紝浠栨墠鍙互缁撴潫妫�淇�
+ // {
+ // //鍏堟煡鎵炬墍鏈夌敤鎴风殑缁勬槸閭ｄ釜缁勭殑锛岀粍鍛樼姸鎬佹湁涓�涓笉鏄�1
+ // // 鏌ユ壘鍚岀粍鏈畬鎴愮殑缁勫憳锛圛sLeader=0 && MaintenanceStatus=1锛�
+ // bool hasUnfinishedMembers = user.Any(x =>x.Roleid == maint.Roleid && x.IsLeader == 0 &&
+ // x.MaintenanceStatus == 1); //锛欰ny()鏈変竴涓弧瓒冲氨杩斿洖true琛ㄧず瀛樺湪婊¤冻鏉′欢鐨勮褰�
+ // if (hasUnfinishedMembers)
+ // {
+ // return new WebResponseContent { Status = false, Message = "杩樻湁缁勫憳鏈畬鎴愬綋鍓嶆壒娆℃淇�" };
+ // }
+ // }
+ // //濡傛灉婊¤冻涓嬮潰鐨勬潯浠跺氨寮�濮�
+ // maint.MaintenancEendTime = DateTime.Now;//璁板綍缁撴潫鏃堕棿
+ // maint.MaintenanceStatus = 0;//鏇存敼鐘舵��
// BaseDal.UpdateData(maint);
- // return new WebResponseContent { Status = true, Data = maint };
+ // ////鎻掑叆璁板綍琛�
+ // //var recording = new Dt_MaintenanceTeam //娣诲姞璁板綍
+ // //{
+ // // OperatorName = sysuer.UserTrueName,
+ // // TeamName = sysuer.RoleName,
+ // // DistributionTime = DateTime.Now,
+ // // EndTime=DateTime.Now,
+ // //};
+ // //_team.AddData(recording);
+ // return new WebResponseContent { Status = true, Data = maint, Message = "瀹屾垚妫�淇�" };
// }
// catch (Exception ex)
// {
-
// return new WebResponseContent { Status = false, Message = "閿欒淇℃伅锛�" + ex.Message };
// }
//}
-
/// <summary>
@@ -564,49 +547,58 @@
/// <param name="account">璐﹀彿</param>
/// <param name="LocalIP">閭ｅ彴鐢佃剳鐧诲叆鐨刬p鍦板潃</param>
/// <returns></returns>
- public WebResponseContent StartMaintenceTask(string account,string LocalIP)
+ public WebResponseContent StartMaintenceTask(string account, string LocalIP)
{
try
{
- var user = BaseDal.QueryData();
- var maint = user.Where(x =>x.UserAccount == account).FirstOrDefault();
- var sysuer = _user.QueryData(x => x.UserName == account).FirstOrDefault();//鐢ㄦ埛琛�
+ var user = BaseDal.QueryData();//妫�淇〃
+ var maint = user.Where(x => x.UserAccount == account).FirstOrDefault(); //鍦ㄦ淇〃涓厛鎵惧埌璇ョ敤鎴�
+ var sysuer = _user.QueryData(x => x.UserName == account).FirstOrDefault();//鍦ㄧ敤鎴疯〃涓壘鍒扮敤鎴�
if (maint == null || sysuer == null)
{
return new WebResponseContent { Status = false, Message = "娌℃湁鎵惧埌璇ョ敤鎴�" };
}
- if (maint.IsLeader!=1)//濡傛灉璇ョ敤鎴蜂笉鏄彮闀匡紝閭ｄ箞瑕佺瓑鐝暱鍏堝仛锛屼粬鎵嶅彲浠ュ仛
+ // 鏌ユ壘璇ョ敤鎴峰湪 _team 琛ㄤ腑鐨勬渶鏂颁竴鏉¤褰�
+ var lastRecord = _team.QueryData(x => x.Account == account)
+ .OrderByDescending(x => x.CreateDate)
+ .FirstOrDefault();
+
+ if (lastRecord != null && lastRecord.MaintenanceStatus == 1)
{
- //鍏堟煡鎵剧敤鎴风殑鐝暱鏄笉鏄仛浜�
- //bool monitor = user.Where(x => x.Roleid == maint.Roleid && x.IsLeader == 1 && x.MaintenanceStatus == 1);
- //if (monitor==null)
- //{
- // return new WebResponseContent { Status = false, Message = "浣犵殑涓婄骇杩樻病鏈夊紑濮嬫淇紝璇风◢鍚庡啀璇�" };
- //}
- bool leaderStarted = user.Any(x =>x.Roleid == maint.Roleid &&x.IsLeader == 1 &&x.MaintenanceStatus == 1); //娌℃壘鍒拌偗瀹氭槸false
+ return new WebResponseContent { Status = false, Message = "浣犲凡缁忓湪寮�濮嬫淇簡锛岃涓嶈閲嶅鐐瑰嚮" };
+ }
+
+ //鍏堣鎵惧埌璇ョ敤鎴峰睘浜庨偅涓鑹茬殑锛岃繖涓鑹蹭腑灞炰簬閭ｄ釜浠�涔堢被鍨嬶紙缁勯暱/缁勫憳锛�
+ if (maint.IsLeader != 1)//濡傛灉璇ョ敤鎴蜂笉鏄彮闀匡紝閭ｄ箞瑕佺瓑鐝暱鍏堝仛锛屼粬鎵嶅彲浠ュ仛
+ {
+ bool leaderStarted = user.Any(x => x.IsLeader == 1 && x.MaintenanceStatus == 1); //鍚︽湁婊¤冻鏉′欢 鎵惧埌涓�鏉″氨杩斿洖true MaintenanceStatus锛�0娌℃湁寮�濮嬶紝1寮�濮嬶級
if (!leaderStarted)
{
return new WebResponseContent { Status = false, Message = "璇风瓑寰呯粍闀垮紑濮嬫淇�" };
}
}
- //濡傛灉婊¤冻涓嬮潰鐨勬潯浠跺氨寮�濮�
+ if (true)
+ {
+
+ }
+ //濡傛灉婊¤冻涓嬮潰鐨勬潯浠跺氨寮�濮�
maint.MaintenancStartTime = DateTime.Now;//璁板綍寮�濮嬫椂闂�
maint.MaintenanceStatus = 1;//鏇存敼鐘舵��
BaseDal.UpdateData(maint);
//鎻掑叆璁板綍琛�
var recording = new Dt_MaintenanceTeam //娣诲姞璁板綍
{
+ Account = account,
+ MaintenanceStatus=1,
OperatorName = sysuer.UserTrueName,
TeamName = sysuer.RoleName,
DistributionTime = DateTime.Now,
- IPAddress= LocalIP,
- //Creater = "admin",
- //CreateDate = DateTime.Now,
+ IPAddress = LocalIP,
};
_team.AddData(recording);
- return new WebResponseContent { Status = true, Data = maint,Message="寮�濮嬫淇�" };
+ return new WebResponseContent { Status = true, Data = maint, Message = "寮�濮嬫淇�" };
}
catch (Exception ex)
{
@@ -631,18 +623,23 @@
{
return new WebResponseContent { Status = false, Message = "娌℃湁鎵惧埌璇ョ敤鎴�" };
}
+
+ // 鏌ユ壘璇ョ敤鎴峰湪 _team 琛ㄤ腑鐨勬渶鏂颁竴鏉¤褰�
+ var lastRecord = _team.QueryData(x => x.Account == account)
+ .OrderByDescending(x => x.CreateDate)
+ .FirstOrDefault();
+
+ if (lastRecord == null || lastRecord.MaintenanceStatus != 1)
+ {
+ return new WebResponseContent { Status = false, Message = "浣犺繕娌℃湁寮�濮嬫淇紝璇峰厛鐐瑰嚮寮�濮嬫淇�" };
+ }
+
if (maint.IsLeader == 1)//濡傛灉璇ョ敤鎴锋槸鐝暱锛岄偅涔堣绛夊叏閮ㄤ汉閮芥淇畬鎴愶紝浠栨墠鍙互缁撴潫妫�淇�
{
- //鍏堟煡鎵炬墍鏈夌敤鎴风殑缁勬槸閭ｄ釜缁勭殑锛岀粍鍛樼姸鎬佹湁涓�涓笉鏄�1
- //var monitor = user.Where(x => x.Roleid == maint.Roleid && x.IsLeader == 0 && x.MaintenanceStatus == 1).ToList();
- //if (monitor.Count >0)
- //{
- // return new WebResponseContent { Status = false, Message = "浣犵殑缁勫憳杩樻病鏈夊畬鎴�" };
- //}
+ //鍏堟煡鎵炬墍鏈夌敤鎴风殑缁勬槸閭ｄ釜缁勭殑锛岀粍鍛樼姸鎬佹湁涓�涓笉鏄�1
// 鏌ユ壘鍚岀粍鏈畬鎴愮殑缁勫憳锛圛sLeader=0 && MaintenanceStatus=1锛�
- bool hasUnfinishedMembers = user.Any(x =>x.Roleid == maint.Roleid && x.IsLeader == 0 &&
- x.MaintenanceStatus == 1); //锛欰ny()鏈変竴涓弧瓒冲氨杩斿洖true琛ㄧず瀛樺湪婊¤冻鏉′欢鐨勮褰�
- if (hasUnfinishedMembers)
+ var hasUnfinishedMembers = user.Where(x =>x.IsLeader == 0 &&x.MaintenanceStatus == 1).ToList(); //锛欰ny()鏈変竴涓弧瓒冲氨杩斿洖true琛ㄧず瀛樺湪婊¤冻鏉′欢鐨勮褰�
+ if (hasUnfinishedMembers.Count>0)
{
return new WebResponseContent { Status = false, Message = "杩樻湁缁勫憳鏈畬鎴愬綋鍓嶆壒娆℃淇�" };
}
@@ -652,14 +649,15 @@
maint.MaintenanceStatus = 0;//鏇存敼鐘舵��
BaseDal.UpdateData(maint);
////鎻掑叆璁板綍琛�
- //var recording = new Dt_MaintenanceTeam //娣诲姞璁板綍
- //{
- // OperatorName = sysuer.UserTrueName,
- // TeamName = sysuer.RoleName,
- // DistributionTime = DateTime.Now,
- // EndTime=DateTime.Now,
- //};
- //_team.AddData(recording);
+ var recording = new Dt_MaintenanceTeam //娣诲姞璁板綍
+ {
+ Account = account,
+ MaintenanceStatus=0,
+ OperatorName = sysuer.UserTrueName,
+ TeamName = sysuer.RoleName,
+ EndTime = DateTime.Now,
+ };
+ _team.AddData(recording);
return new WebResponseContent { Status = true, Data = maint, Message = "瀹屾垚妫�淇�" };
}
@@ -671,6 +669,28 @@
/// <summary>
+ /// 灞曠ず寮�濮嬫淇汉鍛�
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent YShowStartTake()
+ {
+ try
+ {
+ var reslut=BaseDal.QueryData(x => x.MaintenanceStatus == 1).ToList();
+ if (reslut.Count<=0)
+ {
+ return new WebResponseContent { Status = false, Message = "杩樻病鏈変汉寮�濮嬫淇�" };
+ }
+ return new WebResponseContent { Status = true, Data = reslut,Message="妫�淇汉鍛樻湁浠ヤ笅" };
+ }
+ catch (Exception ex)
+ {
+
+ return new WebResponseContent { Status = false, Message = ex.Message };
+ }
+ }
+
+ /// <summary>
/// 鐘舵�佹灇涓�
/// </summary>
private enum Maint
--
Gitblit v1.9.3