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/OrderController.cs

@@ -3843,31 +3843,28 @@ public class OrderController : BaseController
                     {
                         #region 旅游督办短信内容
 
-                        var acceptSmsRoleIds = _systemSettingCacheManager.GetSetting(SettingConstants.AcceptSmsRoleIds)?.SettingValue;
+                        //var acceptSmsRoleIds = _systemSettingCacheManager.GetSetting(SettingConstants.AcceptSmsRoleIds)?.SettingValue;
                         //查询部门所有账号
-                        var userlist = await _userRepository.Queryable().Where(x =>
-                            x.OrgId == model.OrgId && x.PhoneNo == dto.PhoneNo &&
-                            x.Roles.Any(d => acceptSmsRoleIds.Contains(d.Id))).ToListAsync();
+                        //var userlist = await _userRepository.Queryable().Where(x =>
+                        //    x.OrgId == model.OrgId && x.PhoneNo == dto.PhoneNo &&
+                        //    x.Roles.Any(d => acceptSmsRoleIds.Contains(d.Id))).ToListAsync();
 
                         var Contact = !string.IsNullOrEmpty(order.FromPhone) ? order.FromPhone : order.Contact;
 
                         //发送短信
-                        if (userlist != null && userlist.Count > 0)
+                        var messageDto = new Share.Dtos.Push.MessageDto
                         {
-                            var messageDto = new Share.Dtos.Push.MessageDto
-                            {
-                                PushBusiness = EPushBusiness.OrderSupervise,
-                                ExternalId = order.Id,
-                                OrderId = order.Id,
-                                PushPlatform = EPushPlatform.Sms,
-                                Remark = order.Title,
-                                Name = userlist[0].Name,
-                                TemplateCode = "1022",
-                                Params = new List<string>() { dto.ApplyContent, order.No, Contact, order.Content },
-                                TelNumber = userlist[0].PhoneNo,
-                            };
-                            await _mediator.Publish(new PushMessageNotify(messageDto), HttpContext.RequestAborted);
-                        }
+                            PushBusiness = EPushBusiness.OrderSupervise,
+                            ExternalId = order.Id,
+                            OrderId = order.Id,
+                            PushPlatform = EPushPlatform.Sms,
+                            Remark = order.Title,
+                            Name = dto.PhoneNo,//userlist[0].Name,
+                            TemplateCode = "1022",
+                            Params = new List<string>() { dto.ApplyContent, order.No, Contact, order.Content },
+                            TelNumber = dto.PhoneNo,
+                        };
+                        await _mediator.Publish(new PushMessageNotify(messageDto), HttpContext.RequestAborted);
 
                         #endregion
                     }

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.Api/Controllers/SystemMobilAreaController.cs

@@ -33,6 +33,22 @@ namespace Hotline.Api.Controllers
             _systemMobilAreaApplication = systemMobilAreaApplication;
         }
 
+        /// <summary>
+        /// 基础信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("get-base-data")]
+        public async Task<List<Kv>> GetBaseData()
+        {
+            var data = new List<Kv>
+            {
+                new Kv() { Key = "1", Value = "中国电信" },
+                new Kv() { Key = "2", Value = "中国移动" },
+                new Kv() { Key = "3", Value = "中国联通" }
+            };
+            return data;
+        }
+
         /// <summary>
         /// 新增
         /// </summary>

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;
         }
 

src/Hotline.Repository.SqlSugar/Extensions/SqlSugarStartupExtensions.cs

@@ -331,52 +331,52 @@ namespace Hotline.Repository.SqlSugar.Extensions
                 }
             };
 
-            //SetDeletedEntityFilter(db);
+            SetDeletedEntityFilter(db);
         }
 
