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

feat 访客强制离场通知,自动离场增加节假日判断

Browse Source
This commit is contained in:
liguoyang
2025-12-09 11:16:09 +08:00
parent 59557ab617
commit 726e62d032
7 changed files with 107 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs
View File

@@ -1,5 +1,5 @@
using Dlhis.Entity.Visitor.Enums;
using Kurisu.AspNetCore.Utils.Extensions;
using Dlhis.Basic.Utils;
using Dlhis.Entity.Visitor.Enums;
using Newtonsoft.Json;
namespace Dlhis.Basic.Appointment.Response;

92
Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs
View File

@@ -1,5 +1,7 @@
using Dlhis.Basic.Appointment.Request;
using Dlhis.Basic.Appointment.Response;
using Dlhis.Basic.Common.Message.Requests;
using Dlhis.Basic.Common.Message.Services;
using Dlhis.Basic.Organization.Request;
using Dlhis.Basic.Organization.Services;
using Dlhis.Dh.Api;
@@ -27,6 +29,7 @@ public class AppointmentService : IAppointmentService
private readonly IDataProtectionProvider _dataProtectionProvider;
private readonly ICurrentUser _currentUser;
private readonly IDhApi _dhApi;
private readonly IJinkoApiService _jinkoApiService;
private readonly IFactorySettingService _factorySettingService;
private readonly ILogger<AppointmentService> _logger;
private readonly IGainfoFaceService _gainfoFaceService;
@@ -36,15 +39,18 @@ public class AppointmentService : IAppointmentService
IDataProtectionProvider dataProtectionProvider,
ICurrentUser currentUser,
IDhApi dhApi,
IJinkoApiService jinkoApiService,
IFactorySettingService factorySettingService,
IGainfoFaceService gainfoFaceService,
IServiceProvider serviceProvider,
ILogger<AppointmentService> logger)
{
_dbContext = dbContext;
_dataProtectionProvider = dataProtectionProvider;
_currentUser = currentUser;
_dhApi = dhApi;
_jinkoApiService = jinkoApiService;
_factorySettingService = factorySettingService;
_logger = logger;
_gainfoFaceService = gainfoFaceService;
@@ -196,6 +202,13 @@ public class AppointmentService : IAppointmentService
// 生成设备任务并更新数据库
await GenerateDeviceTasksAsync(detail, true, DeviceTaskEnumType.Delete, $"强制离场:{reason}");
await _dbContext.UpdateAsync(detail);
var appointment = await _dbContext.Queryable<VisitorAppointmentEntity>().Where(x => x.No == detail.No).SingleAsync();
await _jinkoApiService.SendWorkMessageAsync(new DingTalkWorkMessageRequest
{
WorkCodes = new List<string> { appointment.Code },
Content = $"您的访客预约《{appointment.Title}》中的访客{detail.Name}已被强制离场，原因：{reason}。"
});
}
public async Task<Pagination<AppointmentDetailResponse>> GetRecordPageByIdNoAsync(AppointmentIdNoPageRequest request)
@@ -355,6 +368,21 @@ public class AppointmentService : IAppointmentService
//todo 临时处理循环依赖
var gainfoService = _serviceProvider.GetService<IGainfoService>();
var holidaies = await _dbContext
.Queryable<HolidayEntity>()
.Select(x => new
{
x.Type,
Period = new DatePeriod
{
Start = x.Start,
End = x.End
}
})
.ToListAsync();
var weekends = new List<DayOfWeek>() { DayOfWeek.Saturday, DayOfWeek.Sunday };
//人员分组,key为factory
foreach (var exts in externals.GroupBy(x => x.Factory))
{
@@ -375,29 +403,73 @@ public class AppointmentService : IAppointmentService
.SingleAsync();
// 如果最近通行时间存在且超出未通行天数阈值，则自动归档该外部人员
if (raiseDateTime.HasValue && raiseDateTime.Value.AddDays(setting.NoRecordAutoResignExternalDays) < DateTime.Now)
if (raiseDateTime.HasValue)
{
try
var checkDates = GetDaysUntilToday(raiseDateTime.Value);
var days = checkDates.Count;
foreach (var date in checkDates)
{
await gainfoService.ResignAsync(new GainfoResignRequest
//date.DayOfWeek
foreach (var holiday in holidaies)
{
Id = ext.Id,
Reason = $"{setting.NoRecordAutoResignExternalDays}天无通行记录",
Date = DateTime.Now
});
var isPresent = date >= holiday.Period.Start && date <= holiday.Period.Start;
if (isPresent)
{
if (holiday.Type == HolidayEnumType.Rest)
{
days--;
}
}
else
{
if (weekends.Contains(date.DayOfWeek))
{
days--;
}
}
}
}
catch (Exception e)
if (days >= setting.NoRecordAutoResignExternalDays)
{
// 记录自动归档异常日志
_logger.LogError(e, "自动归档外部人员异常:{msg}", e.Message);
try
{
await gainfoService.ResignAsync(new GainfoResignRequest
{
Id = ext.Id,
Reason = $"{setting.NoRecordAutoResignExternalDays}天无通行记录",
Date = DateTime.Now
});
}
catch (Exception e)
{
// 记录自动归档异常日志
_logger.LogError(e, "自动归档外部人员异常:{msg}", e.Message);
}
}
}
}
}
}
//*********************************************************************************************************************
private List<DateOnly> GetDaysUntilToday(DateTime begin)
{
var start = DateOnly.FromDateTime(begin.Date);
var today = DateOnly.FromDateTime(DateTime.Today);
if (start > today) return new List<DateOnly>();
var days = new List<DateOnly>();
for (var d = start; d <= today; d = d.AddDays(1))
{
days.Add(d);
}
return days;
}
private async Task GenerateDeviceTasksAsync(VisitorAppointmentDetailEntity detail, bool withWorkplace, DeviceTaskEnumType deviceTaskType, string source)
{

16
Src/Dlhis.Basic/Common/Holiday/Services/Implements/HolidayService.cs
View File

@@ -28,7 +28,7 @@ public class HolidayService : IHolidayService
var exists = await _dbContext.Queryable<HolidayEntity>()
.WhereIF(req.Id.HasValue, x => x.Id != req.Id)
.Where(x => x.Year == req.Year)
.Where(x => x.Start < req.End && req.Start < x.End)
.Where(x => x.Start <= req.End && req.Start <= x.End)
.Where(x => x.Type != req.Type)
.AnyAsync();
@@ -36,20 +36,22 @@ public class HolidayService : IHolidayService
if (!req.Id.HasValue)
{
await _dbContext.InsertAsync(req.Adapt<HolidayEntity>());
var holiday = req.Adapt<HolidayEntity>();
await _dbContext.InsertAsync(holiday);
}
else
{
var entity = await _dbContext.Queryable<HolidayEntity>().SingleAsync(x => x.Id == req.Id);
entity.ThrowIfNull("节假日数据不存在");
var holiday = await _dbContext.Queryable<HolidayEntity>().SingleAsync(x => x.Id == req.Id);
holiday.ThrowIfNull("节假日数据不存在");
req.Adapt(entity);
await _dbContext.UpdateAsync(entity);
req.Adapt(holiday);
await _dbContext.UpdateAsync(holiday);
}
}
public async Task DeleteAsync(long id)
{
await _dbContext.Deleteable<HolidayEntity>().Where(x => x.Id == id).ExecuteCommandAsync();
var holiday = await _dbContext.Queryable<HolidayEntity>().Where(x => x.Id == id).SingleAsync();
await _dbContext.DeleteReallyAsync(holiday);
}
}

