yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 访客预约优化

Browse Source
This commit is contained in:
liguoyang
2024-05-21 17:07:28 +08:00
parent 56ac694d85
commit 234a5d2984
8 changed files with 216 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Src/Dlhis.Entity/Visitor/Entity/VisitorAppointmentDetailEntity.cs
View File

@@ -14,6 +14,12 @@ public class VisitorAppointmentDetailEntity : SugarBaseEntity
[SugarColumn(IsNullable = false, ColumnDescription = "父id")]
public long AppointmentId { get; set; }
/// <summary>
/// no
/// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "用户no")]
public string UserNo { get; set; }
/// <summary>
/// 流水号
/// </summary>
@@ -70,4 +76,4 @@ public class VisitorAppointmentDetailEntity : SugarBaseEntity
/// </summary>
[SugarColumn(IsNullable = true, ColumnDescription = "备注")]
public string Remark { get; set; }
}
}

8
Src/Dlhis.Visitor/Appointment/Controllers/ApponintmentAreasController.cs → Src/Dlhis.Visitor/Appointment/Controllers/AppointmentAreasController.cs
View File

@@ -1,6 +1,7 @@
using Dlhis.Visitor.Appointment.Request;
using Dlhis.Visitor.Appointment.Response;
using Dlhis.Visitor.Appointment.Services;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
using Kurisu.Core.DataAccess.Dto;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
@@ -13,11 +14,11 @@ namespace Dlhis.Visitor.Appointment.Controllers;
[Authorize]
[Route("api/[controller]")]
[ApiController]
public class ApponintmentAreasController : ControllerBase
public class AppointmentAreasController : ControllerBase
{
private readonly IApponintmentAreaService _apponintmentAreaService;
private readonly IAppointmentAreaService _apponintmentAreaService;
public ApponintmentAreasController(IApponintmentAreaService apponintmentAreaService)
public AppointmentAreasController(IAppointmentAreaService apponintmentAreaService)
{
_apponintmentAreaService = apponintmentAreaService;
}
@@ -61,6 +62,7 @@ public class ApponintmentAreasController : ControllerBase
/// </summary>
/// <returns></returns>
[HttpPost("assign")]
[Transactional]
public async Task AssignAsync(AppointmentAreaAssignRequest request)
{
await _apponintmentAreaService.AssignAsync(request);

19
Src/Dlhis.Visitor/Appointment/Controllers/AppointmentsController.cs
View File

@@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc;
namespace Dlhis.Visitor.Appointment.Controllers;
/// <summary>
/// ԤԼ
/// 预约
/// </summary>
[Authorize]
[ApiController]
@@ -25,7 +25,7 @@ public class AppointmentsController : ControllerBase
}
/// <summary>
/// <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԤԼд<EFBFBD><EFBFBD>
/// 接受预约申请
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
@@ -39,7 +39,7 @@ public class AppointmentsController : ControllerBase
}
/// <summary>
/// ԤԼ<EFBFBD><EFBFBD>ҳ
/// 预约申请分页
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
@@ -50,7 +50,7 @@ public class AppointmentsController : ControllerBase
}
/// <summary>
/// ȷ<EFBFBD>ϵ<EFBFBD><EFBFBD><EFBFBD>
/// 确认到达
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
@@ -61,7 +61,7 @@ public class AppointmentsController : ControllerBase
}
/// <summary>
/// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ÿ<EFBFBD>ԤԼ
/// 根据身份证获取当天预约信息
/// </summary>
/// <param name="idNo"></param>
/// <returns></returns>
@@ -69,12 +69,17 @@ public class AppointmentsController : ControllerBase
[HttpGet("today")]
public async Task<AppointmentDetailResponse> GetTodayByIdNoAsync(
[FromQuery]
[StringLength(18, MinimumLength = 18, ErrorMessage = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD><EFBFBD><EFBFBD><EFBFBD>")]
[Required(ErrorMessage = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD>")]string idNo)
[StringLength(18, MinimumLength = 18, ErrorMessage = "身份证有误")]
[Required(ErrorMessage = "身份证有误")]string idNo)
{
return await _appointmentService.GetTodayByIdNoAsync(idNo);
}
/// <summary>
/// 根据身份证获取预约信息分页
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[AllowAnonymous]
[HttpGet("idno/page")]
public async Task<Pagination<AppointmentDetailResponse>> GetRecordPageByIdNoAsync([FromQuery] AppointmentIdNoPageRequest request)

3
Src/Dlhis.Visitor/Appointment/Request/AppointmentConfirmRequest.cs
View File

@@ -2,5 +2,8 @@
public class AppointmentConfirmRequest
{
/// <summary>
/// 预约明细id
/// </summary>
public long Id { get; set; }
}

6
Src/Dlhis.Visitor/Appointment/Services/IApponintmentAreaService.cs → Src/Dlhis.Visitor/Appointment/Services/IAppointmentAreaService.cs
View File

@@ -4,14 +4,10 @@ using Kurisu.Core.DataAccess.Dto;
namespace Dlhis.Visitor.Appointment.Services;
public interface IApponintmentAreaService : IScopeDependency
public interface IAppointmentAreaService : IScopeDependency
{
Task<Pagination<ApponintmentAreaPageResponse>> GetPageAsync(PageDto request);
Task SaveAsync(AppointmentAreaSaveRequest request);
Task DeleteAsync(long id);
Task AssignAsync(AppointmentAreaAssignRequest request);
}

163
Src/Dlhis.Visitor/Appointment/Services/Implements/AppointmentAreaService.cs Normal file
View File

@@ -0,0 +1,163 @@
using Dlhis.Entity.Basic.Entity;
using Dlhis.Entity.Device.Entities;
using Dlhis.Entity.Device.Enums;
using Dlhis.Entity.Visitor.Entity;
using Dlhis.Entity.Visitor.Enums;
using Dlhis.Visitor.Appointment.Request;
using Dlhis.Visitor.Appointment.Response;
using Kurisu.AspNetCore.Utils.Extensions;
using Kurisu.Core.DataAccess.Dto;
using Kurisu.SqlSugar.Extensions;
using Kurisu.SqlSugar.Services;
using Mapster;
namespace Dlhis.Visitor.Appointment.Services.Implements;
public class AppointmentAreaService : IAppointmentAreaService
{
private readonly IDbContext _dbContext;
public AppointmentAreaService(IDbContext dbContext)
{
_dbContext = dbContext;
}
public async Task<Pagination<ApponintmentAreaPageResponse>> GetPageAsync(PageDto request)
{
return await _dbContext.Queryable<AppointmentAreaEntity>()
.Select<ApponintmentAreaPageResponse>()
.ToPageListAsync(request);
}
public async Task SaveAsync(AppointmentAreaSaveRequest request)
{
await CheckCustomCodeDuplicateAsync(request);
if (!request.Id.HasValue)
{
var entity = request.Adapt<AppointmentAreaEntity>();
entity.Type = request.Type;
entity.CustomCode = request.CustomCode;
await _dbContext.InsertAsync(entity);
}
else
{
var entity = await _dbContext.Queryable<AppointmentAreaEntity>().Where(x => x.Id == request.Id).SingleAsync();
entity.ThrowIfNull("预约区域不存在");
request.Adapt(entity);
await _dbContext.UpdateAsync(entity);
}
}
public async Task DeleteAsync(long id)
{
var entity = await _dbContext.Queryable<AppointmentAreaEntity>().Where(x => x.Id == id).SingleAsync();
await _dbContext.DeleteAsync(entity);
}
public async Task AssignAsync(AppointmentAreaAssignRequest request)
{
var userNos = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
.LeftJoin<VisitorAppointmentEntity>((x, y) => x.FlowId == y.FlowId)
.Where(x => x.Status == AppointmentDetailEnumType.Arrived)
.Where((x, y) => y.AreaCustomCode == request.CustomCode)
.Select(x => x.UserNo)
.ToListAsync();
//通过人
var deviceCodes = await _dbContext.Queryable<AppointmentAreaAssignmentEntity>()
.Where(x => x.CustomCode == request.CustomCode).Select(x => x.DeviceCode).ToListAsync();
var userPermissions = userNos.ToDictionary(x => x, _ => deviceCodes.ToList());
await _dbContext.Client.Deleteable<AppointmentAreaAssignmentEntity>()
.Where(x => x.CustomCode == request.CustomCode)
.ExecuteCommandAsync();
var data = request.DeviceCodes.Select(x => new AppointmentAreaAssignmentEntity
{
CustomCode = request.CustomCode,
DeviceCode = x
}).ToList();
await _dbContext.InsertAsync(data);
deviceCodes = await _dbContext.Queryable<AppointmentAreaAssignmentEntity>()
.Where(x => x.CustomCode == request.CustomCode).Select(x => x.DeviceCode).ToListAsync();
var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => deviceCodes.Contains(x.Code)).ToListAsync();
var userCurrentPermissions = userNos.ToDictionary(x => x, _ => deviceCodes.ToList());
var tasks = new List<DeviceTaskEntity>();
foreach (var userNo in userNos)
{
var before = userPermissions[userNo];
var current = userCurrentPermissions[userNo];
//被删除
var deletedItems = before.Where(x => !current.Contains(x)).ToList();
//新增
var addItems = current.Where(x => !before.Contains(x)).ToList();
if (!deletedItems.Any() && !addItems.Any())
{
continue;
}
tasks.AddRange(deletedItems.Select(x => new DeviceTaskEntity
{
Type = DeviceTaskEnumType.Delete,
DeviceType = DeviceTypeEnumType.Door,
UserNo = userNo,
DeviceUniqueNo = devices.First(item => item.Code == x).UniqueNo,
Status = DeviceTaskStatusEnumType.Wait,
Version = 0,
CancellationId = 0,
Source = DeviceTaskSourceEnumType.Appointment,
Priority = 99
}));
tasks.AddRange(addItems.Select(x => new DeviceTaskEntity
{
Type = DeviceTaskEnumType.Add,
DeviceType = DeviceTypeEnumType.Door,
UserNo = userNo,
DeviceUniqueNo = devices.First(item => item.Code == x).UniqueNo,
Status = DeviceTaskStatusEnumType.Wait,
Version = 0,
CancellationId = 0,
Source = DeviceTaskSourceEnumType.Appointment,
Priority = 99
}));
}
await _dbContext.InsertAsync(tasks);
}
//********************************************************* help methods ***************************************************************
/// <summary>
/// 检查编码重复
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
private async Task CheckCustomCodeDuplicateAsync(AppointmentAreaSaveRequest request)
{
var exists = await _dbContext.Queryable<AppointmentAreaEntity>()
.Where(x => x.CustomCode == request.CustomCode)
.WhereIF(request.Id.HasValue, x => x.Id == request.Id)
.AnyAsync();
exists.ThrowIfTrue("重复区域编码,请检查");
}
}

46
Src/Dlhis.Visitor/Appointment/Services/Implements/AppointmentService.cs
View File

@@ -39,15 +39,12 @@ public class AppointmentService : IAppointmentService
area.ThrowIfNull("预约区域不存在");
var where = LinqExpressionExtensions.False<VisitorAppointmentDetailEntity>();
request.Items.ForEach(item =>
{
where = where.Or(x => !(x.End < request.Start || x.Start > request.End)).And(x => x.IdNo == item.IdNo);
});
request.Items.ForEach(item => { where = where.Or(x => !(x.End < request.Start || x.Start > request.End)).And(x => x.IdNo == item.IdNo); });
var existsDetails = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
.Where(where)
.Where(x => x.Status == AppointmentDetailEnumType.Wait || x.Status == AppointmentDetailEnumType.Arrived)
.ToListAsync();
.Where(where)
.Where(x => x.Status == AppointmentDetailEnumType.Wait || x.Status == AppointmentDetailEnumType.Arrived)
.ToListAsync();
existsDetails.ThrowIfExists($"{existsDetails.Select(x => x.Name).Join(",")}存在预约时间冲突,请检查");
@@ -65,7 +62,8 @@ public class AppointmentService : IAppointmentService
foreach (var item in request.Items)
{
var isExternal = !await _dbContext.Queryable<GainfoEntity>().Where(x => x.IdNo == item.IdNo).AnyAsync();
var no = await _dbContext.Queryable<GainfoEntity>().Where(x => x.IdNo == item.IdNo).Select(x => x.No).SingleAsync();
var isExternal = no.IsEmpty();
if (isExternal)
{
var gainfoExternal = await _dbContext.Queryable<GainfoExternalEntity>().Where(x => x.IdNo == item.IdNo).FirstAsync();
@@ -89,10 +87,13 @@ public class AppointmentService : IAppointmentService
await _dbContext.UpdateAsync(gainfoExternal);
}
no = gainfoExternal.No;
}
var detail = new VisitorAppointmentDetailEntity
{
UserNo = no,
AppointmentId = id,
FlowId = request.FlowId,
Start = request.Start,
@@ -113,7 +114,7 @@ public class AppointmentService : IAppointmentService
{
return await _dbContext.Queryable<VisitorAppointmentEntity>()
.WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true && request.SearchDateTimePeriod?.End.HasValue == true,
x => x.ApplyTime >= request.SearchDateTimePeriod.Start && x.ApplyTime <= request.SearchDateTimePeriod.End)
x => x.ApplyTime >= request.SearchDateTimePeriod.Start && x.ApplyTime <= request.SearchDateTimePeriod.End)
.WhereIF(request.Search.IsPresent(), x => x.Code == request.Search || x.Name == request.Search)
.Select<AppointmentPageResponse>()
.ToPageListAsync(request);
@@ -132,7 +133,9 @@ public class AppointmentService : IAppointmentService
var detail = await _dbContext.Queryable<VisitorAppointmentDetailEntity>().Where(x => x.Id == request.Id).SingleAsync();
detail.ThrowIfNull("预约信息不存在");
var mst = await _dbContext.Queryable<VisitorAppointmentEntity>().Where(x => x.Id == detail.AppointmentId).FirstAsync();
var mst = await _dbContext.Queryable<VisitorAppointmentEntity>().Where(x => x.Id == detail.AppointmentId).SingleAsync();
//当前分配的设备codes
var deviceCodes = await _dbContext.Queryable<AppointmentAreaAssignmentEntity>()
.Where(x => x.CustomCode == mst.AreaCustomCode)
.Select(x => x.DeviceCode)
@@ -153,7 +156,8 @@ public class AppointmentService : IAppointmentService
UserNo = userNo,
Type = DeviceTaskEnumType.Add,
Priority = 100,
Version = 0,
Source = DeviceTaskSourceEnumType.Appointment,
Version = 0
}).ToList());
detail.Status = AppointmentDetailEnumType.Arrived;
@@ -176,11 +180,11 @@ public class AppointmentService : IAppointmentService
}
var detail = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
.Where(x => x.IdNo == idNo)
.Where(x => SqlFunc.DateIsSame(x.Start, DateTime.Today, DateType.Day))
.OrderBy(x => x.Start)
.Select<AppointmentDetailResponse>()
.FirstAsync();
.Where(x => x.IdNo == idNo)
.Where(x => SqlFunc.DateIsSame(x.Start, DateTime.Today, DateType.Day))
.OrderBy(x => x.Start)
.Select<AppointmentDetailResponse>()
.FirstAsync();
return detail;
}
@@ -198,11 +202,11 @@ public class AppointmentService : IAppointmentService
}
var page = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
.Where(x => x.IdNo == request.IdNo)
.OrderBy(x => x.Start)
.Select<AppointmentDetailResponse>()
.ToPageListAsync(request);
.Where(x => x.IdNo == request.IdNo)
.OrderBy(x => x.Start)
.Select<AppointmentDetailResponse>()
.ToPageListAsync(request);
return page;
}
}
}