-        //private static void SetDeletedEntityFilter(SqlSugarClient db)
-        //{
-        //    var cacheKey = $"DbFilter:{db.CurrentConnectionConfig.ConfigId}:IsDeleted";
-        //    var tableFilterItemList = db.DataCache.Get<List<TableFilterItem<object>>>(cacheKey);
-        //    if (tableFilterItemList == null)
-        //    {
-        //        // 获取基类实体数据表
-        //        var entityTypes = AppDomain.CurrentDomain.GetAssemblies()
-        //            .SelectMany(d => d.GetTypes())
-        //            .Where(d => !d.IsInterface
-        //                        && !d.IsAbstract
-        //                        && d.IsClass
-        //                        && d.GetInterfaces().Any(x => x == typeof(ISoftDelete)));
-        //        if (!entityTypes.Any()) return;
-
-        //        var tableFilterItems = new List<TableFilterItem<object>>();
-        //        foreach (var entityType in entityTypes)
-        //        {
-        //            if (entityType.GetProperty("IsDeleted") is null) continue;
-        //            //// 排除非当前数据库实体
-        //            //var tAtt = entityType.GetCustomAttribute<TenantAttribute>();
-        //            //if ((tAtt != null && (string)db.CurrentConnectionConfig.ConfigId != tAtt.configId.ToString()) ||
-        //            //    (tAtt == null && (string)db.CurrentConnectionConfig.ConfigId != SqlSugarConst.ConfigId))
-        //            //    continue;
-
-        //            var lambda = DynamicExpressionParser.ParseLambda(new[] {
-        //                Expression.Parameter(entityType, "d") },
-        //            typeof(bool),
-        //            $"{nameof(SoftDeleteEntity.IsDeleted)} == @0", false);
-        //            var tableFilterItem = new TableFilterItem<object>(entityType, lambda);
-        //            tableFilterItems.Add(tableFilterItem);
-        //            db.QueryFilter.Add(tableFilterItem);
-        //        }
-        //        db.DataCache.Add(cacheKey, tableFilterItems);
-        //    }
-        //    else
-        //    {
-        //        tableFilterItemList.ForEach(u =>
-        //        {
-        //            db.QueryFilter.Add(u);
-        //        });
-        //    }
-        //}
+        private static void SetDeletedEntityFilter(SqlSugarClient db)
+        {
+            var cacheKey = $"DbFilter:{db.CurrentConnectionConfig.ConfigId}:IsDeleted";
+            var tableFilterItemList = db.DataCache.Get<List<TableFilterItem<object>>>(cacheKey);
+            if (tableFilterItemList == null)
+            {
+                // 获取基类实体数据表
+                var entityTypes = AppDomain.CurrentDomain.GetAssemblies()
+                    .SelectMany(d => d.GetTypes())
+                    .Where(d => !d.IsInterface
+                                && !d.IsAbstract
+                                && d.IsClass
+                                && d.GetInterfaces().Any(x => x == typeof(ISoftDelete)));
+                if (!entityTypes.Any()) return;
+
+                var tableFilterItems = new List<TableFilterItem<object>>();
+                foreach (var entityType in entityTypes)
+                {
+                    if (entityType.GetProperty("IsDeleted") is null) continue;
+                    //// 排除非当前数据库实体
+                    //var tAtt = entityType.GetCustomAttribute<TenantAttribute>();
+                    //if ((tAtt != null && (string)db.CurrentConnectionConfig.ConfigId != tAtt.configId.ToString()) ||
+                    //    (tAtt == null && (string)db.CurrentConnectionConfig.ConfigId != SqlSugarConst.ConfigId))
+                    //    continue;
+
+                    var lambda = DynamicExpressionParser.ParseLambda(new[] {
+                        Expression.Parameter(entityType, "d") },
+                    typeof(bool),
+                    $"{nameof(SoftDeleteEntity.IsDeleted)} == @0", false);
+                    var tableFilterItem = new TableFilterItem<object>(entityType, lambda);
+                    tableFilterItems.Add(tableFilterItem);
+                    db.QueryFilter.Add(tableFilterItem);
+                }
+                db.DataCache.Add(cacheKey, tableFilterItems);
+            }
+            else
+            {
+                tableFilterItemList.ForEach(u =>
+                {
+                    db.QueryFilter.Add(u);
+                });
+            }
+        }
 
         #endregion
     }

src/Hotline.Share/Dtos/Settings/SystemMobilAreaDto.cs

@@ -104,6 +104,7 @@ namespace Hotline.Share.Dtos.Settings
         /// 运营商
         /// </summary>
         public string OFlag { get; set; }
+        public string OFlagText => OFlag == "1" ? "中国电信" : OFlag == "2" ? "中国移动" : OFlag == "3" ? "中国联通" : "其他";
 
         /// <summary>
         /// 卡类型