From c2673fe083b204eabe7a4e6978f8ca5331026381 Mon Sep 17 00:00:00 2001 From: CaesarBao <445720029@qq.com> Date: Fri, 6 Sep 2024 11:08:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SlnMesnac.Business/SlnMesnac.Business.csproj | 3 +- .../base/BaseTaskInfoBusiness.cs | 35 +++++ .../Templates/Service/IServiceCreate.cs | 2 +- SlnMesnac.Model/domain/AirportTask.cs | 123 ++++++++++++++++++ .../service/IAirportTaskService.cs | 17 +++ .../service/Impl/AirportTaskServiceImpl.cs | 67 ++++++++++ .../service/base/BaseServiceImpl.cs | 1 + .../Page/IndexPage/IndexContent.xaml | 6 +- .../IndexPage/IndexContentViewModel.cs | 36 +++-- SlnMesnac.WPF/appsettings.json | 5 + 10 files changed, 278 insertions(+), 17 deletions(-) create mode 100644 SlnMesnac.Business/base/BaseTaskInfoBusiness.cs create mode 100644 SlnMesnac.Model/domain/AirportTask.cs create mode 100644 SlnMesnac.Repository/service/IAirportTaskService.cs create mode 100644 SlnMesnac.Repository/service/Impl/AirportTaskServiceImpl.cs diff --git a/SlnMesnac.Business/SlnMesnac.Business.csproj b/SlnMesnac.Business/SlnMesnac.Business.csproj index 4e2cf5e..582b924 100644 --- a/SlnMesnac.Business/SlnMesnac.Business.csproj +++ b/SlnMesnac.Business/SlnMesnac.Business.csproj @@ -1,4 +1,4 @@ - + netstandard2.1 @@ -7,6 +7,7 @@ + diff --git a/SlnMesnac.Business/base/BaseTaskInfoBusiness.cs b/SlnMesnac.Business/base/BaseTaskInfoBusiness.cs new file mode 100644 index 0000000..605f4cb --- /dev/null +++ b/SlnMesnac.Business/base/BaseTaskInfoBusiness.cs @@ -0,0 +1,35 @@ +using Microsoft.Extensions.Logging; +using SlnMesnac.Repository.service; +using System; +using System.Collections.Generic; +using SlnMesnac.Repository; +using TouchSocket.Sockets; + +namespace SlnMesnac.Business.@base +{ + public class BaseTaskInfoBusiness + { + public Action> AirportTaskEvent; + private ILogger _logger; + + private IAirportTaskService _service; + public BaseTaskInfoBusiness(ILogger logger, IAirportTaskService service) + { + _logger = logger; + _service = service; + } + + public void GetTaskInfos() + { + try + { + List TaskInfos = _service.GetTaskInfos(); + } + catch (Exception ex) + { + + } + } + + } +} \ No newline at end of file diff --git a/SlnMesnac.Generate/Templates/Service/IServiceCreate.cs b/SlnMesnac.Generate/Templates/Service/IServiceCreate.cs index 272c376..9e6c416 100644 --- a/SlnMesnac.Generate/Templates/Service/IServiceCreate.cs +++ b/SlnMesnac.Generate/Templates/Service/IServiceCreate.cs @@ -33,7 +33,7 @@ namespace SlnMesnac.Generate.Templates.Service { public class IServiceCreate { - private static readonly string templateDir = @"E:\桌面\SlnMesnac\SlnMesnac.Generate\Templates\Service\"; + private static readonly string templateDir = @"F:\Mesnac\2023部门项目\机场AGV调度\HightWay_AirPot_WCS\SlnMesnac.Generate\Templates\Service\"; public bool Create(string tableName, string NameSpace, string outdir) { diff --git a/SlnMesnac.Model/domain/AirportTask.cs b/SlnMesnac.Model/domain/AirportTask.cs new file mode 100644 index 0000000..1574354 --- /dev/null +++ b/SlnMesnac.Model/domain/AirportTask.cs @@ -0,0 +1,123 @@ +using System; +using System.Linq; +using System.Text; +using SqlSugar; + +namespace SlnMesnac.Repository +{ + /// + /// + /// + [SugarTable("AirportTask")] + public partial class AirportTask + { + public AirportTask(){ + + + } + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(IsPrimaryKey=true,IsIdentity=true,ColumnName="ID")] + public int id {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(ColumnName="TaskNo")] + public string taskno {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + [SugarColumn(ColumnName="ConveyorNo")] + public string conveyorno {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + [SugarColumn(ColumnName="FlightNo")] + public string flightno {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + [SugarColumn(ColumnName="ManipulatorNo")] + public string manipulatorno {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + [SugarColumn(ColumnName="ManipulatorAGVIsArrive")] + public string manipulatoragvisarrive {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + [SugarColumn(ColumnName="AGVNo")] + public string agvno {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + [SugarColumn(ColumnName="AGVIsArrive")] + public string agvisarrive {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + [SugarColumn(ColumnName="TotalCount")] + public int? totalcount {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + [SugarColumn(ColumnName="LoadCount")] + public int? loadcount {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + [SugarColumn(ColumnName="TaskState")] + public string taskstate {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + [SugarColumn(ColumnName="StartTime")] + public DateTime? starttime {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + [SugarColumn(ColumnName="FinishTime")] + public DateTime? finishtime {get;set;} + + } +} diff --git a/SlnMesnac.Repository/service/IAirportTaskService.cs b/SlnMesnac.Repository/service/IAirportTaskService.cs new file mode 100644 index 0000000..d2a7974 --- /dev/null +++ b/SlnMesnac.Repository/service/IAirportTaskService.cs @@ -0,0 +1,17 @@ +using SlnMesnac.Model.domain; +using SlnMesnac.Repository.service.@base; +using System; +using System.Collections.Generic; +using System.Text; + +namespace SlnMesnac.Repository.service +{ + public interface IAirportTaskService : IBaseService + { + /// + /// ȡб + /// + /// + List GetTaskInfos(); + } +} \ No newline at end of file diff --git a/SlnMesnac.Repository/service/Impl/AirportTaskServiceImpl.cs b/SlnMesnac.Repository/service/Impl/AirportTaskServiceImpl.cs new file mode 100644 index 0000000..c1a9979 --- /dev/null +++ b/SlnMesnac.Repository/service/Impl/AirportTaskServiceImpl.cs @@ -0,0 +1,67 @@ +using Microsoft.Extensions.Logging; +using SlnMesnac.Model.domain; +using SlnMesnac.Common; +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Text; +using SlnMesnac.Repository.service.@base; + +#region << 版 本 注 释 >> +/*-------------------------------------------------------------------- +* 版权所有 (c) 2024 WenJY 保留所有权利。 +* CLR版本：4.0.30319.42000 +* 机器名称：LAPTOP-E0N2L34V +* 命名空间：SlnMesnac.Repository.service.Impl +* 唯一标识：496f8d2b-70e3-4a05-ae18-a9b0fcd06b82 +* +* 创建者：WenJY +* 电子邮箱：wenjy@mesnac.com +* 创建时间：2024-03-27 21:58:35 +* 版本：V1.0.0 +* 描述： +* +*-------------------------------------------------------------------- +* 修改人： +* 时间： +* 修改说明： +* +* 版本：V1.0.0 +*--------------------------------------------------------------------*/ +#endregion << 版 本 注 释 >> +namespace SlnMesnac.Repository.service.Impl +{ + public class AirportTaskServiceImpl : BaseServiceImpl, IAirportTaskService + { + private ILogger _logger; + + public AirportTaskServiceImpl(Repository repository, ILogger logger):base(repository) + { + _logger = logger; + } + + + /// + /// 获取所有的任务信息 + /// + /// + public List GetTaskInfos() + { + List taskInfos = null; + try + { + + String sql = "SELECT ConveyorNo,TaskNo ,MAX(StartTime),TaskState FROM AirportTask group by ConveyorNo "; + taskInfos = base._rep.AsTenant().GetConnection("AGV").Ado.SqlQuery(sql); + } + catch (Exception ex) + { + _logger.LogError($"获取任务信息异常:{ex.Message}"); + } + return taskInfos; + } + + + } +} + diff --git a/SlnMesnac.Repository/service/base/BaseServiceImpl.cs b/SlnMesnac.Repository/service/base/BaseServiceImpl.cs index 2227110..a8d6a54 100644 --- a/SlnMesnac.Repository/service/base/BaseServiceImpl.cs +++ b/SlnMesnac.Repository/service/base/BaseServiceImpl.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Linq.Expressions; using System.Text; +using System.Threading.Tasks; #region << 版 本 注 释 >> /*-------------------------------------------------------------------- diff --git a/SlnMesnac.WPF/Page/IndexPage/IndexContent.xaml b/SlnMesnac.WPF/Page/IndexPage/IndexContent.xaml index 9ac7998..f1f76da 100644 --- a/SlnMesnac.WPF/Page/IndexPage/IndexContent.xaml +++ b/SlnMesnac.WPF/Page/IndexPage/IndexContent.xaml @@ -12,9 +12,9 @@ - - - + + +