Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/IdentityController.cs

@@ -125,12 +125,9 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
     /// <summary>
     /// 第三方登录
     /// </summary>
-    /// <param name=""></param>
-    /// <param name="_identityAppService"></param>
-    /// <param name=""></param>
-    /// <param name=""></param>
     /// <returns></returns>
     [AllowAnonymous]
+    [LogFilterAlpha("老系统微信用户登录")]
     [HttpPost("third/login")]
     public async Task<Dictionary<string, object>> GetThirdLoginAsync([FromBody] ThirdOpenIdInDto dto)
             => await _identityAppService.GetThredTokenAsync(dto, HttpContext.RequestAborted);
@@ -141,6 +138,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
     /// <param name="openId"></param>
     /// <returns></returns>
     [HttpGet("third/refresh")]
+    [LogFilterAlpha("微信用户刷新Token")]
     [AllowAnonymous]
     public async Task<Dictionary<string, object>> RefreshTokenAsync(string openId)
         => await _identityAppService.RefreshTokenAsync(openId, HttpContext.RequestAborted);

src/Hotline.Api/Controllers/ObservationPieceController.cs

@@ -1,9 +1,4 @@
-using Hotline.Application.FlowEngine;
-using Hotline.Application.ObservationPiece;
-using Hotline.Application.OrderApp;
-using Hotline.Configurations;
-using Hotline.File;
-using Hotline.FlowEngine.Workflows;
+using Hotline.Application.ObservationPiece;
 using Hotline.Orders;
 using Hotline.Repository.SqlSugar.Extensions;
 using Hotline.Share.Dtos;
@@ -12,7 +7,6 @@ using Hotline.Share.Dtos.Order;
 using Hotline.Tools;
 using MapsterMapper;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
 using SqlSugar;
 using XF.Domain.Authentications;
 using XF.Domain.Exceptions;
