解决冲突

src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs

@@ -1,12 +1,6 @@
 using AutoMapper;
-using SJZY.Track.Application.Dtos.Demo;
 using SJZY.Track.Application.Dtos.TrackTemplates;
-using SJZY.Track.Repository.TrackTemplate.ValueObjects;
+using SJZY.Track.Domain.TrackTemplateAggregate.Dtos;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SJZY.Track.Application.AutoMapper
 {

src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs

@@ -1,33 +1,24 @@
-using SJZY.Expand.ABP.Core.Common.Dto;
+using SJZY.Track.Application.Dtos.TrackTemplates;
-using SJZY.Track.Application.Dtos.TrackTemplates;
-using SJZY.Track.Repository.TrackTemplate.Entitys;
-using SJZY.Track.Repository.TrackTemplate.Services;
-using SJZY.Track.Repository.TrackTemplate.ValueObjects;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using SJZY.Track.Domain.TrackTemplateAggregate;
+using SJZY.Track.Domain.TrackTemplateAggregate.Dtos;
 using Volo.Abp.DependencyInjection;
-using Volo.Abp.ObjectMapping;
 
-namespace SJZY.Track.Application.Services.TrackTemplates
+namespace SJZY.Track.Application.Services.TrackTemplates;
+
+/// <summary>
+/// 轨迹模版
+/// </summary>
+[ApiExplorerSettings(GroupName = "轨迹模版")]
+[Route("/Track")]
+public class TrackTemplateService : ApplicationService, ITrackTemplateService, IScopedDependency
 {
-    /// <summary>
-    /// 轨迹模版
-    /// </summary>
-    [ApiExplorerSettings(GroupName = "轨迹模版")]
-    [Route("/Track")]
-    public class TrackTemplateService : ApplicationService, ITrackTemplateService, IScopedDependency
-    {
     private readonly ITrackTemplateRepository _trackTemplateRepository;
 
     public TrackTemplateService(
         ITrackTemplateRepository trackTemplateRepository
     )
     {
-            this._trackTemplateRepository=trackTemplateRepository;
+        _trackTemplateRepository = trackTemplateRepository;
     }
 
     /// <summary>
@@ -55,10 +46,11 @@ namespace SJZY.Track.Application.Services.TrackTemplates
     public async Task<UnifyResultDto<GetTrackTemplateDetailDto>> GetDetailAsync(int id)
     {
         var detailInfo = await _trackTemplateRepository.GetDetailAsync(id);
-            if (detailInfo==null)
+        if (detailInfo == null)
         {
             return new UnifyResultDto<GetTrackTemplateDetailDto>(false, null, "未查询到轨迹模版");
         }
+
         var dto = ObjectMapper.Map<GetTrackTemplateDetailVO, GetTrackTemplateDetailDto>(detailInfo);
         return new UnifyResultDto<GetTrackTemplateDetailDto>("200", "", dto);
     }
@@ -73,12 +65,15 @@ namespace SJZY.Track.Application.Services.TrackTemplates
     {
         var vo = ObjectMapper.Map<GetPageTrackTemplateInput, GetPageTrackTemplateVO>(input);
         var resultDto = await _trackTemplateRepository.GetPageTrackTemplate(vo);
-            var pageResultDto = ObjectMapper.Map<UnifyPageResultDto<GetTrackTemplateListVO>, UnifyPageResultDto<GetTrackTemplateListDto>>(resultDto);
+        var pageResultDto =
+            ObjectMapper.Map<UnifyPageResultDto<GetTrackTemplateListVO>, UnifyPageResultDto<GetTrackTemplateListDto>>(
+                resultDto);
 
         return pageResultDto;
     }
 
     #region 私有方法
+
     private async Task<UnifyResultDto> AddAsync(EditTrackTemplateInput input)
     {
         var entity = ObjectMapper.Map<EditTrackTemplateInput, TrackTemplateEntity>(input);
@@ -89,7 +84,7 @@ namespace SJZY.Track.Application.Services.TrackTemplates
 
     private async Task<UnifyResultDto> UpdateAsync(EditTrackTemplateInput input)
     {
-            var templateEntity = await _trackTemplateRepository.GetFirstAsync(a => a.Id==input.Id);
+        var templateEntity = await _trackTemplateRepository.GetFirstAsync(a => a.Id == input.Id);
         ObjectMapper.Map(input, templateEntity);
         var isTrue = await _trackTemplateRepository.UpdateAsync(templateEntity);
 
@@ -98,10 +93,10 @@ namespace SJZY.Track.Application.Services.TrackTemplates
 
     private async Task<UnifyResultDto> DeleteAsync(EditTrackTemplateInput input)
     {
-            var isTrue = await _trackTemplateRepository.DeleteByIdAsync(input.Id);
+        var isTrue = await _trackTemplateRepository.SoftDeleteAsync(x => x.Id == input.Id);
 
         return new UnifyResultDto("200", "删除成功", isTrue);
     }
+
     #endregion
-    }
 }

src/SJZY.Track.Domain/TrackTemplateAggregate/Dtos/GetPageTrackTemplateVO.cs

@@ -0,0 +1,14 @@
+namespace SJZY.Track.Domain.TrackTemplateAggregate.Dtos;
+
+public class GetPageTrackTemplateVO: PageInfoInput
+{
+    /// <summary>
+    /// 子系统id
+    /// </summary>
+    public int SubSystemId { get; set; }
+
+    /// <summary>
+    /// 关键字
+    /// </summary>
+    public string Keywords { get; set; }
+}

src/SJZY.Track.Domain/TrackTemplateAggregate/Dtos/GetTrackTemplateDetailVO.cs

@@ -0,0 +1,63 @@
+namespace SJZY.Track.Domain.TrackTemplateAggregate.Dtos;
+
+/// <summary>
+/// 获取轨迹模版明细
+/// </summary>
+public class GetTrackTemplateDetailVO
+{
+    /// <summary>
+    /// Id
+    /// </summary>
+    public int Id { get; set; }
+
+    /// <summary>
+    /// 子系统id
+    /// </summary>
+    public int SubSystemId { get; set; }
+
+    /// <summary>
+    /// 子系统
+    /// </summary>
+    public string SubSystem { get; set; }
+
+    /// <summary>
+    /// 模版名称
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 模版代码
+    /// </summary>
+    public string Code { get; set; }
+}
+
+/// <summary>
+/// 获取轨迹模版列表
+/// </summary>
+public class GetTrackTemplateListVO
+{
+    /// <summary>
+    /// 轨迹模版id
+    /// </summary>
+    public int Id { get; set; }
+
+    /// <summary>
+    /// 模板名称
+    /// </summary>
+    public string Name { set; get; }
+
+    /// <summary>
+    /// 模版代码
+    /// </summary>
+    public string Code { get; set; }
+
+    /// <summary>
+    /// 所属子系统
+    /// </summary>
+    public string SubSystem { set; get; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime? CreateTime { get; set; }
+}

src/SJZY.Track.Domain/TrackTemplateAggregate/ITrackTemplateRepository.cs

@@ -5,4 +5,8 @@ namespace SJZY.Track.Domain.TrackTemplateAggregate;
 public interface ITrackTemplateRepository : IBasicRepository<TrackTemplateEntity>
 {
     Task<TemplateContentDto> GetTemplateContentsAsync(List<int> distinctTemplateIds);
+    
+    Task<GetTrackTemplateDetailVO?> GetDetailAsync(int id);
+
+    Task<UnifyPageResultDto<GetTrackTemplateListVO>> GetPageTrackTemplate(GetPageTrackTemplateVO input);
 }

src/SJZY.Track.Domain/VEntities/VServiceProviderEntity.cs

@@ -0,0 +1,76 @@
+namespace SJZY.Track.Domain.VEntities;
+
+/// <summary>
+/// 服务商主表
+/// </summary>
+[SugarTable("v_service_provider")]
+public class VServiceProviderEntity : IFullAuditedBasicEntitys
+{
+
+    /// <summary>
+    /// 自增主键
+    /// </summary>
+    [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
+    public int Id { get; set; }
+
+    /// <summary>
+    /// 授权接口Code
+    /// </summary>
+    [SugarColumn(ColumnName = "AuthInterfaceCode")]
+    public string AuthInterfaceCode { get; set; }
+
+    /// <summary>
+    /// 服务商代码
+    /// </summary>
+    [SugarColumn(ColumnName = "Code")]
+    public string Code { get; set; }
+
+    /// <summary>
+    /// 描述
+    /// </summary>
+    [SugarColumn(ColumnName = "Description")]
+    public string Description { get; set; }
+
+    /// <summary>
+    /// 流程代码
+    /// </summary>
+    [SugarColumn(ColumnName = "FlowCode")]
+    public string FlowCode { get; set; }
+
+    /// <summary>
+    /// 是否禁用账户验证
+    /// </summary>
+    [SugarColumn(ColumnName = "IsDisableAuth")]
+    public bool IsDisableAuth { get; set; }
+
+    /// <summary>
+    /// 服务商名称
+    /// </summary>
+    [SugarColumn(ColumnName = "Name")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 请求超时（s）
+    /// </summary>
+    [SugarColumn(ColumnName = "Timeout")]
+    public int? Timeout { get; set; }
+
+    /// <summary>
+    /// 轨迹时区
+    /// </summary>
+    [SugarColumn(ColumnName = "TraceTimeZone")]
+    public string TraceTimeZone { get; set; }
+
+    /// <summary>
+    /// 服务商类型（弃用）
+    /// </summary>
+    [SugarColumn(ColumnName = "Type")]
+    public int Type { get; set; }
+
+    /// <summary>
+    /// 服务商类型（多选）
+    /// </summary>
+    [SugarColumn(ColumnName = "Types")]
+    public string Types { get; set; }
+
+}

src/SJZY.Track.Domain/VEntities/VSystemEntity.cs

@@ -0,0 +1,154 @@
+namespace SJZY.Track.Domain.VEntities;
+
+/// <summary>
+/// 
+/// </summary>
+[SugarTable("v_system")]
+public class VSystemEntity : IFullAuditedBasicEntitys
+{
+
+    /// <summary>
+    /// 子系统id
+    /// </summary>
+    [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
+    public int Id { get; set; }
+
+    /// <summary>
+    /// 关联的内部子系统
+    /// </summary>
+    [SugarColumn(ColumnName = "AssociatedInternalSubsystem")]
+    public int? AssociatedInternalSubsystem { get; set; }
+
+    /// <summary>
+    /// 子系统授权类型（1.标准 2.因素）
+    /// </summary>
+    [SugarColumn(ColumnName = "AuthType")]
+    public bool AuthType { get; set; }
+
+    /// <summary>
+    /// 中文名
+    /// </summary>
+    [SugarColumn(ColumnName = "CnName")]
+    public string CnName { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [SugarColumn(ColumnName = "Comment")]
+    public string Comment { get; set; }
+
+    /// <summary>
+    /// 安装包下载链接，当类型为安装包时，必填
+    /// </summary>
+    [SugarColumn(ColumnName = "DownloadUrl")]
+    public string DownloadUrl { get; set; }
+
+    /// <summary>
+    /// 英文名
+    /// </summary>
+    [SugarColumn(ColumnName = "EnName")]
+    public string EnName { get; set; }
+
+    /// <summary>
+    /// 飞书应用ID
+    /// </summary>
+    [SugarColumn(ColumnName = "FsAppId")]
+    public string FsAppId { get; set; }
+
+    /// <summary>
+    /// 欠费允许下单(默认为是)
+    /// </summary>
+    [SugarColumn(ColumnName = "IsAllowPlaceOrder")]
+    public bool? IsAllowPlaceOrder { get; set; }
+
+    /// <summary>
+    /// 是否开通授信
+    /// </summary>
+    [SugarColumn(ColumnName = "IsCredit")]
+    public bool? IsCredit { get; set; }
+
+    /// <summary>
+    /// 是否启用
+    /// </summary>
+    [SugarColumn(ColumnName = "IsEnable")]
+    public bool IsEnable { get; set; }
+
+    /// <summary>
+    /// 是否启用业务主体(判断登录是否选择业务主体）
+    /// </summary>
+    [SugarColumn(ColumnName = "IsEnableBusiness")]
+    public bool? IsEnableBusiness { get; set; }
+
+    /// <summary>
+    /// 是否结束初始化
+    /// </summary>
+    [SugarColumn(ColumnName = "IsEndInit")]
+    public bool IsEndInit { get; set; }
+
+    /// <summary>
+    /// 是否开通余额
+    /// </summary>
+    [SugarColumn(ColumnName = "IsOpenBalance")]
+    public bool IsOpenBalance { get; set; }
+
+    /// <summary>
+    /// 子系统唯一值
+    /// </summary>
+    [SugarColumn(ColumnName = "Key")]
+    public string Key { get; set; }
+
+    /// <summary>
+    /// 子系统Logo图标
+    /// </summary>
+    [SugarColumn(ColumnName = "LogoIcon")]
+    public string LogoIcon { get; set; }
+
+    /// <summary>
+    /// 主账号Id
+    /// </summary>
+    [SugarColumn(ColumnName = "MainUserId")]
+    public int? MainUserId { get; set; }
+
+    /// <summary>
+    /// 移动端链接
+    /// </summary>
+    [SugarColumn(ColumnName = "MobileUrl")]
+    public string MobileUrl { get; set; }
+
+    /// <summary>
+    /// 运营主体
+    /// </summary>
+    [SugarColumn(ColumnName = "OperatingSubject")]
+    public int? OperatingSubject { get; set; }
+
+    /// <summary>
+    /// 排序值
+    /// </summary>
+    [SugarColumn(ColumnName = "Sort")]
+    public int? Sort { get; set; } 
+        
+    /// <summary>
+    /// 跨境电商物流1   干线物流2   国内代理贸易3   非业务类4
+    /// </summary>
+    [SugarColumn(ColumnName = "SysBusinessType")]
+    public int? SysBusinessType { get; set; }
+
+    /// <summary>
+    /// 系统所属1:内部 2:外部
+    /// </summary>
+    [SugarColumn(ColumnName = "SystemProperty")]
+    public int SystemProperty { get; set; }
+
+    /// <summary>
+    /// 子系统类型：1-Web、2-安装包exe
+    /// </summary>
+    [SugarColumn(ColumnName = "SystemType")]
+    public int? SystemType { get; set; }
+
+    /// <summary>
+    /// 子系统token
+    /// </summary>
+    [SugarColumn(ColumnName = "Token")]
+    public string Token { get; set; }
+
+}

src/SJZY.Track.Domain/VEntities/VUserEntity.cs

@@ -0,0 +1,106 @@
+namespace SJZY.Track.Domain.VEntities;
+
+/// <summary>
+/// 用户信息表
+/// </summary>
+[SugarTable("v_user")]
+public class VUserEntity : IFullAuditedBasicEntitys
+{
+
+    /// <summary>
+    /// 用户id
+    /// </summary>
+    [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
+    public int Id { get; set; }
+
+    /// <summary>
+    /// 账号
+    /// </summary>
+    [SugarColumn(ColumnName = "Account")]
+    public string Account { get; set; }
+
+    /// <summary>
+    /// 公司Id
+    /// </summary>
+    [SugarColumn(ColumnName = "CompanyId")]
+    public int? CompanyId { get; set; }
+
+    /// <summary>
+    /// 国际区号
+    /// </summary>
+    [SugarColumn(ColumnName = "CountryCode")]
+    public string CountryCode { get; set; }
+
+    /// <summary>
+    /// 默认语言枚举
+    /// </summary>
+    [SugarColumn(ColumnName = "DefaultLang")]
+    public bool? DefaultLang { get; set; }
+
+    /// <summary>
+    /// 部门Id
+    /// </summary>
+    [SugarColumn(ColumnName = "DeptId")]
+    public int? DeptId { get; set; }
+
+    /// <summary>
+    /// 员工id
+    /// </summary>
+    [SugarColumn(ColumnName = "EmployeeId")]
+    public int? EmployeeId { get; set; }
+
+    /// <summary>
+    /// 英文名
+    /// </summary>
+    [SugarColumn(ColumnName = "EnName")]
+    public string EnName { get; set; }
+
+    /// <summary>
+    /// 是否业务员
+    /// </summary>
+    [SugarColumn(ColumnName = "IsBusiness")]
+    public bool? IsBusiness { get; set; }
+
+    /// <summary>
+    /// 是否启用
+    /// </summary>
+    [SugarColumn(ColumnName = "IsEnable")]
+    public bool IsEnable { get; set; }
+
+    /// <summary>
+    /// 固定电话（座机号码）
+    /// </summary>
+    [SugarColumn(ColumnName = "LandlinePhone")]
+    public string LandlinePhone { get; set; }
+
+    /// <summary>
+    /// 姓名
+    /// </summary>
+    [SugarColumn(ColumnName = "Name")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 用户直接组织节点Id
+    /// </summary>
+    [SugarColumn(ColumnName = "OrgId")]
+    public int? OrgId { get; set; }
+
+    /// <summary>
+    /// 密码
+    /// </summary>
+    [SugarColumn(ColumnName = "PassWord")]
+    public string PassWord { get; set; }
+
+    /// <summary>
+    /// 绑定手机号
+    /// </summary>
+    [SugarColumn(ColumnName = "TelPhone")]
+    public string TelPhone { get; set; }
+
+    /// <summary>
+    /// 用户来源（1.员工入职 2.手动添加 3.其他）
+    /// </summary>
+    [SugarColumn(ColumnName = "UserOrigin")]
+    public bool? UserOrigin { get; set; }
+
+}

src/SJZY.Track.Repository/TrackTemplate/Services/TrackTemplateRepository.cs

@@ -1,58 +0,0 @@
-using SJZY.Track.Repository.TrackTemplate.Entitys;
-using SJZY.Track.Repository.TrackTemplate.ValueObjects;
-using SJZY.Track.Repository.VData.Entitys;
-
-namespace SJZY.Track.Repository.TrackTemplate.Services
-{
-    public class TrackTemplateRepository : BasicRepository<TrackTemplateEntity>, ITrackTemplateRepository, IScopedDependency
-    {
-        public TrackTemplateRepository()
-        {
-        }
-
-        /// <summary>
-        /// 获取轨迹模版明细
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public async Task<GetTrackTemplateDetailVO> GetDetailAsync(int id)
-        {
-            var detail = await Context.Queryable<TrackTemplateEntity>().LeftJoin<VSystemEntity>((a, b) => a.SubSystemId==b.Id)
-                 .Where((a, b) => a.Id==id)
-                .Select((a, b) => new
-                GetTrackTemplateDetailVO
-                {
-                    Id = a.Id,
-                    Code = a.Code,
-                    Name = a.Name,
-                    SubSystemId = a.SubSystemId,
-                    SubSystem=b.CnName
-                }).FirstAsync();
-
-            return detail;
-        }
-
-
-        /// <summary>
-        /// 分页获取轨迹模版
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        public async Task<UnifyPageResultDto<GetTrackTemplateListVO>> GetPageTrackTemplate(GetPageTrackTemplateVO input)
-        {
-            var pagedList = await Context.Queryable<TrackTemplateEntity>().LeftJoin<VSystemEntity>((a, b) => a.SubSystemId==b.Id)
-                   .WhereIF(input.SubSystemId>0, (a, b) => a.SubSystemId==input.SubSystemId)
-                   .WhereIF(!input.Keywords.IsNullOrWhiteSpace(), (a, b) => a.Name.Contains(input.Keywords)|| a.Code.Contains(input.Keywords))
-                   .Select((a, b) => new GetTrackTemplateListVO
-                   {
-                       Id=a.Id,
-                       Code=a.Code,
-                       CreateTime= a.CreateTime,
-                       Name = a.Name,
-                       SubSystem = b.CnName
-                   })
-                   .ToPagedListAsync(input.PageIndex, input.PageSize);
-            return pagedList;
-        }
-    }
-}

src/SJZY.Track.Repository/TrackTemplate/ValueObjects/GetPageTrackTemplateVO.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SJZY.Track.Repository.TrackTemplate.ValueObjects
-{
-    public class GetPageTrackTemplateVO : PageInfoInput
-    {
-        /// <summary>
-        /// 子系统id
-        /// </summary>
-        public int SubSystemId { get; set; }
-
-        /// <summary>
-        /// 关键字
-        /// </summary>
-        public string Keywords { get; set; }
-    }
-}

src/SJZY.Track.Repository/TrackTemplate/ValueObjects/GetTrackTemplateDetailVO.cs

@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SJZY.Track.Repository.TrackTemplate.ValueObjects
-{
-    /// <summary>
-    /// 获取轨迹模版明细
-    /// </summary>
-    public class GetTrackTemplateDetailVO
-    {
-        /// <summary>
-        /// Id
-        /// </summary>
-        public int Id { get; set; }
-
-        /// <summary>
-        /// 子系统id
-        /// </summary>
-        public int SubSystemId { get; set; }
-
-        /// <summary>
-        /// 子系统
-        /// </summary>
-        public string SubSystem { get; set; }
-
-        /// <summary>
-        /// 模版名称
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// 模版代码
-        /// </summary>
-        public string Code { get; set; }
-    }
-
-    /// <summary>
-    /// 获取轨迹模版列表
-    /// </summary>
-    public class GetTrackTemplateListVO
-    {
-        /// <summary>
-        /// 轨迹模版id
-        /// </summary>
-        public int Id { get; set; }
-
-        /// <summary>
-        /// 模板名称
-        /// </summary>
-        public string Name { set; get; }
-
-        /// <summary>
-        /// 模版代码
-        /// </summary>
-        public string Code { get; set; }
-
-        /// <summary>
-        /// 所属子系统
-        /// </summary>
-        public string SubSystem { set; get; }
-
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime? CreateTime { get; set; }
-    }
-}

src/SJZY.Track.Repository/TrackTemplateRepository.cs

@@ -1,13 +1,58 @@
 using SJZY.Track.Domain.TrackTemplateAggregate;
 using SJZY.Track.Domain.TrackTemplateAggregate.Dtos;
+using SJZY.Track.Domain.VEntities;
 
-namespace SJZY.Track.Repository.TrackTemplate
+namespace SJZY.Track.Repository;
+
+public class TrackTemplateRepository : BasicRepository<TrackTemplateEntity>, ITrackTemplateRepository, IScopedDependency
 {
-    public class TrackTemplateRepository : BasicRepository<TrackTemplateEntity>, ITrackTemplateRepository, IScopedDependency
-    {
     public Task<TemplateContentDto> GetTemplateContentsAsync(List<int> distinctTemplateIds)
     {
         throw new NotImplementedException();
     }
+        
+    /// <summary>
+    /// 获取轨迹模版明细
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public async Task<GetTrackTemplateDetailVO?> GetDetailAsync(int id)
+    {
+        var detail = await Context.Queryable<TrackTemplateEntity>().LeftJoin<VSystemEntity>((a, b) => a.SubSystemId==b.Id)
+            .Where((a, b) => a.Id==id)
+            .Select((a, b) => new
+                GetTrackTemplateDetailVO
+                {
+                    Id = a.Id,
+                    Code = a.Code,
+                    Name = a.Name,
+                    SubSystemId = a.SubSystemId,
+                    SubSystem=b.CnName
+                }).FirstAsync();
+
+        return detail;
+    }
+
+
+    /// <summary>
+    /// 分页获取轨迹模版
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    public async Task<UnifyPageResultDto<GetTrackTemplateListVO>> GetPageTrackTemplate(GetPageTrackTemplateVO input)
+    {
+        var pagedList = await Context.Queryable<TrackTemplateEntity>().LeftJoin<VSystemEntity>((a, b) => a.SubSystemId==b.Id)
+            .WhereIF(input.SubSystemId>0, (a, b) => a.SubSystemId==input.SubSystemId)
+            .WhereIF(!input.Keywords.IsNullOrWhiteSpace(), (a, b) => a.Name.Contains(input.Keywords)|| a.Code.Contains(input.Keywords))
+            .Select((a, b) => new GetTrackTemplateListVO
+            {
+                Id=a.Id,
+                Code=a.Code,
+                CreateTime= a.CreateTime,
+                Name = a.Name,
+                SubSystem = b.CnName
+            })
+            .ToPagedListAsync(input.PageIndex, input.PageSize);
+        return pagedList;
     }
 }

src/SJZY.Track.Repository/VData/Entitys/VServiceProviderEntity.cs

@@ -1,77 +0,0 @@
-namespace SJZY.Track.Repository.VData.Entitys
-{
-    /// <summary>
-    /// 服务商主表
-    /// </summary>
-    [SugarTable("v_service_provider")]
-    public class VServiceProviderEntity : IFullAuditedBasicEntitys
-    {
-
-        /// <summary>
-        /// 自增主键
-        /// </summary>
-        [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
-        public int Id { get; set; }
-
-        /// <summary>
-        /// 授权接口Code
-        /// </summary>
-        [SugarColumn(ColumnName = "AuthInterfaceCode")]
-        public string AuthInterfaceCode { get; set; }
-
-        /// <summary>
-        /// 服务商代码
-        /// </summary>
-        [SugarColumn(ColumnName = "Code")]
-        public string Code { get; set; }
-
-        /// <summary>
-        /// 描述
-        /// </summary>
-        [SugarColumn(ColumnName = "Description")]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// 流程代码
-        /// </summary>
-        [SugarColumn(ColumnName = "FlowCode")]
-        public string FlowCode { get; set; }
-
-        /// <summary>
-        /// 是否禁用账户验证
-        /// </summary>
-        [SugarColumn(ColumnName = "IsDisableAuth")]
-        public bool IsDisableAuth { get; set; }
-
-        /// <summary>
-        /// 服务商名称
-        /// </summary>
-        [SugarColumn(ColumnName = "Name")]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// 请求超时（s）
-        /// </summary>
-        [SugarColumn(ColumnName = "Timeout")]
-        public int? Timeout { get; set; }
-
-        /// <summary>
-        /// 轨迹时区
-        /// </summary>
-        [SugarColumn(ColumnName = "TraceTimeZone")]
-        public string TraceTimeZone { get; set; }
-
-        /// <summary>
-        /// 服务商类型（弃用）
-        /// </summary>
-        [SugarColumn(ColumnName = "Type")]
-        public int Type { get; set; }
-
-        /// <summary>
-        /// 服务商类型（多选）
-        /// </summary>
-        [SugarColumn(ColumnName = "Types")]
-        public string Types { get; set; }
-
-    }
-}

src/SJZY.Track.Repository/VData/Entitys/VSystemEntity.cs

@@ -1,155 +0,0 @@
-namespace SJZY.Track.Repository.VData.Entitys
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    [SugarTable("v_system")]
-    public class VSystemEntity : IFullAuditedBasicEntitys
-    {
-
-        /// <summary>
-        /// 子系统id
-        /// </summary>
-        [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
-        public int Id { get; set; }
-
-        /// <summary>
-        /// 关联的内部子系统
-        /// </summary>
-        [SugarColumn(ColumnName = "AssociatedInternalSubsystem")]
-        public int? AssociatedInternalSubsystem { get; set; }
-
-        /// <summary>
-        /// 子系统授权类型（1.标准 2.因素）
-        /// </summary>
-        [SugarColumn(ColumnName = "AuthType")]
-        public bool AuthType { get; set; }
-
-        /// <summary>
-        /// 中文名
-        /// </summary>
-        [SugarColumn(ColumnName = "CnName")]
-        public string CnName { get; set; }
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [SugarColumn(ColumnName = "Comment")]
-        public string Comment { get; set; }
-
-        /// <summary>
-        /// 安装包下载链接，当类型为安装包时，必填
-        /// </summary>
-        [SugarColumn(ColumnName = "DownloadUrl")]
-        public string DownloadUrl { get; set; }
-
-        /// <summary>
-        /// 英文名
-        /// </summary>
-        [SugarColumn(ColumnName = "EnName")]
-        public string EnName { get; set; }
-
-        /// <summary>
-        /// 飞书应用ID
-        /// </summary>
-        [SugarColumn(ColumnName = "FsAppId")]
-        public string FsAppId { get; set; }
-
-        /// <summary>
-        /// 欠费允许下单(默认为是)
-        /// </summary>
-        [SugarColumn(ColumnName = "IsAllowPlaceOrder")]
-        public bool? IsAllowPlaceOrder { get; set; }
-
-        /// <summary>
-        /// 是否开通授信
-        /// </summary>
-        [SugarColumn(ColumnName = "IsCredit")]
-        public bool? IsCredit { get; set; }
-
-        /// <summary>
-        /// 是否启用
-        /// </summary>
-        [SugarColumn(ColumnName = "IsEnable")]
-        public bool IsEnable { get; set; }
-
-        /// <summary>
-        /// 是否启用业务主体(判断登录是否选择业务主体）
-        /// </summary>
-        [SugarColumn(ColumnName = "IsEnableBusiness")]
-        public bool? IsEnableBusiness { get; set; }
-
-        /// <summary>
-        /// 是否结束初始化
-        /// </summary>
-        [SugarColumn(ColumnName = "IsEndInit")]
-        public bool IsEndInit { get; set; }
-
-        /// <summary>
-        /// 是否开通余额
-        /// </summary>
-        [SugarColumn(ColumnName = "IsOpenBalance")]
-        public bool IsOpenBalance { get; set; }
-
-        /// <summary>
-        /// 子系统唯一值
-        /// </summary>
-        [SugarColumn(ColumnName = "Key")]
-        public string Key { get; set; }
-
-        /// <summary>
-        /// 子系统Logo图标
-        /// </summary>
-        [SugarColumn(ColumnName = "LogoIcon")]
-        public string LogoIcon { get; set; }
-
-        /// <summary>
-        /// 主账号Id
-        /// </summary>
-        [SugarColumn(ColumnName = "MainUserId")]
-        public int? MainUserId { get; set; }
-
-        /// <summary>
-        /// 移动端链接
-        /// </summary>
-        [SugarColumn(ColumnName = "MobileUrl")]
-        public string MobileUrl { get; set; }
-
-        /// <summary>
-        /// 运营主体
-        /// </summary>
-        [SugarColumn(ColumnName = "OperatingSubject")]
-        public int? OperatingSubject { get; set; }
-
-        /// <summary>
-        /// 排序值
-        /// </summary>
-        [SugarColumn(ColumnName = "Sort")]
-        public int? Sort { get; set; } 
-        
-        /// <summary>
-        /// 跨境电商物流1   干线物流2   国内代理贸易3   非业务类4
-        /// </summary>
-        [SugarColumn(ColumnName = "SysBusinessType")]
-        public int? SysBusinessType { get; set; }
-
-        /// <summary>
-        /// 系统所属1:内部 2:外部
-        /// </summary>
-        [SugarColumn(ColumnName = "SystemProperty")]
-        public int SystemProperty { get; set; }
-
-        /// <summary>
-        /// 子系统类型：1-Web、2-安装包exe
-        /// </summary>
-        [SugarColumn(ColumnName = "SystemType")]
-        public int? SystemType { get; set; }
-
-        /// <summary>
-        /// 子系统token
-        /// </summary>
-        [SugarColumn(ColumnName = "Token")]
-        public string Token { get; set; }
-
-    }
-}

src/SJZY.Track.Repository/VData/Entitys/VUserEntity.cs

@@ -1,107 +0,0 @@
-namespace SJZY.Track.Repository.VData.Entitys
-{
-    /// <summary>
-    /// 用户信息表
-    /// </summary>
-    [SugarTable("v_user")]
-    public class VUserEntity : IFullAuditedBasicEntitys
-    {
-
-        /// <summary>
-        /// 用户id
-        /// </summary>
-        [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
-        public int Id { get; set; }
-
-        /// <summary>
-        /// 账号
-        /// </summary>
-        [SugarColumn(ColumnName = "Account")]
-        public string Account { get; set; }
-
-        /// <summary>
-        /// 公司Id
-        /// </summary>
-        [SugarColumn(ColumnName = "CompanyId")]
-        public int? CompanyId { get; set; }
-
-        /// <summary>
-        /// 国际区号
-        /// </summary>
-        [SugarColumn(ColumnName = "CountryCode")]
-        public string CountryCode { get; set; }
-
-        /// <summary>
-        /// 默认语言枚举
-        /// </summary>
-        [SugarColumn(ColumnName = "DefaultLang")]
-        public bool? DefaultLang { get; set; }
-
-        /// <summary>
-        /// 部门Id
-        /// </summary>
-        [SugarColumn(ColumnName = "DeptId")]
-        public int? DeptId { get; set; }
-
-        /// <summary>
-        /// 员工id
-        /// </summary>
-        [SugarColumn(ColumnName = "EmployeeId")]
-        public int? EmployeeId { get; set; }
-
-        /// <summary>
-        /// 英文名
-        /// </summary>
-        [SugarColumn(ColumnName = "EnName")]
-        public string EnName { get; set; }
-
-        /// <summary>
-        /// 是否业务员
-        /// </summary>
-        [SugarColumn(ColumnName = "IsBusiness")]
-        public bool? IsBusiness { get; set; }
-
-        /// <summary>
-        /// 是否启用
-        /// </summary>
-        [SugarColumn(ColumnName = "IsEnable")]
-        public bool IsEnable { get; set; }
-
-        /// <summary>
-        /// 固定电话（座机号码）
-        /// </summary>
-        [SugarColumn(ColumnName = "LandlinePhone")]
-        public string LandlinePhone { get; set; }
-
-        /// <summary>
-        /// 姓名
-        /// </summary>
-        [SugarColumn(ColumnName = "Name")]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// 用户直接组织节点Id
-        /// </summary>
-        [SugarColumn(ColumnName = "OrgId")]
-        public int? OrgId { get; set; }
-
-        /// <summary>
-        /// 密码
-        /// </summary>
-        [SugarColumn(ColumnName = "PassWord")]
-        public string PassWord { get; set; }
-
-        /// <summary>
-        /// 绑定手机号
-        /// </summary>
-        [SugarColumn(ColumnName = "TelPhone")]
-        public string TelPhone { get; set; }
-
-        /// <summary>
-        /// 用户来源（1.员工入职 2.手动添加 3.其他）
-        /// </summary>
-        [SugarColumn(ColumnName = "UserOrigin")]
-        public bool? UserOrigin { get; set; }
-
-    }
-}

src/SJZY.Track.Repository/VData/Services/ExternalSubjectRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.VData.Entitys;
-
-namespace SJZY.Track.Repository.VData.Services
-{
-    public class ExternalSubjectRepository : BasicRepository<VExternalSubjectEntity>, IExternalSubjectRepository, IScopedDependency
-    {
-
-    }
-}

src/SJZY.Track.Repository/VData/Services/IExternalSubjectRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.VData.Entitys;
-
-namespace SJZY.Track.Repository.VData.Services
-{
-    public interface IExternalSubjectRepository : ISimpleClient<VExternalSubjectEntity>
-    {
-
-    }
-}

src/SJZY.Track.Repository/VData/Services/IServiceProviderRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.VData.Entitys;
-
-namespace SJZY.Track.Repository.VData.Services
-{
-    public interface IServiceProviderRepository : ISimpleClient<VServiceProviderEntity>
-    {
-
-    }
-}

src/SJZY.Track.Repository/VData/Services/ISystemRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.VData.Entitys;
-
-namespace SJZY.Track.Repository.VData.Services
-{
-    public interface ISystemRepository : ISimpleClient<VSystemEntity>
-    {
-
-    }
-}

src/SJZY.Track.Repository/VData/Services/IUserRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.VData.Entitys;
-
-namespace SJZY.Track.Repository.VData.Services
-{
-    public interface IUserRepository : ISimpleClient<VUserEntity>
-    {
-
-    }
-}

src/SJZY.Track.Repository/VData/Services/ServiceProviderRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.VData.Entitys;
-
-namespace SJZY.Track.Repository.VData.Services
-{
-    public class VServiceProviderRepository : BasicRepository<VServiceProviderEntity>, IServiceProviderRepository, IScopedDependency
-    {
-
-    }
-}

src/SJZY.Track.Repository/VData/Services/SystemRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.VData.Entitys;
-
-namespace SJZY.Track.Repository.VData.Services
-{
-    public class SystemRepository : BasicRepository<VSystemEntity>, ISystemRepository, IScopedDependency
-    {
-
-    }
-}

src/SJZY.Track.Repository/VData/Services/UserRepository.cs

@@ -1,9 +0,0 @@
-using SJZY.Track.Repository.VData.Entitys;
-
-namespace SJZY.Track.Repository.VData.Services
-{
-    public class UserRepository : BasicRepository<VUserEntity>, IUserRepository, IScopedDependency
-    {
-
-    }
-}