6
Src/Dlhis.Basic/Common/Message/Controller/MessagesController.cs
View File

@@ -22,4 +22,10 @@ public class MessagesController : ControllerBase
{
await _jinkoApiService.SendWorkMessageAsync(request);
}
[HttpPost("dingtalk/workgrid/workmessage")]
public async Task SendWorkMessageByWorkGridAsync(DingTalkWorkMessageRequest request)
{
await _jinkoApiService.SendWorkMessageByWorkGridAsync(request);
}
}

1
Src/Dlhis.Basic/Common/Message/Services/IJinkoApiService.cs
View File

@@ -5,4 +5,5 @@ namespace Dlhis.Basic.Common.Message.Services;
public interface IJinkoApiService : ISingletonDependency
{
Task SendWorkMessageAsync(DingTalkWorkMessageRequest request);
Task SendWorkMessageByWorkGridAsync(DingTalkWorkMessageRequest request);
}

5
Src/Dlhis.Basic/Common/Message/Services/Implements/JinkoApiService.cs
View File

@@ -82,6 +82,11 @@ public class JinkoApiService : IJinkoApiService
var jObject = JObject.Parse(jsonResponse);
(jObject.Value<string>("errcode") == "0").ThrowIfFalse(jObject.Value<string>("errmsg"));
}
public async Task SendWorkMessageByWorkGridAsync(DingTalkWorkMessageRequest request)
{
await SendWorkMessageAsync(request);
using var scope = _serviceProvider.CreateScope();
var ol = scope.ServiceProvider.GetService<IOperateLog>();

1
Src/Dlhis.Basic/DataPermissions/GetDataPermissionService.cs
View File

@@ -1,3 +1,4 @@
using Dlhis.Basic.Utils;
using Dlhis.DataPermission.Model;
using Dlhis.Entity.Basic.Entity;
using Dlhis.Entity.Device.Entities;