@@ -24,45 +18,20 @@ namespace Hotline.Api.Controllers
     {
         private readonly ISessionContext _sessionContext;
         private readonly IMapper _mapper;
-        private readonly IFileRepository _fileRepository;
-        private readonly IWorkflowApplication _workflowApplication;
-        private readonly IRepository<Workflow> _workflowRepository;
-        private readonly IWorkflowDomainService _workflowDomainService;
-        private readonly IOrderRepository _orderRepository;
-        private readonly IOrderDomainService _orderDomainService;
-        private readonly IOrderTerminateRepository _orderTerminateRepository;
-        private readonly IOrderApplication _orderApplication;
-        private readonly IOptionsSnapshot<AppConfiguration> _appOptions;
         private readonly IRepository<ObservationPiece> _observationPieceRepository;
         private readonly IObservationPieceApplication _observationPieceApplication;
 
         public ObservationPieceController(
             ISessionContext sessionContext,
             IMapper mapper,
-            IFileRepository fileRepository,
-            IWorkflowApplication workflowApplication,
-            IRepository<Workflow> workflowRepository,
-            IWorkflowDomainService workflowDomainService,
-            IOrderRepository orderRepository,
-            IOrderDomainService orderDomainService,
-            IOrderTerminateRepository orderTerminateRepository,
-            IOrderApplication orderApplication,
-            IOptionsSnapshot<AppConfiguration> appOptions,
-            IRepository<ObservationPiece> observationPieceRepository
+            IRepository<ObservationPiece> observationPieceRepository,
+             IObservationPieceApplication observationPieceApplication
             )
         {
             _sessionContext = sessionContext;
             _mapper = mapper;
-            _fileRepository = fileRepository;
-            _workflowApplication = workflowApplication;
-            _workflowRepository = workflowRepository;
-            _workflowDomainService = workflowDomainService;
-            _orderRepository = orderRepository;
-            _orderDomainService = orderDomainService;
-            _orderTerminateRepository = orderTerminateRepository;
-            _orderApplication = orderApplication;
-            _appOptions = appOptions;
             _observationPieceRepository = observationPieceRepository;
+            _observationPieceApplication = observationPieceApplication;
         }
 
         /// <summary>

src/Hotline.Api/Controllers/SchedulingController.cs

@@ -471,10 +471,10 @@ namespace Hotline.Api.Controllers
                     .WhereIF(dto.StartTime.HasValue, p => p.SchedulingTime >= dto.StartTime)
                     .WhereIF(dto.EndTime.HasValue, p => p.SchedulingTime <= dto.EndTime)
                     .WhereIF(!string.IsNullOrEmpty(dto.Keyword), p => p.SchedulingUserName == dto.Keyword)
-                    .GroupBy(p => p.SchedulingTime.Value.ToString("yyyy-MM-dd"))
+                    .GroupBy(p => p.SchedulingTime.Value.ToString("yyyy-MM"))
                     .Select(p => new SchedulingStatisticsDto
                     {
-                        Date = p.SchedulingTime.Value.ToString("yyyy-MM-dd"),
+                        Date = p.SchedulingTime.Value.ToString("yyyy-MM"),
                         UserName = p.SchedulingUserName,
                         Count = SqlFunc.AggregateCount(p.SchedulingUserName)
                     })

src/Hotline.Application/ObservationPiece/ObservationPieceApplication.cs

@@ -1,12 +1,4 @@
-using Hotline.Application.FlowEngine;
-using Hotline.Application.OrderApp;
-using Hotline.Configurations;
-using Hotline.File;
-using Hotline.FlowEngine.Workflows;
-using Hotline.Orders;
-using Hotline.Share.Dtos.ObservationPiece;
-using MapsterMapper;
-using Microsoft.Extensions.Options;
+using Hotline.Share.Dtos.ObservationPiece;
 using SqlSugar;
 using XF.Domain.Authentications;
 using XF.Domain.Dependency;
@@ -17,44 +9,14 @@ namespace Hotline.Application.ObservationPiece
     public class ObservationPieceApplication : IObservationPieceApplication, IScopeDependency
     {
         private readonly ISessionContext _sessionContext;
-        private readonly IMapper _mapper;
-        private readonly IFileRepository _fileRepository;
-        private readonly IWorkflowApplication _workflowApplication;
-        private readonly IRepository<Workflow> _workflowRepository;
-        private readonly IWorkflowDomainService _workflowDomainService;
-        private readonly IOrderRepository _orderRepository;
-        private readonly IOrderDomainService _orderDomainService;
-        private readonly IOrderTerminateRepository _orderTerminateRepository;
-        private readonly IOrderApplication _orderApplication;
-        private readonly IOptionsSnapshot<AppConfiguration> _appOptions;
         private readonly IRepository<Hotline.Orders.ObservationPiece> _observationPieceRepository;
 
         public ObservationPieceApplication(
             ISessionContext sessionContext,
-            IMapper mapper,
-            IFileRepository fileRepository,
-            IWorkflowApplication workflowApplication,
-            IRepository<Workflow> workflowRepository,
-            IWorkflowDomainService workflowDomainService,
-            IOrderRepository orderRepository,
-            IOrderDomainService orderDomainService,
-            IOrderTerminateRepository orderTerminateRepository,
-            IOrderApplication orderApplication,
-            IOptionsSnapshot<AppConfiguration> appOptions,
             IRepository<Hotline.Orders.ObservationPiece> observationPieceRepository
             )
         {
             _sessionContext = sessionContext;
-            _mapper = mapper;
-            _fileRepository = fileRepository;
-            _workflowApplication = workflowApplication;
-            _workflowRepository = workflowRepository;
-            _workflowDomainService = workflowDomainService;
-            _orderRepository = orderRepository;
-            _orderDomainService = orderDomainService;
-            _orderTerminateRepository = orderTerminateRepository;
-            _orderApplication = orderApplication;
-            _appOptions = appOptions;
             _observationPieceRepository = observationPieceRepository;
         }
 
@@ -119,7 +81,6 @@ namespace Hotline.Application.ObservationPiece
                 })
                 .OrderByIF(dto.Type == "1", p => p.ReplyTime, OrderByType.Desc)
                 .OrderByIF(dto.Type == "0", p => p.CreationTime, OrderByType.Desc);
-
             return query;
         }