From 675f3f475a61dd0ad8ffb76e183baa9b78f14f45 Mon Sep 17 00:00:00 2001
From: renmingwang <renmingwang@hnkhzn.com>
Date: 星期一, 30 三月 2026 16:46:31 +0800
Subject: [PATCH] 修改任务下发
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 183 +++++++++++++++++++++++++++++++--------------
1 files changed, 126 insertions(+), 57 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 4e3383f..93035d2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -831,28 +831,42 @@
public Dt_Task RequestWMSTaskMovelibrary(Dt_Task _Task)
{
WebResponseContent content = new WebResponseContent();
-
- content = HttpHelperh.Get<WebResponseContent>($"{urlWMSMovelibraryTask}?TaskNum={_Task.TaskNum}");
- Dt_Task task = new Dt_Task();
- if (content.Status)
+ try
{
- if (content.Data != null)
+ content = HttpHelperh.Get<WebResponseContent>($"{urlWMSMovelibraryTask}?TaskNum={_Task.TaskNum}");
+ Dt_Task task = new Dt_Task();
+ if (content.Status)
{
- task = JsonConvert.DeserializeObject<Dt_Task>(content.Data.ToString());
- if (task.TaskNum != _Task.TaskNum)
+ if (content.Data != null)
{
- task.Grade = 3;
- BaseDal.AddData(task);
- return task;
- }
- else
- {
- return _Task;
+ //task = JsonConvert.DeserializeObject<Dt_Task>(content.Data.ToString());
+ WMSTaskDTO dto = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());
+ if (dto != null)
+ {
+ // 杞崲涓篋t_Task
+ task = _mapper.Map<Dt_Task>(dto);
+ task.TaskState = dto.TaskStatus;
+
+ if (task.TaskNum != _Task.TaskNum)
+ {
+ task.Grade = 3;
+ BaseDal.AddData(task);
+ return task;
+ }
+ else
+ {
+ return _Task;
+ }
+ }
}
}
+ return null;
}
- return null;
-
+ catch (Exception ex)
+ {
+ Console.WriteLine($"绉诲簱鎿嶄綔寮傚父锛歿ex.Message}");
+ return null;
+ }
}
@@ -955,37 +969,71 @@
/// <returns></returns>
public WebResponseContent GetRoadwayTaskProgress(string roadway)
{
- WebResponseContent content = new WebResponseContent();
try
{
- var tasks = BaseDal.QueryData(x => x.Roadway == roadway);
+ // 1. 鍏ュ弬鏍￠獙
+ if (string.IsNullOrWhiteSpace(roadway))
+ {
+ return WebResponseContent.Instance.Error("宸烽亾缂栧彿涓嶈兘涓虹┖");
+ }
+ // 2. 涓�娆℃煡璇紝閬垮厤澶氭鏁版嵁搴�/鍐呭瓨閬嶅巻
+ List<Dt_Task> taskList = BaseDal.QueryData(x => x.Roadway == roadway).ToList();
+
+ int totalTasks = taskList.Count;
+ int inProgressTasks = 0;
+ int completedTasks = 0;
+ int cancelledTasks = 0;
+ int exceptionTasks = 0;
+
+ foreach (var task in taskList)
+ {
+ switch ((TaskStatusEnum)task.TaskState)
+ {
+ case TaskStatusEnum.Finish:
+ completedTasks++;
+ break;
+ case TaskStatusEnum.Cancel:
+ cancelledTasks++;
+ break;
+ case TaskStatusEnum.Exception:
+ exceptionTasks++;
+ break;
+ default:
+ inProgressTasks++;
+ break;
+ }
+ }
+
+ var taskDetails = taskList.Select(t => new
+ {
+ taskNum = t.TaskNum,
+ taskType = t.TaskType,
+ taskState = t.TaskState,
+ taskStateName = GetTaskStateName(t.TaskState),
+ createDate = t.CreateDate,
+ modifyDate = t.ModifyDate,
+ sourceAddress = t.SourceAddress,
+ targetAddress = t.TargetAddress
+ }).ToList();
+
+ // 5. 缁熶竴杩斿洖缁撴灉
var progressInfo = new
{
roadway = roadway,
- totalTasks = tasks.Count,
- inProgressTasks = tasks.Count(t => t.TaskState < (int)TaskStatusEnum.Finish && t.TaskState != (int)TaskStatusEnum.Cancel && t.TaskState != (int)TaskStatusEnum.Exception),
- completedTasks = tasks.Count(t => t.TaskState == (int)TaskStatusEnum.Finish),
- cancelledTasks = tasks.Count(t => t.TaskState == (int)TaskStatusEnum.Cancel),
- exceptionTasks = tasks.Count(t => t.TaskState == (int)TaskStatusEnum.Exception),
- tasks = tasks.Select(t => new
- {
- taskNum = t.TaskNum,
- taskType = t.TaskType,
- taskState = t.TaskState,
- taskStateName = GetTaskStateName(t.TaskState),
- createDate = t.CreateDate,
- modifyDate = t.ModifyDate,
- sourceAddress = t.SourceAddress,
- targetAddress = t.TargetAddress
- }).ToList()
+ totalTasks,
+ inProgressTasks,
+ completedTasks,
+ cancelledTasks,
+ exceptionTasks,
+ tasks = taskDetails
};
- content = WebResponseContent.Instance.OK(data: progressInfo);
+
+ return WebResponseContent.Instance.OK(data: progressInfo);
}
catch (Exception ex)
{
- content = WebResponseContent.Instance.Error(ex.Message);
+ return WebResponseContent.Instance.Error($"鑾峰彇宸烽亾浠诲姟杩涘害澶辫触锛歿ex.Message}");
}
- return content;
}
/// <summary>
@@ -994,34 +1042,56 @@
/// <returns></returns>
public WebResponseContent GetAllRoadwayTaskProgress()
{
- WebResponseContent content = new WebResponseContent();
try
{
- var allTasks = BaseDal.QueryData();
- var roadways = allTasks.Select(t => t.Roadway).Distinct().ToList();
- var progressList = new List<object>();
+ // 1. 涓�娆℃�ф煡璇㈡墍鏈夋暟鎹紙閬垮厤澶氭鏌ヨ锛�
+ List<Dt_Task> allTasks = BaseDal.QueryData().ToList();
- foreach (var roadway in roadways)
- {
- var roadwayTasks = allTasks.Where(t => t.Roadway == roadway).ToList();
- progressList.Add(new
+ // 2. 鎸夊贩閬撳垎缁� + 涓�娆￠亶鍘嗙粺璁℃墍鏈夌姸鎬侊紙鎬ц兘鎻愬崌宸ㄥぇ锛�
+ var progressList = allTasks
+ .GroupBy(t => t.Roadway)
+ .Select(group =>
{
- roadway = roadway,
- totalTasks = roadwayTasks.Count,
- inProgressTasks = roadwayTasks.Count(t => t.TaskState < (int)TaskStatusEnum.Finish && t.TaskState != (int)TaskStatusEnum.Cancel && t.TaskState != (int)TaskStatusEnum.Exception),
- completedTasks = roadwayTasks.Count(t => t.TaskState == (int)TaskStatusEnum.Finish),
- cancelledTasks = roadwayTasks.Count(t => t.TaskState == (int)TaskStatusEnum.Cancel),
- exceptionTasks = roadwayTasks.Count(t => t.TaskState == (int)TaskStatusEnum.Exception)
- });
- }
+ var roadway = group.Key;
+ var tasks = group.ToList();
+ var totalTasks = tasks.Count;
+ int inProgress = 0, completed = 0, cancelled = 0, exception = 0;
- content = WebResponseContent.Instance.OK(data: progressList);
+ foreach (var task in tasks)
+ {
+ switch ((TaskStatusEnum)task.TaskState)
+ {
+ case TaskStatusEnum.Finish:
+ completed++;
+ break;
+ case TaskStatusEnum.Cancel:
+ cancelled++;
+ break;
+ case TaskStatusEnum.Exception:
+ exception++;
+ break;
+ default:
+ inProgress++;
+ break;
+ }
+ }
+ return new
+ {
+ roadway = roadway,
+ totalTasks = totalTasks,
+ inProgressTasks = inProgress,
+ completedTasks = completed,
+ cancelledTasks = cancelled,
+ exceptionTasks = exception
+ };
+ })
+ .ToList();
+ return WebResponseContent.Instance.OK(data: progressList);
}
catch (Exception ex)
{
- content = WebResponseContent.Instance.Error(ex.Message);
+ return WebResponseContent.Instance.Error($"鑾峰彇宸烽亾浠诲姟杩涘害澶辫触锛歿ex.Message}");
}
- return content;
}
/// <summary>
@@ -1031,7 +1101,6 @@
/// <returns></returns>
private string GetTaskStateName(int taskState)
{
- // 鐩存帴鏍规嵁鐘舵�佸�艰繑鍥炵姸鎬佸悕绉�
switch (taskState)
{
case (int)TaskStatusEnum.New:
--
Gitblit v1.9.3