93
Src/Dlhis.Visitor/Appointment/Services/Implements/ApponintmentAreaService.cs
View File

@@ -1,93 +0,0 @@
using Dlhis.Entity.Visitor.Entity;
using Dlhis.Visitor.Appointment.Request;
using Dlhis.Visitor.Appointment.Response;
using Kurisu.AspNetCore.Utils.Extensions;
using Kurisu.Core.DataAccess.Dto;
using Kurisu.SqlSugar.Extensions;
using Kurisu.SqlSugar.Services;
using Mapster;
namespace Dlhis.Visitor.Appointment.Services.Implements;
public class ApponintmentAreaService : IApponintmentAreaService
{
private readonly IDbContext _dbContext;
public ApponintmentAreaService(IDbContext dbContext)
{
_dbContext = dbContext;
}
public async Task<Pagination<ApponintmentAreaPageResponse>> GetPageAsync(PageDto request)
{
return await _dbContext.Queryable<AppointmentAreaEntity>()
.Select<ApponintmentAreaPageResponse>()
.ToPageListAsync(request);
}
public async Task SaveAsync(AppointmentAreaSaveRequest request)
{
await CheckCustomCodeDuplicateAsync(request);
if (!request.Id.HasValue)
{
var entity = request.Adapt<AppointmentAreaEntity>();
entity.Type = request.Type;
entity.CustomCode = request.CustomCode;
await _dbContext.InsertAsync(entity);
}
else
{
var entity = await _dbContext.Queryable<AppointmentAreaEntity>().Where(x => x.Id == request.Id).SingleAsync();
entity.ThrowIfNull("预约区域不存在");
request.Adapt(entity);
await _dbContext.UpdateAsync(entity);
}
}
public async Task DeleteAsync(long id)
{
var entity = await _dbContext.Queryable<AppointmentAreaEntity>().Where(x => x.Id == id).SingleAsync();
await _dbContext.DeleteAsync(entity);
}
public async Task AssignAsync(AppointmentAreaAssignRequest request)
{
await _dbContext.Client.Deleteable<AppointmentAreaAssignmentEntity>()
.Where(x => x.CustomCode == request.CustomCode)
.ExecuteCommandAsync();
var data = request.DeviceCodes.Select(x => new AppointmentAreaAssignmentEntity
{
CustomCode = request.CustomCode,
DeviceCode = x,
})
.ToList();
await _dbContext.InsertAsync(data);
}
//********************************************************* help methods ***************************************************************
/// <summary>
/// 检查编码重复
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
private async Task CheckCustomCodeDuplicateAsync(AppointmentAreaSaveRequest request)
{
var exists = await _dbContext.Queryable<AppointmentAreaEntity>()
.Where(x => x.CustomCode == request.CustomCode)
.WhereIF(request.Id.HasValue, x => x.Id == request.Id)
.AnyAsync();
exists.ThrowIfTrue("重复区域编码,请检查");
}
}