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

Merge branch 'master' into development

Browse Source
This commit is contained in:
liguoyang
2024-10-10 18:29:21 +08:00
parent 0c249a8e04 33dbc33836
commit fd41d097df
44 changed files with 710 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Src/Dlhis.Visitor/Appointment/Controllers/AppointmentAreasController.cs → Src/Dlhis.Basic/Appointment/Controllers/AppointmentAreasController.cs
View File

@@ -1,12 +1,12 @@
using Dlhis.Visitor.Appointment.Request;
using Dlhis.Visitor.Appointment.Response;
using Dlhis.Visitor.Appointment.Services;
using Dlhis.Basic.Appointment.Request;
using Dlhis.Basic.Appointment.Response;
using Dlhis.Basic.Appointment.Services;
using Kurisu.AspNetCore.DataAccess.Dto;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
namespace Dlhis.Visitor.Appointment.Controllers;
namespace Dlhis.Basic.Appointment.Controllers;
/// <summary>
/// 预约区域
@@ -16,24 +16,13 @@ namespace Dlhis.Visitor.Appointment.Controllers;
[ApiController]
public class AppointmentAreasController : ControllerBase
{
private readonly IAppointmentAreaService _apponintmentAreaService;
private readonly IAppointmentAreaService _appointmentAreaService;
public AppointmentAreasController(IAppointmentAreaService apponintmentAreaService)
public AppointmentAreasController(IAppointmentAreaService appointmentAreaService )
{
_apponintmentAreaService = apponintmentAreaService;
_appointmentAreaService = appointmentAreaService;
}
/// <summary>
/// 预约区域
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpGet("page")]
public async Task<Pagination<ApponintmentAreaPageResponse>> GetPageAsync([FromQuery] PageDto request)
{
return await _apponintmentAreaService.GetPageAsync(request);
}
/// <summary>
/// 保存
/// </summary>
@@ -42,19 +31,18 @@ public class AppointmentAreasController : ControllerBase
[HttpPost("save")]
public async Task SaveAsync(AppointmentAreaSaveRequest request)
{
await _apponintmentAreaService.SaveAsync(request);
await _appointmentAreaService.SaveAsync(request);
}
/// <summary>
/// 删除
/// 预约区域分页
/// </summary>
/// <param name="id"></param>
/// <param name="request"></param>
/// <returns></returns>
[HttpDelete("{id}")]
public async Task DeleteAsync(long id)
[HttpGet("page")]
public async Task<Pagination<AppointmentAreaPageResponse>> GetPageAsync([FromQuery] AppointmentAreaPageRequest request)
{
await _apponintmentAreaService.DeleteAsync(id);
return await _appointmentAreaService.GetPageAsync(request);
}
/// <summary>
@@ -65,6 +53,6 @@ public class AppointmentAreasController : ControllerBase
[Transactional]
public async Task AssignAsync(AppointmentAreaAssignRequest request)
{
await _apponintmentAreaService.AssignAsync(request);
await _appointmentAreaService.AssignAsync(request);
}
}

18
Src/Dlhis.Visitor/Appointment/Controllers/AppointmentsController.cs → Src/Dlhis.Basic/Appointment/Controllers/AppointmentsController.cs
View File

@@ -1,13 +1,13 @@
using System.ComponentModel.DataAnnotations;
using Dlhis.Visitor.Appointment.Request;
using Dlhis.Visitor.Appointment.Response;
using Dlhis.Visitor.Appointment.Services;
using Dlhis.Basic.Appointment.Request;
using Dlhis.Basic.Appointment.Response;
using Dlhis.Basic.Appointment.Services;
using Kurisu.AspNetCore.DataAccess.Dto;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
namespace Dlhis.Visitor.Appointment.Controllers;
namespace Dlhis.Basic.Appointment.Controllers;
/// <summary>
/// 预约
@@ -23,7 +23,7 @@ public class AppointmentsController : ControllerBase
{
_appointmentService = appointmentService;
}
/// <summary>
/// 预约申请分页
/// </summary>
@@ -41,6 +41,7 @@ public class AppointmentsController : ControllerBase
/// <param name="request"></param>
/// <returns></returns>
[HttpPost("confirm")]
[Transactional]
public async Task ConfirmAsync(AppointmentConfirmRequest request)
{
await _appointmentService.ConfirmAsync(request);
@@ -54,9 +55,8 @@ public class AppointmentsController : ControllerBase
[AllowAnonymous]
[HttpGet("today")]
public async Task<AppointmentDetailResponse> GetTodayByIdNoAsync(
[FromQuery]
[StringLength(18, MinimumLength = 18, ErrorMessage = "身份证有误")]
[Required(ErrorMessage = "身份证有误")]string idNo)
[FromQuery] [StringLength(18, MinimumLength = 18, ErrorMessage = "身份证有误")] [Required(ErrorMessage = "身份证有误")]
string idNo)
{
return await _appointmentService.GetTodayByIdNoAsync(idNo);
}
@@ -72,4 +72,4 @@ public class AppointmentsController : ControllerBase
{
return await _appointmentService.GetRecordPageByIdNoAsync(request);
}
}
}

2
Src/Dlhis.Visitor/Appointment/Dto/AppointmentReceiveItemDto.cs → Src/Dlhis.Basic/Appointment/Dto/AppointmentReceiveItemDto.cs
View File

@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
namespace Dlhis.Visitor.Appointment.Dto;
namespace Dlhis.Basic.Appointment.Dto;
public class AppointmentReceiveItemDto
{

4
Src/Dlhis.Visitor/Appointment/Request/AppointmentAreaAssignRequest.cs → Src/Dlhis.Basic/Appointment/Request/AppointmentAreaAssignRequest.cs
View File

@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
namespace Dlhis.Visitor.Appointment.Request;
namespace Dlhis.Basic.Appointment.Request;
public class AppointmentAreaAssignRequest
{
@@ -14,4 +14,4 @@ public class AppointmentAreaAssignRequest
/// 分组
/// </summary>
public List<Guid> DeviceCodes { get; set; }
}
}

14
Src/Dlhis.Basic/Appointment/Request/AppointmentAreaPageRequest.cs Normal file
View File

@@ -0,0 +1,14 @@
using System.ComponentModel.DataAnnotations;
using Dlhis.Entity.Visitor.Enums;
using Kurisu.AspNetCore.DataAccess.Dto;
namespace Dlhis.Basic.Appointment.Request;
public class AppointmentAreaPageRequest : PageDto
{
/// <summary>
/// 区域类型
/// </summary>
[EnumDataType(typeof(AppointmentAreaEnumType))]
public AppointmentAreaEnumType? Type { get; set; }
}

10
Src/Dlhis.Visitor/Appointment/Request/AppointmentAreaSaveRequest.cs → Src/Dlhis.Basic/Appointment/Request/AppointmentAreaSaveRequest.cs
View File

@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using Dlhis.Entity.Visitor.Enums;
namespace Dlhis.Visitor.Appointment.Request;
namespace Dlhis.Basic.Appointment.Request;
public class AppointmentAreaSaveRequest
{
@@ -17,13 +17,13 @@ public class AppointmentAreaSaveRequest
public AppointmentAreaEnumType Type { get; set; }
/// <summary>
/// 预期编码
/// 编码
/// </summary>
[Required]
[Required(ErrorMessage = "编码不能为空")]
public string CustomCode { get; set; }
/// <summary>
/// 姓名
/// 名称
/// </summary>
[Required]
public string Name { get; set; }
@@ -32,4 +32,4 @@ public class AppointmentAreaSaveRequest
/// 备注
/// </summary>
public string Remark { get; set; }
}
}

2
Src/Dlhis.Visitor/Appointment/Request/AppointmentConfirmRequest.cs → Src/Dlhis.Basic/Appointment/Request/AppointmentConfirmRequest.cs
View File

@@ -1,4 +1,4 @@
namespace Dlhis.Visitor.Appointment.Request;
namespace Dlhis.Basic.Appointment.Request;
public class AppointmentConfirmRequest
{

2
Src/Dlhis.Visitor/Appointment/Request/AppointmentIdNoPageRequest.cs → Src/Dlhis.Basic/Appointment/Request/AppointmentIdNoPageRequest.cs
View File

@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using Kurisu.AspNetCore.DataAccess.Dto;
namespace Dlhis.Visitor.Appointment.Request;
namespace Dlhis.Basic.Appointment.Request;
public class AppointmentIdNoPageRequest : PageDto
{

20
Src/Dlhis.Basic/Appointment/Request/AppointmentPageRequest.cs Normal file
View File

@@ -0,0 +1,20 @@
using System.ComponentModel.DataAnnotations;
using Kurisu.AspNetCore.CustomClass;
using Kurisu.AspNetCore.DataAccess.Dto;
namespace Dlhis.Basic.Appointment.Request;
public class AppointmentPageRequest : PageDto , IValidatableObject
{
public DateTimePeriod SearchDateTimePeriod { get; set; }
/// <inheritdoc />
public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
{
if (SearchDateTimePeriod.HasValue())
{
SearchDateTimePeriod.End = SearchDateTimePeriod.End!.Value.AddDays(1).AddSeconds(-1);
}
yield break;
}
}

4
Src/Dlhis.Visitor/Appointment/Request/AppointmentReceiveRequest.cs → Src/Dlhis.Basic/Appointment/Request/AppointmentReceiveRequest.cs
View File

@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using Dlhis.Visitor.Appointment.Dto;
using Dlhis.Basic.Appointment.Dto;
namespace Dlhis.Visitor.Appointment.Request;
namespace Dlhis.Basic.Appointment.Request;
public class AppointmentReceiveRequest : IValidatableObject
{

12
Src/Dlhis.Visitor/Appointment/Response/ApponintmentAreaPageResponse.cs → Src/Dlhis.Basic/Appointment/Response/AppointmentAreaPageResponse.cs
View File

@@ -1,17 +1,17 @@
using Dlhis.Entity.Visitor.Enums;
using Kurisu.AspNetCore.Utils.Extensions;
namespace Dlhis.Visitor.Appointment.Response;
namespace Dlhis.Basic.Appointment.Response;
public class ApponintmentAreaPageResponse
public class AppointmentAreaPageResponse
{
public long Id { get; set; }
/// <summary>
/// 区域类型
/// </summary>
public AppointmentAreaEnumType Type { get; set; }
/// <summary>
/// 区域类型
/// </summary>
@@ -21,7 +21,7 @@ public class ApponintmentAreaPageResponse
/// 自定义编码
/// </summary>
public string CustomCode { get; set; }
/// <summary>
/// 名称
/// </summary>
@@ -31,4 +31,4 @@ public class ApponintmentAreaPageResponse
/// 备注
/// </summary>
public string Remark { get; set; }
}
}

102
Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs Normal file
View File

@@ -0,0 +1,102 @@
using Dlhis.Entity.Visitor.Enums;
namespace Dlhis.Basic.Appointment.Response;
public class AppointmentDetailResponse
{
/// <summary>
/// 流水号
/// </summary>
public string No { get; set; }
/// <summary>
/// no
/// </summary>
public string UserNo { get; set; }
/// <summary>
/// 证件类型
/// </summary>
public string IdType { get; set; }
/// <summary>
/// 证件号
/// </summary>
public string IdNo { get; set; }
/// <summary>
/// 访客名称
/// </summary>
public string Name { get; set; }
/// <summary>
/// 手机号
/// </summary>
public string Phone { get; set; }
/// <summary>
/// 车牌
/// </summary>
public string LicensePlate { get; set; }
/// <summary>
/// 进入门岗
/// </summary>
public bool IsEnterDoorArea { get; set; }
/// <summary>
/// 预约门禁区域
/// </summary>
public string ApplyDoorArea { get; set; }
/// <summary>
/// 访客开始
/// </summary>
public DateTime DoorStart { get; set; }
/// <summary>
/// 访问结束
/// </summary>
public DateTime DoorEnd { get; set; }
/// <summary>
/// 是否进入车间
/// </summary>
public bool IsEnterWorkplace { get; set; }
/// <summary>
/// 申请车间区域
/// </summary>
public List<string> ApplyWorkplaceAreas { get; set; }
/// <summary>
/// 车间访问开始
/// </summary>
public DateTime? WorkplaceStart { get; set; }
/// <summary>
/// 车间访问结束
/// </summary>
public DateTime? WorkplaceEnd { get; set; }
/// <summary>
/// 社保照片url
/// </summary>
public string ImageUrl { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 门禁状态
/// </summary>
public VisitorAppointmentDetailStatusEnumType DoorStatus { get; set; }
/// <summary>
/// 车间状态
/// </summary>
public VisitorAppointmentDetailStatusEnumType WorkplaceStatus { get; set; }
}

41
Src/Dlhis.Basic/Appointment/Response/AppointmentPageResponse.cs Normal file
View File

@@ -0,0 +1,41 @@
namespace Dlhis.Basic.Appointment.Response;
public class AppointmentPageResponse
{
public string No { get; set; }
/// <summary>
/// 标题
/// </summary>
public string Title { get; set; }
/// <summary>
/// 对接人工号
/// </summary>
public string Code { get; set; }
/// <summary>
/// 来访人来源/公司
/// </summary>
public string Source { get; set; }
/// <summary>
/// 申请时间
/// </summary>
public DateTime Date { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 预约厂区
/// </summary>
public string Factory { get; set; }
/// <summary>
/// 申请事由
/// </summary>
public string Reason { get; set; }
}

29
Src/Dlhis.Basic/Appointment/Services/IAppointmentAreaService.cs Normal file
View File

@@ -0,0 +1,29 @@
using Dlhis.Basic.Appointment.Request;
using Dlhis.Basic.Appointment.Response;
using Kurisu.AspNetCore.DataAccess.Dto;
namespace Dlhis.Basic.Appointment.Services;
public interface IAppointmentAreaService : IScopeDependency
{
/// <summary>
/// 区域分页
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
Task<Pagination<AppointmentAreaPageResponse>> GetPageAsync(AppointmentAreaPageRequest request);
/// <summary>
/// 保存区域
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
Task SaveAsync(AppointmentAreaSaveRequest request);
/// <summary>
/// 分配设备组到区域
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
Task AssignAsync(AppointmentAreaAssignRequest request);
}

10
Src/Dlhis.Visitor/Appointment/Services/IAppointmentService.cs → Src/Dlhis.Basic/Appointment/Services/IAppointmentService.cs
View File

@@ -1,9 +1,9 @@
using Dlhis.Visitor.Appointment.Request;
using Dlhis.Visitor.Appointment.Response;
using Dlhis.Basic.Appointment.Request;
using Dlhis.Basic.Appointment.Response;
using Kurisu.AspNetCore.DataAccess.Dto;
using Microsoft.AspNetCore.Mvc;
namespace Dlhis.Visitor.Appointment.Services;
namespace Dlhis.Basic.Appointment.Services;
public interface IAppointmentService : IScopeDependency
{
@@ -17,9 +17,9 @@ public interface IAppointmentService : IScopeDependency
/// <summary>
/// 查看明细
/// </summary>
/// <param name="id"></param>
/// <param name="no"></param>
/// <returns></returns>
Task<List<AppointmentDetailResponse>> GetAppointmentDetailsByIdAsync(long id);
Task<List<AppointmentDetailResponse>> GetAppointmentDetailsByIdAsync(string no);
/// <summary>
/// 确认到达

180
Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentAreaService.cs Normal file
View File

@@ -0,0 +1,180 @@
using Dlhis.Basic.Appointment.Request;
using Dlhis.Basic.Appointment.Response;
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 Kurisu.AspNetCore.DataAccess.Dto;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
using Kurisu.AspNetCore.Utils.Extensions;
using Mapster;
namespace Dlhis.Basic.Appointment.Services.Implements;
public class AppointmentAreaService : IAppointmentAreaService
{
private readonly IDbContext _dbContext;
public AppointmentAreaService(IDbContext dbContext)
{
_dbContext = dbContext;
}
public async Task SaveAsync(AppointmentAreaSaveRequest request)
{
if (!request.Id.HasValue)
{
var entity = request.Adapt<AppointmentAreaEntity>();
entity.CustomCode = request.CustomCode;
entity.Type = request.Type;
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<Pagination<AppointmentAreaPageResponse>> GetPageAsync(AppointmentAreaPageRequest request)
{
return await _dbContext.Queryable<AppointmentAreaEntity>()
.WhereIF(request.Type.HasValue, x => x.Type == request.Type)
.WhereIF(request.Search.IsPresent(), x => x.CustomCode == request.Search || x.Name.Contains(request.Search))
.Select<AppointmentAreaPageResponse>()
.ToPageListAsync(request);
}
public async Task AssignAsync(AppointmentAreaAssignRequest request)
{
(await _dbContext.Queryable<AppointmentAreaEntity>().Where(x => x.CustomCode == request.CustomCode).AnyAsync())
.ThrowIfFalse("区域不存在");
var userBeforePermissions = await GetMyPermissionsAsync(request.CustomCode);
var userNos = userBeforePermissions.Select(x => x.Key).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);
var userCurrentPermissions = await GetMyPermissionsAsync(request.CustomCode);
var allDeviceCodes = userCurrentPermissions.SelectMany(x => x.Value);
var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => allDeviceCodes.Contains(x.Code)).ToListAsync();
var tasks = new List<DeviceTaskEntity>();
foreach (var userNo in userNos)
{
var before = userBeforePermissions[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 ***************************************************************
private async Task<Dictionary<string, List<Guid>>> GetMyPermissionsAsync(string areaCode)
{
//获取已经到达的数据
var arrivedInfos = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
.Where(x => x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Arrived || x.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Arrived)
.Select(x => new
{
x.UserNo,
x.DoorStatus,
x.WorkplaceStatus,
x.IsEnterDoorArea,
x.ApplyDoorArea,
x.IsEnterWorkplace,
x.ApplyWorkplaceAreas
})
.ToListAsync();
var userAreaCodes = arrivedInfos.GroupBy(x => x.UserNo).ToDictionary(p => p.Key, ls =>
{
return ls.SelectMany(x =>
{
var list = new List<string>();
if (x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Arrived)
{
list.Add(x.ApplyDoorArea);
}
if (x.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Arrived)
{
list.AddRange(x.ApplyWorkplaceAreas);
}
return list;
});
});
userAreaCodes = userAreaCodes.Where(x => x.Value.Contains(areaCode)).ToDictionary(x => x.Key, x => x.Value);
var userBeforePermissions = new Dictionary<string, List<Guid>>(userAreaCodes.Count);
foreach ((string currentUserNo, IEnumerable<string> currentUseAreaCode) in userAreaCodes)
{
var deviceCodes = await _dbContext.Queryable<AppointmentAreaAssignmentEntity>()
.Where(x => currentUseAreaCode.Contains(x.CustomCode))
.Select(x => x.DeviceCode)
.ToListAsync();
userBeforePermissions.Add(currentUserNo, deviceCodes);
}
return userBeforePermissions;
}
}

145
Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs Normal file
View File

@@ -0,0 +1,145 @@
using Dlhis.Basic.Appointment.Request;
using Dlhis.Basic.Appointment.Response;
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 Kurisu.AspNetCore.CustomClass;
using Kurisu.AspNetCore.DataAccess.Dto;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
using Kurisu.AspNetCore.Utils.Extensions;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
namespace Dlhis.Basic.Appointment.Services.Implements;
public class AppointmentService : IAppointmentService
{
private readonly IDbContext _dbContext;
private readonly IDataProtectionProvider _dataProtectionProvider;
public AppointmentService(IDbContext dbContext, IDataProtectionProvider dataProtectionProvider)
{
_dbContext = dbContext;
_dataProtectionProvider = dataProtectionProvider;
}
public async Task<Pagination<AppointmentPageResponse>> GetPageAsync(AppointmentPageRequest request)
{
return await _dbContext.Queryable<VisitorAppointmentEntity>()
.WhereIF(request.SearchDateTimePeriod.HasValue(),
x => x.Date >= request.SearchDateTimePeriod.Start && x.Date <= request.SearchDateTimePeriod.End)
.WhereIF(request.Search.IsPresent(), x => x.Code == request.Search)
.Select<AppointmentPageResponse>()
.ToPageListAsync(request);
}
public async Task<List<AppointmentDetailResponse>> GetAppointmentDetailsByIdAsync(string no)
{
return await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
.Where(x => x.No == no)
.Select<AppointmentDetailResponse>()
.ToListAsync();
}
public async Task ConfirmAsync(AppointmentConfirmRequest request)
{
var detail = await _dbContext.Queryable<VisitorAppointmentDetailEntity>().Where(x => x.Id == request.Id).SingleAsync();
detail.ThrowIfNull("预约信息不存在");
var areaCodes = GetValidAreaCodes(detail);
var existsAreaCodes = await _dbContext.Queryable<AppointmentAreaEntity>().Where(x => areaCodes.Contains(x.CustomCode)).Select(x => x.CustomCode).ToListAsync();
//当前分配的设备codes
var deviceCodes = await _dbContext.Queryable<AppointmentAreaAssignmentEntity>()
.Where(x => existsAreaCodes.Contains(x.CustomCode))
.Select(x => x.DeviceCode)
.ToListAsync();
var deviceUniqueNos = await _dbContext.Queryable<DeviceEntity>().Where(x => deviceCodes.Contains(x.Code)).Select(x => new { x.UniqueNo, x.TenantId }).ToListAsync();
await _dbContext.InsertAsync(deviceUniqueNos.Select(x => new DeviceTaskEntity
{
DeviceType = DeviceTypeEnumType.Door,
DeviceUniqueNo = x.UniqueNo,
Status = DeviceTaskStatusEnumType.Wait,
UserNo = detail.UserNo,
Type = DeviceTaskEnumType.Add,
Priority = 100,
TenantId = x.TenantId,
Source = DeviceTaskSourceEnumType.Appointment,
Version = 0,
}).ToList());
detail.DoorStatus = VisitorAppointmentDetailStatusEnumType.Arrived;
detail.WorkplaceStatus = VisitorAppointmentDetailStatusEnumType.Arrived;
detail.ArrivedTime = DateTime.Now;
await _dbContext.UpdateAsync(detail);
}
private static IEnumerable<string> GetValidAreaCodes(VisitorAppointmentDetailEntity detail)
{
if (detail.IsEnterDoorArea)
{
yield return detail.ApplyDoorArea;
}
if (detail.IsEnterWorkplace)
{
foreach (var item in detail.ApplyWorkplaceAreas)
{
yield return item;
}
}
}
//********************************************************** 用户操作 *******************************************************************
public async Task<AppointmentDetailResponse> GetTodayByIdNoAsync(string idNo)
{
var protector = _dataProtectionProvider.CreateProtector("gainfo:external:idno");
try
{
idNo = protector.Unprotect(idNo);
}
catch (Exception)
{
throw new UserFriendlyException("凭证有误");
}
var now = DateTime.Now;
return await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
.LeftJoin<GainfoEntity>((x, ga) => ga.IdNo == idNo)
.Where((x, ga) => ga.IdNo == idNo)
.Where(x => (x.IsEnterDoorArea && SqlFunc.DateIsSame(x.DoorStart, now)) || (x.IsEnterWorkplace && SqlFunc.DateIsSame(x.WorkplaceStart, now)))
.Select<AppointmentDetailResponse>()
.SingleAsync();
}
public async Task<Pagination<AppointmentDetailResponse>> GetRecordPageByIdNoAsync([FromQuery] AppointmentIdNoPageRequest request)
{
var protector = _dataProtectionProvider.CreateProtector("gainfo:external:idno");
try
{
request.IdNo = protector.Unprotect(request.IdNo);
}
catch (Exception)
{
throw new UserFriendlyException("凭证有误");
}
var page = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
.LeftJoin<GainfoEntity>((x, ga) => x.UserNo == ga.No)
.Where((x, ga) => ga.IdNo == request.IdNo)
.OrderBy(x => x.CreateTime)
.Select<AppointmentDetailResponse>()
.ToPageListAsync(request);
return page;
}
}

36
Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
View File

@@ -30,12 +30,6 @@ public class DeviceConnectService : IDeviceConnectService
businessPlace.ThrowIfNull("营业点不存在");
var device = await GetEnableDeviceAsync(request.UniqueNo, false, request.DeployPlace, businessPlace.TenantId);
if (device.DeployPlace.Equals("AUTO", StringComparison.OrdinalIgnoreCase))
{
device.DeployPlace = businessPlace.Name;
await _dbContext.UpdateAsync(device);
}
var registry = await _dbContext.Queryable<DeviceRegistryEntity>().Where(x => x.DeviceUniqueNo == request.UniqueNo).SingleAsync();
if (registry != null)
@@ -45,20 +39,28 @@ public class DeviceConnectService : IDeviceConnectService
registry.BusinessPlaceCode = businessPlace.Code;
await _dbContext.UpdateAsync(registry);
return "请勿重复注册设备";
}
else
{
registry = new DeviceRegistryEntity
{
DeviceUniqueNo = request.UniqueNo,
LastHeartbeatTime = DateTime.Now,
RegisterTime = DateTime.Now,
BusinessPlaceCode = businessPlace.Code,
TenantId = device.TenantId
};
await _dbContext.InsertAsync(registry);
}
registry = new DeviceRegistryEntity
{
DeviceUniqueNo = request.UniqueNo,
LastHeartbeatTime = DateTime.Now,
RegisterTime = DateTime.Now,
BusinessPlaceCode = businessPlace.Code,
TenantId = device.TenantId
};
if (request.DeployPlace.Equals("AUTO", StringComparison.OrdinalIgnoreCase))
device.DeployPlace = businessPlace.Name;
else
device.DeployPlace = request.DeployPlace.IsPresent() ? request.DeployPlace : businessPlace.Name;
await _dbContext.UpdateAsync(device);
await _dbContext.InsertAsync(registry);
return "设备注册成功";
}

2
Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
View File

@@ -101,7 +101,7 @@ public class DeviceService : IDeviceService
.Where((dgr, dg) => dgr.DeviceCode == entity.Code)
.AnyAsync();
existsG.ThrowIfTrue("存在设备分组,不可修改设备分类");
existsG.ThrowIfTrue("存在设备分组,不可修改设备类型");
}
request.Adapt(entity);

2
Src/Dlhis.Basic/Organization/Request/GainfoMealPageRequest.cs
View File

@@ -11,7 +11,7 @@ public class GainfoMealPageRequest : PageDto
public DateTimePeriod SearchDateTimePeriod { get; set; }
/// <summary>
/// 是否离职
/// 是否查询离职
/// </summary>
public bool IsLeave { get; set; }
}

8
Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs
View File

@@ -89,12 +89,14 @@ public class GainfoGroupService : IGainfoGroupService
.ToListAsync();
await _dbContext.DeleteAsync(relations);
request.UserNos = await _dbContext.Queryable<GainfoEntity>()
.Where(x => request.UserNos.Contains(x.No) || request.UserNos.Contains(x.Code))
var userNos = await _dbContext.Queryable<GainfoEntity>()
.Where(x => request.UserNos.Contains(x.No) || request.UserNos.Contains(x.Code)) //NO和工号匹配
.Select(x => x.No)
.ToListAsync();
var entities = request.UserNos.Select(x => new GainfoGroupRelationshipEntity
(userNos.Count != request.UserNos.Count).ThrowIfTrue("存在权限外人员,无法添加");
var entities = userNos.Select(x => new GainfoGroupRelationshipEntity
{
GroupCode = request.GroupCode,
UserNo = x

16
Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs
View File

@@ -43,13 +43,17 @@ public class GainfoOutsourceService : IGainfoOutsourceService
: await GetOutSourceCodeAsync();
await _dbContext.InsertAsync(entity);
await _dbContext.InsertAsync(new OutsourceEntity
if (!await _dbContext.Queryable<OutsourceEntity>().Where(x => x.Code == entity.Code).AnyAsync())
{
Code = entity.Code,
Supplier = request.ExternalInfo.Supplier,
SapCode = request.ExternalInfo.SapCode,
SapPhone = request.ExternalInfo.SapPhone
});
await _dbContext.InsertAsync(new OutsourceEntity
{
Code = entity.Code,
Supplier = request.ExternalInfo.Supplier,
SapCode = request.ExternalInfo.SapCode,
SapPhone = request.ExternalInfo.SapPhone
});
}
}
else
{

33
Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
View File

@@ -1,5 +1,4 @@
using Dlhis.Basic.Device.Services;
using Dlhis.Basic.Organization.Api;
using Dlhis.Basic.Organization.Request;
using Dlhis.Basic.Organization.Response;
using Dlhis.Entity.Basic.Entity;
@@ -28,7 +27,6 @@ public class GainfoService : IGainfoService
private readonly ICurrentUser _currentUser;
private readonly ITenantApi _tenantApi;
private readonly IHangfireApi _hangfireApi;
private readonly IHainingApi _hainingApi;
private readonly IDevicePermissionService _devicePermissionService;
private readonly IGainfoPermissionService _gainfoPermissionService;
private readonly ILogger<GainfoService> _logger;
@@ -39,7 +37,6 @@ public class GainfoService : IGainfoService
ICurrentUser currentUser,
ITenantApi tenantApi,
IHangfireApi hangfireApi,
IHainingApi hainingApi,
IDevicePermissionService devicePermissionService,
IGainfoPermissionService gainfoPermissionService,
ILogger<GainfoService> logger)
@@ -50,7 +47,6 @@ public class GainfoService : IGainfoService
_currentUser = currentUser;
_tenantApi = tenantApi;
_hangfireApi = hangfireApi;
_hainingApi = hainingApi;
_devicePermissionService = devicePermissionService;
_gainfoPermissionService = gainfoPermissionService;
_logger = logger;
@@ -68,6 +64,11 @@ public class GainfoService : IGainfoService
//根据组织架构搜索档案
var where = LinqExpressionExtensions.False<GainfoEntity>();
var factories = _currentUser.GetUserClaim("tenants").Split(",").ToList();
var role = _currentUser.GetRole();
var jinkoCode = _currentUser.GetUserClaim("jinko-code") ?? string.Empty;
var isAll = role is "admin" or "tenant-admin";
if (request.DepartmentSelections.Any())
{
foreach (var item in request.DepartmentSelections)
@@ -91,11 +92,15 @@ public class GainfoService : IGainfoService
where = Expressionable.Create<GainfoEntity>()
.And(where)
.Or(gainfo => SqlFunc.Subqueryable<BusinessTripEntity>()
.Where(p => p.Code == gainfo.Code && factories.Contains(p.Destination) && SqlFunc.DateIsSame(p.BeginDate, today))
.Any())
.Where(p => p.Code == gainfo.Code
&& factories.Contains(p.Destination)
&& SqlFunc.DateIsSame(p.BeginDate, today))
.Any()
)
.ToExpression();
}
ISugarQueryable<GainfoPageResponse> queryable = request.IsSearchAll
? _dbContext.Queryable<GainfoEntity>().AS("GainfoEntity", "gainfo")
.Where(where)
@@ -117,7 +122,12 @@ public class GainfoService : IGainfoService
.LeftJoin<BasicTypeEntity>((gainfo, department, type) => type.Code == SqlFunc.ToString(gainfo.CardType) && type.Type == "timeperiod")
.WhereIF(request.SearchType != GainfoSearchEnumType.BusinessTrip && request.DepartmentSelections?.Any() == false, gainfo => factories.Contains(gainfo.Factory))
.WhereIF(request.SearchType == GainfoSearchEnumType.Internal, gainfo => SqlFunc.Subqueryable<OutsourceEntity>().Where(p => p.Code == gainfo.Code).NotAny())
.WhereIF(request.SearchType == GainfoSearchEnumType.Outsource, gainfo => SqlFunc.Subqueryable<OutsourceEntity>().Where(p => p.Code == gainfo.Code).Any()) //&& today >= gainfo.EntryDate && today <= gainfo.ResignationDate
.WhereIF(request.SearchType == GainfoSearchEnumType.Outsource, gainfo =>
SqlFunc.Subqueryable<OutsourceEntity>()
.Where(p => p.Code == gainfo.Code)
.WhereIF(!isAll, p => p.SapCode == jinkoCode)
.Any()
)
.WhereIF(request.SearchType == GainfoSearchEnumType.BusinessTrip, gainfo =>
SqlFunc.Subqueryable<BusinessTripEntity>().Where(p => p.Code == gainfo.Code && factories.Contains(p.Destination) && SqlFunc.DateIsSame(p.BeginDate, today)).Any())
.WhereIF(request.Search.IsPresent(), gainfo =>
@@ -132,14 +142,16 @@ public class GainfoService : IGainfoService
CardTypeName = type.Display
}, true);
_logger.LogInformation(queryable.ToSqlString());
var page = await queryable.ToPageListAsync(request);
//外包人员部门号处理
if (request.SearchType == GainfoSearchEnumType.Outsource)
{
var codes = page.Data.Select(x => x.Code).ToList();
var outsourceInfos = await _dbContext.Queryable<OutsourceEntity>().Where(x => codes.Contains(x.Code)).Select(x => new { x.Code, x.Supplier }).ToListAsync();
var outsourceInfos = await _dbContext.Queryable<OutsourceEntity>()
.Where(x => codes.Contains(x.Code))
.Select(x => new { x.Code, x.Supplier })
.ToListAsync();
page.Data.ForEach(item => { item.DepartmentName = outsourceInfos.FirstOrDefault(x => x.Code == item.Code)?.Supplier; });
}
@@ -227,8 +239,7 @@ public class GainfoService : IGainfoService
public async Task<object> CheckIdNoAndNameMatchAsync(GainfoCheckIdNoAndNameRequest request)
{
var gainfo = await _gainfoStore.Queryable(GainfoStatusEnumType.Working).FirstAsync(x => x.IdNo == request.IdNo && x.Name == request.Name);
var gainfo = await _gainfoStore.Queryable(GainfoStatusEnumType.Working).SingleAsync(x => x.IdNo == request.IdNo && x.Name == request.Name);
gainfo.ThrowIfNull("验证失败!");
var protector = _dataProtectionProvider.CreateProtector("gainfo:external:idno");

1
Src/Dlhis.Canteen/EMealVoucher/Services/Implements/EMealVoucherService.cs
View File

@@ -31,7 +31,6 @@ public class EMealVoucherService : IEMealVoucherService
public async Task<Pagination<EMealVoucherPageResponse>> GetMyEMealVoucherPageAsync(EMealVoucherPageRequest request)
{
var code = _currentUser.GetUserClaim("jinko-code");
code = "0123456";
return await _dbContext.Queryable<EMealVoucherEntity>()
.Where(x => x.Code == code)
.OrderBy(x => x.Id, OrderByType.Desc)

6
Src/Dlhis.Canteen/MealSupplementRecord/Response/MealSupplementRecordResponse.cs
View File

@@ -78,6 +78,12 @@ public class MealSupplementRecordResponse
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 部门号
/// </summary>
public string DepartmentNo { get; set; }
/// <summary>
/// 部门名称
/// </summary>

32
Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs
View File

@@ -4,6 +4,7 @@ using Dlhis.Entity.Basic.Entity;
using Dlhis.Entity.Canteen.Entities;
using Dlhis.Entity.Canteen.Enums;
using Dlhis.Sys.Api;
using Dlhis.Sys.Api.Response;
using Kurisu.AspNetCore.Authentication.Abstractions;
using Kurisu.AspNetCore.CustomClass;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
@@ -31,18 +32,18 @@ public class MealSupplementRecordService : IMealSupplementRecordService
{
var queryable = _dbContext.Queryable<MealSupplementRecordEntity>()
.LeftJoin<GainfoEntity>((x, ga) => x.Code == ga.Code)
.LeftJoin<DepartmentEntity>((x, ga, department) => ga.DepartmentNo == department.No)
.LeftJoin<GainfoLeaveEntity>((x, ga, gaLeave) => gaLeave.Code == x.Code)
.WhereIF(request.Status.HasValue, x => x.Status == request.Status)
.WhereIF(request.Sync.HasValue, x => x.Sync == request.Sync)
.WhereIF(request.Workplace.IsPresent(), x => x.Workplace == request.Workplace)
.WhereIF(request.Factory.IsPresent(), x => x.Factory == request.Factory)
.WhereIF(request.DepartmentNo.IsPresent(), (x, ga) => ga.DepartmentNo == request.DepartmentNo)
.WhereIF(request.DepartmentNo.IsPresent(), (x, ga, gaLeave) => ga.DepartmentNo == request.DepartmentNo || gaLeave.DepartmentNo == request.DepartmentNo)
.WhereIF(request.Werks.IsPresent(), (x, ga) => ga.Werks == request.Werks)
.WhereIF(request.DateTimePeriod.HasValue(), x => x.Date >= request.DateTimePeriod.Start && x.Date <= request.DateTimePeriod.End)
.WhereIF(request.Search.IsPresent(), (x, ga) => x.Code == request.Search || ga.Name == request.Search);
var page = await queryable
.Select((x, ga, department) => new MealSupplementRecordResponse
.Select((x, ga, gaLeave) => new MealSupplementRecordResponse
{
Amount = x.Amount,
Code = x.Code,
@@ -52,32 +53,37 @@ public class MealSupplementRecordService : IMealSupplementRecordService
Status = x.Status,
Sync = x.Sync,
UniqueId = x.UniqueId,
UserName = ga.Name,
UserName = SqlFunc.IIF(SqlFunc.IsNullOrEmpty(ga.Name), gaLeave.Name, ga.Name),
Workplace = x.Workplace,
DepartmentNo = SqlFunc.IIF(SqlFunc.IsNullOrEmpty(ga.DepartmentNo), gaLeave.DepartmentNo, ga.DepartmentNo),
Factory = x.Factory,
CreateTime = x.CreateTime,
DepartmentName = department.Name,
Werks = ga.Werks
Werks = SqlFunc.IIF(SqlFunc.IsNullOrEmpty(ga.Werks), gaLeave.Werks, ga.Werks)
})
.ToPageListAsync(request);
var departmentNos = page.Data.Select(x => x.DepartmentNo).Distinct().ToList();
var departmentInfos = await _dbContext.Queryable<DepartmentEntity>().Where(x => departmentNos.Contains(x.No)).Select(x => new { x.No, x.Name }).ToListAsync();
var tenants = new List<TenantResponse>();
try
{
var tenantsResult = await _tenantApi.GetTenantsInternalAsync();
var tenants = tenantsResult.Data;
page.Data.ForEach(item =>
{
item.Workplace = tenants.FirstOrDefault(x => x.Code == item.Workplace)?.Name;
item.Factory = tenants.FirstOrDefault(x => x.Code == item.Factory)?.Name;
});
tenants = tenantsResult.Data;
}
catch (Exception)
{
//ignore
}
page.Data.ForEach(item =>
{
item.Workplace = tenants.FirstOrDefault(x => x.Code == item.Workplace)?.Name;
item.Factory = tenants.FirstOrDefault(x => x.Code == item.Factory)?.Name;
item.DepartmentName = departmentInfos.FirstOrDefault(x => x.No == item.DepartmentNo)?.Name;
});
return new MealSupplementRecordSummaryResponse
{

3
Src/Dlhis.Canteen/Order/Request/BalanceRecordAnalysisRequest.cs
View File

@@ -4,8 +4,5 @@ namespace Dlhis.Canteen.Order.Request;
public class BalanceRecordAnalysisRequest : SummaryCommonDto
{
/// <summary>
/// 营业点
/// </summary>
public Guid? BusinessPlaceCode { get; set; }
}

23
Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
View File

@@ -49,12 +49,9 @@ public class BalanceService : IBalanceService
public async Task<Pagination<BalanceRecordResponse>> GetPageAsync(BalanceRecordPageRequest request)
{
var page = await _dbContext.Queryable<BalanceRecordEntity>()
.LeftJoin<GainfoEntity>((record, ga) => record.UserNo == ga.No)
//.LeftJoinIF<GainfoEntity>(request.GainfoStatus == GainfoStatusEnumType.Working, (record, ga) => record.UserNo == ga.No)
//.LeftJoinIF<GainfoLeaveEntity>(request.GainfoStatus == GainfoStatusEnumType.Leave, (record, ga) => record.UserNo == ga.No)
.LeftJoin<DepartmentEntity>((record, ga, department) => ga.DepartmentNo == department.No)
.LeftJoin<BusinessPlaceEntity>((record, ga, department, bPlace) => record.BusinessPlaceCode == bPlace.Code)
.LeftJoin<CanteenOrderEntity>((record, ga, department, bPlace, order) => record.No == order.No)
.LeftJoin<DepartmentEntity>((record, department) => record.DepartmentNo == department.No)
.LeftJoin<BusinessPlaceEntity>((record, department, bPlace) => record.BusinessPlaceCode == bPlace.Code)
.LeftJoin<CanteenOrderEntity>((record, department, bPlace, order) => record.No == order.No)
.WhereIF(request.Factory.IsPresent(), record => record.TenantId == request.Factory)
.WhereIF(request.SearchDateTimePeriod.HasValue(), record => record.CostDate >= request.SearchDateTimePeriod.Start && record.CostDate <= request.SearchDateTimePeriod.End)
.WhereIF(request.Type.HasValue, record => record.Type == request.Type)
@@ -62,7 +59,7 @@ public class BalanceService : IBalanceService
.WhereIF(request.UserCode.IsPresent(), record => record.UserCode == request.UserCode)
.WhereIF(request.UserName.IsPresent(), record => record.Name == request.UserName)
.OrderBy(record => record.CreateTime, OrderByType.Desc)
.Select((record, ga, department, bPlace, order) => new BalanceRecordResponse
.Select((record, department, bPlace, order) => new BalanceRecordResponse
{
Id = record.Id,
No = record.No,
@@ -182,17 +179,16 @@ public class BalanceService : IBalanceService
}
var page = await _dbContext.Queryable<BalanceRecordEntity>()
.LeftJoin<GainfoEntity>((record, ga) => record.UserNo == ga.No)
.LeftJoin<DepartmentEntity>((record, ga, department) => ga.DepartmentNo == department.No)
.LeftJoin<BusinessPlaceEntity>((record, ga, department, bPlace) => record.BusinessPlaceCode == bPlace.Code)
.LeftJoin<ImageRecordEntity>((record, ga, department, bPlace, imageRecord) => imageRecord.No == record.No)
.LeftJoin<DepartmentEntity>((record, department) => record.DepartmentNo == department.No)
.LeftJoin<BusinessPlaceEntity>((record, department, bPlace) => record.BusinessPlaceCode == bPlace.Code)
.LeftJoin<ImageRecordEntity>((record, department, bPlace, imageRecord) => imageRecord.No == record.No)
.Where(record => record.DeviceUniqueNo == device.UniqueNo)
.Where(record => record.CostDate >= request.Start && record.CostDate <= request.End)
.Where(record => record.Type == BalanceRecordTypeEnumType.Out
&& (record.Status == BalanceRecordStatusEnumType.Valid || (record.Status == BalanceRecordStatusEnumType.Obsolute && record.Remark == "退款")))
.WhereIF(request.UserCode.IsPresent(), record => record.UserCode == request.UserCode)
.OrderBy(record => record.CostDateTime, OrderByType.Desc)
.Select((record, ga, department, bPlace, imageRecord) => new BalanceRecordDeviceResponse
.Select((record, department, bPlace, imageRecord) => new BalanceRecordDeviceResponse
{
Id = record.Id,
Amount = SqlFunc.Abs(record.Amount),
@@ -238,7 +234,6 @@ public class BalanceService : IBalanceService
var queryable = _dbContext.Queryable<BalanceRecordEntity>()
.LeftJoin<DepartmentEntity>((record, department) => record.DepartmentNo == department.No)
.LeftJoin<BusinessPlaceEntity>((record, department, bPlace) => record.BusinessPlaceCode == bPlace.Code)
.LeftJoin<GainfoEntity>((record, department, bPlace, gainfo) => record.UserNo == gainfo.No)
.Where(record => record.Type == BalanceRecordTypeEnumType.Out && record.Status == BalanceRecordStatusEnumType.Valid)
.Where(record => myCodes.Contains(record.BusinessPlaceCode))
.WhereIF(request.SearchDateTimePeriod.HasValue(), record => record.CostDate >= request.SearchDateTimePeriod.Start && record.CostDate <= request.SearchDateTimePeriod.End)
@@ -247,7 +242,7 @@ public class BalanceService : IBalanceService
var page = await queryable
.OrderBy(record => record.CostDateTime, OrderByType.Desc)
.Select((record, department, bPlace, gainfo) => new BalanceRecordDetailPageResponse
.Select((record, department, bPlace) => new BalanceRecordDetailPageResponse
{
Id = record.Id,
No = record.No,

20
Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
View File

@@ -66,6 +66,8 @@ public class OrderService : BaseOrderService, IOrderService
await DbContext.UpdateAsync(device);
}
Logger.LogInformation("设备IP获取:{deviceNo} {ip}", request.DeviceUniqueNo, ip);
}
catch (Exception)
{
@@ -137,7 +139,7 @@ public class OrderService : BaseOrderService, IOrderService
{
//尝试匹配userId
var s = long.TryParse(request.UserUniqueNo, out var userId);
GainfoEntity gainfo = null;
GainfoEntity gainfo;
if (request.Source == BalanceRecordSourceEnumType.QrCode)
{
@@ -153,6 +155,10 @@ public class OrderService : BaseOrderService, IOrderService
var code = eMealVoucherQrCode.OriginData.Split(':')[2];
gainfo = await DbContext.Queryable<GainfoEntity>().Where(x => x.Code == code).SingleAsync();
}
else
{
throw new UserFriendlyException($"无法识别{request.UserUniqueNo}");
}
}
else
{
@@ -547,7 +553,7 @@ public class OrderService : BaseOrderService, IOrderService
//获取餐券余额
var data = await DbContext.Queryable<EMealVoucherEntity>()
.LeftJoin<EMealVoucherDetailEntity>((x, d) => x.No == d.No)
.Where((x, d) => d.IdNo == idNo)
.Where((x, d) => x.No == no && d.IdNo == idNo)
.Select((x, d) => new OrderResultResponse
{
CurrentBalance = d.Balance
@@ -668,12 +674,18 @@ public class OrderService : BaseOrderService, IOrderService
.Where(x => x.No == no && x.IdNo == idNo).SingleAsync();
(nowDate >= current.Start && nowDate <= current.End).ThrowIfFalse("餐券已过期");
var time = DateTimeOffset.FromUnixTimeMilliseconds(Convert.ToInt64(ts.Reverse().Join(string.Empty))).ToLocalTime().DateTime;
(time.AddMinutes(60) >= DateTime.Now).ThrowIfFalse("餐券二维码已过期");
//todo 临时注释
// var time = DateTimeOffset.FromUnixTimeMilliseconds(Convert.ToInt64(ts.Reverse().Join(string.Empty))).ToLocalTime().DateTime;
// (time.AddMinutes(60) >= DateTime.Now).ThrowIfFalse("餐券二维码已过期");
var eMealVoucher = await DbContext.Queryable<EMealVoucherEntity>().Where(x => x.No == no).SingleAsync();
var checkData = await PreCheckAsync(request.DeviceUniqueNo, request.CostDateTime);
var isSupermarket = await DbContext.Queryable<BusinessPlaceEntity>().Where(x => x.Code == checkData.BusinessPlaceCode)
.Select(x => x.Catalog == CanteenBusinessPlaceCatalogEnumType.Supermarket)
.SingleAsync();
isSupermarket.ThrowIfTrue("禁止在超市消费");
eMealVoucher.Factories.Contains(checkData.BusinessPlaceTenantId).ThrowIfFalse("禁止在当前厂区消费");
var order = new CanteenOrderEntity

8
Src/Dlhis.Entity/Basic/Entity/OutsourceEntity.cs
View File

@@ -10,25 +10,25 @@ namespace Dlhis.Entity.Basic.Entity;
public class OutsourceEntity : SugarBaseEntity
{
/// <summary>
/// 外包人员工号 LS开头
/// 外包人员工号 LS开头
/// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "工号")]
public string Code { get; set; }
/// <summary>
/// 供应商
/// 供应商
/// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "供应商")]
public string Supplier { get; set; }
/// <summary>
/// 对接人员工号
/// 对接人员工号
/// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "对接人工号")]
public string SapCode { get; set; }
/// <summary>
/// 对接人员手机号
/// 对接人员手机号
/// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "对接人手机号")]
public string SapPhone { get; set; }

3
Src/Dlhis.Entity/Visitor/Entity/AppointmentAreaAssignmentEntity.cs
View File

@@ -22,6 +22,7 @@ public class AppointmentAreaAssignmentEntity : SugarBaseEntity, ITenantId
[SugarColumn(IsNullable = false, ColumnDescription = "设备code")]
public Guid DeviceCode { get; set; }
[SugarColumn]
public string TenantId { get; set; }
}
}

7
Src/Dlhis.Entity/Visitor/Entity/AppointmentAreaEntity.cs
View File

@@ -11,7 +11,7 @@ namespace Dlhis.Entity.Visitor.Entity;
/// 预约区域
/// </summary>
[SugarTable(TableName = "AppointmentArea", TableDescription = "预约区域")]
public class AppointmentAreaEntity : SugarBaseEntity, ITenantId, ISoftDeleted
public class AppointmentAreaEntity : SugarBaseEntity, ITenantId
{
/// <summary>
/// 区域类型
@@ -48,7 +48,4 @@ public class AppointmentAreaEntity : SugarBaseEntity, ITenantId, ISoftDeleted
[SugarColumn(IsNullable = false, ColumnDescription = " 基地/租户",
UniqueGroupNameList = new[] { "idx_AppointmentArea_t_cc_tid" })]
public string TenantId { get; set; }
public bool IsDeleted { get; set; }
}
}

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

@@ -104,13 +104,18 @@ public class VisitorAppointmentDetailEntity : SugarBaseEntity
[SugarColumn(ColumnDescription = "备注")]
public string Remark { get; set; }
/// <summary>
/// 门禁状态
/// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "门禁状态", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
public VisitorAppointmentDetailStatusEnumType DoorStatus { get; set; }
/// <summary>
/// 到达时间
/// </summary>
[SugarColumn(IsNullable = true)]
public DateTime? ArrivedTime { get; set; }
/// <summary>
/// 车间状态
/// </summary>

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

@@ -1,7 +1,5 @@
using Dlhis.Entity.Visitor.Enums;
using Kurisu.AspNetCore.DataAccess.SqlSugar;
using Kurisu.AspNetCore.DataAccess.SqlSugar;
using SqlSugar;
using SqlSugar.DbConvert;
namespace Dlhis.Entity.Visitor.Entity;
@@ -36,7 +34,7 @@ public class VisitorAppointmentEntity : SugarBaseEntity
/// 申请时间
/// </summary>
public DateTime Date { get; set; }
/// <summary>
/// 备注
/// </summary>
@@ -51,4 +49,4 @@ public class VisitorAppointmentEntity : SugarBaseEntity
/// 申请事由
/// </summary>
public string Reason { get; set; }
}
}

19
Src/Dlhis.Entity/Visitor/Enums/ApponintmentAreaEnumType.cs
View File

@@ -1,19 +0,0 @@
using System.ComponentModel;
namespace Dlhis.Entity.Visitor.Enums;
[Description("预约区域")]
public enum ApponintmentAreaEnumType
{
/// <summary>
/// 门岗
/// </summary>
[Description("门岗")]
Door = 1,
/// <summary>
/// 车间
/// </summary>
[Description("车间")]
Workshop = 2,
}

22
Src/Dlhis.Entity/Visitor/Enums/VisitorAppointmentStatusEnumType.cs
View File

@@ -1,22 +0,0 @@
using System.ComponentModel;
namespace Dlhis.Entity.Visitor.Enums;
/// <summary>
/// 访客预约明细状态
/// </summary>
[Description("访客预约状态")]
public enum VisitorAppointmentStatusEnumType
{
/// <summary>
/// 到达
/// </summary>
[Description("到达")]
Valid = 1,
/// <summary>
/// 作废
/// </summary>
[Description("作废")]
Obsolete = 99
}

1
Src/Dlhis.External/Dockerfile
View File

@@ -9,6 +9,7 @@ ARG BUILD_CONFIGURATION=Release
WORKDIR /src
COPY ["Src/Dlhis.External/Dlhis.External.csproj", "Src/Dlhis.External/"]
COPY ["Src/Dlhis.Entity/Dlhis.Entity.csproj", "Src/Dlhis.Entity/"]
COPY ["Src/Dlhis.DataPermission.Model/Dlhis.DataPermission.Model.csproj", "Src/Dlhis.DataPermission.Model/"]
RUN dotnet restore "./Src/Dlhis.External/./Dlhis.External.csproj"
COPY . .
WORKDIR "/src/Src/Dlhis.External"

4
Src/Dlhis.Middle/Services/Implements/CanteenSettingService.cs
View File

@@ -1,8 +1,6 @@
using Dlhis.Entity.Basic.Entity;
using Dlhis.Entity.Canteen.Enums;
using Dlhis.Entity.Canteen.Enums;
using Dlhis.Middle.Entities;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
using Mapster;
namespace Dlhis.Middle.Services.Implements;

9
Src/Dlhis.Middle/Services/Implements/HealthcheckService.cs
View File

@@ -4,7 +4,7 @@ namespace Dlhis.Middle.Services.Implements;
public class HealthCheckService : IHealthCheckService
{
private bool _isOffline = false;
private bool _isOffline;
private readonly string _hostName;
private readonly ILogger<HealthCheckService> _logger;
private int _successRetry;
@@ -23,11 +23,13 @@ public class HealthCheckService : IHealthCheckService
public async Task DoHealthCheckAsync()
{
var cancellationTokenSource = new CancellationTokenSource(5000);
var tcpClient = new TcpClient();
try
{
_logger.LogDebug("tcp connecting {host} {port}", _hostName, 443);
await tcpClient.ConnectAsync(_hostName, 443);
await tcpClient.ConnectAsync(_hostName, 443, cancellationTokenSource.Token);
_retry++;
_logger.LogDebug("retry {retry}", _retry);
if (tcpClient.Connected)
@@ -44,7 +46,7 @@ public class HealthCheckService : IHealthCheckService
else
{
_logger.LogDebug("wait next check in {waitTime}", _successRetry * 1000);
await Task.Delay(_successRetry * 1000);
await Task.Delay(_successRetry * 1000, cancellationTokenSource.Token);
}
}
else
@@ -59,7 +61,6 @@ public class HealthCheckService : IHealthCheckService
{
_logger.LogError("fail cause :{reason}", ex.Message);
_isOffline = true;
await Task.Delay(5000);
}
}
}

9
Src/Dlhis.Visitor/Appointment/Request/AppointmentPageRequest.cs
View File

@@ -1,9 +0,0 @@
using Kurisu.AspNetCore.CustomClass;
using Kurisu.AspNetCore.DataAccess.Dto;
namespace Dlhis.Visitor.Appointment.Request;
public class AppointmentPageRequest : PageDto
{
public DateTimePeriod SearchDateTimePeriod { get; set; }
}

56
Src/Dlhis.Visitor/Appointment/Response/AppointmentDetailResponse.cs
View File

@@ -1,56 +0,0 @@
using Dlhis.Entity.Visitor.Enums;
using Kurisu.AspNetCore.Utils.Extensions;
namespace Dlhis.Visitor.Appointment.Response;
public class AppointmentDetailResponse
{
public long Id { get; set; }
public long AppointmentId { get; set; }
/// <summary>
/// 流水号
/// </summary>
public string FlowId { get; set; }
/// <summary>
/// 访客名称
/// </summary>
public string Name { get; set; }
/// <summary>
/// 手机号
/// </summary>
public string Phone { get; set; }
/// <summary>
/// 身份证
/// </summary>
public string IdNo { get; set; }
/// <summary>
/// 预计到达
/// </summary>
public DateTime Start { get; set; }
/// <summary>
/// 预计离开
/// </summary>
public DateTime End { get; set; }
/// <summary>
/// 状态
/// </summary>
public AppointmentDetailEnumType Status { get; set; }
/// <summary>
/// 状态
/// </summary>
public string StatusDesc => Status.GetDescription();
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
}

22
Src/Dlhis.Visitor/Appointment/Response/AppointmentPageResponse.cs
View File

@@ -1,22 +0,0 @@
namespace Dlhis.Visitor.Appointment.Response;
public class AppointmentPageResponse
{
public string FlowId { get; set; }
public string Title { get; set; }
public string Code { get; set; }
public string Name { get; set; }
public string Description { get; set; }
public string DepartmentNo { get; set; }
public string DepartmentName { get; set; }
public string Company { get; set; }
public DateTime ApplyTime { get; set; }
}

13
Src/Dlhis.Visitor/Appointment/Services/IAppointmentAreaService.cs
View File

@@ -1,13 +0,0 @@
using Dlhis.Visitor.Appointment.Request;
using Dlhis.Visitor.Appointment.Response;
using Kurisu.AspNetCore.DataAccess.Dto;
namespace Dlhis.Visitor.Appointment.Services;
public interface IAppointmentAreaService : IScopeDependency
{
Task<Pagination<ApponintmentAreaPageResponse>> GetPageAsync(PageDto request);
Task SaveAsync(AppointmentAreaSaveRequest request);
Task DeleteAsync(long id);
Task AssignAsync(AppointmentAreaAssignRequest request);
}

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

@@ -1,129 +0,0 @@
// 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.CustomClass;
// using Kurisu.AspNetCore.DataAccess.Dto;
// using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
// using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
// using Kurisu.AspNetCore.Utils.Extensions;
// using Microsoft.AspNetCore.DataProtection;
// using Microsoft.AspNetCore.Mvc;
// using SqlSugar;
//
// namespace Dlhis.Visitor.Appointment.Services.Implements;
//
// public class AppointmentService : IAppointmentService
// {
// private readonly IDbContext _dbContext;
// private readonly IDataProtectionProvider _dataProtectionProvider;
//
// public AppointmentService(IDbContext dbContext, IDataProtectionProvider dataProtectionProvider)
// {
// _dbContext = dbContext;
// _dataProtectionProvider = dataProtectionProvider;
// }
//
// public async Task<Pagination<AppointmentPageResponse>> GetPageAsync(AppointmentPageRequest request)
// {
// 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)
// .WhereIF(request.Search.IsPresent(), x => x.Code == request.Search || x.Name == request.Search)
// .Select<AppointmentPageResponse>()
// .ToPageListAsync(request);
// }
//
// public async Task<List<AppointmentDetailResponse>> GetAppointmentDetailsByIdAsync(long id)
// {
// return await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
// .Where(x => x.AppointmentId == id)
// .Select<AppointmentDetailResponse>()
// .ToListAsync();
// }
//
// public async Task ConfirmAsync(AppointmentConfirmRequest request)
// {
// 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).SingleAsync();
//
// //当前分配的设备codes
// var deviceCodes = await _dbContext.Queryable<AppointmentAreaAssignmentEntity>()
// .Where(x => x.CustomCode == mst.AreaCustomCode)
// .Select(x => x.DeviceCode)
// .ToListAsync();
//
// var deviceUniqueNos = await _dbContext.Queryable<DeviceEntity>().Where(x => deviceCodes.Contains(x.Code)).Select(x => x.UniqueNo).ToListAsync();
//
// var userNo = detail.IsExternal
// ? await _dbContext.Queryable<GainfoExternalEntity>().Where(x => x.IdNo == detail.IdNo).Select(x => x.No).FirstAsync()
// : await _dbContext.Queryable<GainfoEntity>().Where(x => x.IdNo == detail.IdNo).Select(x => x.No).FirstAsync();
//
// await _dbContext.InsertAsync(deviceUniqueNos.Select(x => new DeviceTaskEntity
// {
// CancellationId = 0,
// DeviceType = DeviceTypeEnumType.Door,
// DeviceUniqueNo = x,
// Status = DeviceTaskStatusEnumType.Wait,
// UserNo = userNo,
// Type = DeviceTaskEnumType.Add,
// Priority = 100,
// Source = DeviceTaskSourceEnumType.Appointment,
// Version = 0
// }).ToList());
//
// detail.Status = AppointmentDetailEnumType.Arrived;
// await _dbContext.UpdateAsync(detail);
// }
//
//
// //********************************************************** 用户操作 *******************************************************************
//
// public async Task<AppointmentDetailResponse> GetTodayByIdNoAsync(string idNo)
// {
// var protector = _dataProtectionProvider.CreateProtector("gainfo:external:idno");
// try
// {
// idNo = protector.Unprotect(idNo);
// }
// catch (Exception)
// {
// throw new UserFriendlyException("凭证有误");
// }
//
// 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();
//
// return detail;
// }
//
// public async Task<Pagination<AppointmentDetailResponse>> GetRecordPageByIdNoAsync([FromQuery] AppointmentIdNoPageRequest request)
// {
// var protector = _dataProtectionProvider.CreateProtector("gainfo:external:idno");
// try
// {
// request.IdNo = protector.Unprotect(request.IdNo);
// }
// catch (Exception)
// {
// throw new UserFriendlyException("凭证有误");
// }
//
// var page = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
// .Where(x => x.IdNo == request.IdNo)
// .OrderBy(x => x.Start)
// .Select<AppointmentDetailResponse>()
// .ToPageListAsync(request);
//
// return page;
// }
// }