diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Controller/MealSupplementRecordController.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Controller/MealSupplementRecordController.cs new file mode 100644 index 00000000..5e0a8418 --- /dev/null +++ b/Src/Dlhis.Canteen/MealSupplementRecord/Controller/MealSupplementRecordController.cs @@ -0,0 +1,35 @@ +using Dlhis.Canteen.MealSupplementRecord.Request; +using Dlhis.Canteen.MealSupplementRecord.Response; +using Dlhis.Canteen.MealSupplementRecord.Services; +using Kurisu.Core.DataAccess.Dto; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; + +namespace Dlhis.Canteen.MealSupplementRecord.Controller; + +/// +/// 原始餐补 +/// +[Authorize] +[Route("api/[controller]")] +[ApiController] +public class MealSupplementRecordController +{ + private readonly IMealSupplementRecordService _mealSupplementRecordService; + + public MealSupplementRecordController(IMealSupplementRecordService mealSupplementRecordService) + { + _mealSupplementRecordService = mealSupplementRecordService; + } + + /// + /// 餐补分页 + /// + /// + /// + [HttpGet("page")] + public async Task> MealSupplementRecordPageAsync([FromQuery] MealSupplementRecordRequest request) + { + return await _mealSupplementRecordService.GetPageAsync(request); + } +} diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Request/MealSupplementRecordRequest.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Request/MealSupplementRecordRequest.cs new file mode 100644 index 00000000..93d14930 --- /dev/null +++ b/Src/Dlhis.Canteen/MealSupplementRecord/Request/MealSupplementRecordRequest.cs @@ -0,0 +1,8 @@ +using Kurisu.Core.DataAccess.Dto; + +namespace Dlhis.Canteen.MealSupplementRecord.Request; + +public class MealSupplementRecordRequest : PageDto +{ + +} diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Response/MealSupplementRecordResponse.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Response/MealSupplementRecordResponse.cs new file mode 100644 index 00000000..fe39466d --- /dev/null +++ b/Src/Dlhis.Canteen/MealSupplementRecord/Response/MealSupplementRecordResponse.cs @@ -0,0 +1,64 @@ +using Dlhis.Entity.Basic.Enums; +using SqlSugar.DbConvert; +using SqlSugar; +using Kurisu.AspNetCore.Utils.Extensions; + +namespace Dlhis.Canteen.MealSupplementRecord.Response; + +public class MealSupplementRecordResponse +{ + /// + /// 唯一号 + /// + public string UniqueId { get; set; } + + /// + /// 工号 + /// + public string Code { get; set; } + + public string UserName { get; set; } + + /// + /// 餐补状态 + /// + public MealSupplementStatusEnumtype Status { get; set; } + + /// + /// 餐补状态 + /// + public string StatusDesc => Status.GetDescription(); + + /// + /// 考勤日期 + /// + public DateTime Date { get; set; } + + /// + /// 工作地 + /// + public string Workplace { get; set; } + + /// + /// 厂区 + /// + public string Factory { get; set; } + + + public string Remark { get; set; } + + /// + /// 餐补 + /// + public decimal Amount { get; set; } + + /// + /// 处理结果 + /// + public string Result { get; set; } + + /// + /// 状态同步 + /// + public bool Sync { get; set; } +} diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Services/IMealSupplementRecordService.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Services/IMealSupplementRecordService.cs new file mode 100644 index 00000000..89c1624c --- /dev/null +++ b/Src/Dlhis.Canteen/MealSupplementRecord/Services/IMealSupplementRecordService.cs @@ -0,0 +1,10 @@ +using Dlhis.Canteen.MealSupplementRecord.Request; +using Dlhis.Canteen.MealSupplementRecord.Response; +using Kurisu.Core.DataAccess.Dto; + +namespace Dlhis.Canteen.MealSupplementRecord.Services; + +public interface IMealSupplementRecordService : IScopeDependency +{ + Task> GetPageAsync(MealSupplementRecordRequest request); +} diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs new file mode 100644 index 00000000..2d1630ee --- /dev/null +++ b/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs @@ -0,0 +1,46 @@ +using Dlhis.Canteen.MealSupplementRecord.Request; +using Dlhis.Canteen.MealSupplementRecord.Response; +using Dlhis.Canteen.MealSupplementRecord.Services; +using Dlhis.Entity.Basic.Entity; +using Dlhis.Entity.Canteen.Entities; +using Kurisu.AspNetCore.Utils.Extensions; +using Kurisu.Core.DataAccess.Dto; +using Kurisu.SqlSugar.Extensions; +using Kurisu.SqlSugar.Services; + +namespace Dlhis.Canteen.MealSupplementRecord.Services.Implements; + +public class MealSupplementRecordService : IMealSupplementRecordService +{ + + private readonly IDbContext _dbContext; + + public MealSupplementRecordService(IDbContext dbContext) + { + _dbContext = dbContext; + } + + public async Task> GetPageAsync(MealSupplementRecordRequest request) + { + var page = await _dbContext.Queryable() + .LeftJoin((x, ga) => x.Code == ga.Code) + .WhereIF(request.Search.IsPresent(), (x, ga) => x.Code == request.Search || ga.Name.Contains(request.Search)) + .Select((x, ga) => new MealSupplementRecordResponse + { + Amount = x.Amount, + Code = x.Code, + Date = x.Date, + Factory = x.Factory, + Remark = x.Remark, + Result = x.Result, + Status = x.Status, + Sync = x.Sync, + UniqueId = x.UniqueId, + UserName = ga.Name, + Workplace = x.Workplace, + }) + .ToPageListAsync(request); + + return page; + } +} diff --git a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs index 3a6f2f69..f55573a0 100644 --- a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs +++ b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs @@ -25,10 +25,11 @@ public class BalancesController : ControllerBase } /// - /// 获取记录分页 + /// 获取所有消费记录分页 /// /// /// + [Authorize(Roles = "admin,tenant-admin")] [DataPermission] [HttpGet] public async Task> GetPageAsync([FromQuery] BalanceRecordPageRequest request) @@ -154,7 +155,7 @@ public class BalancesController : ControllerBase /// /// [HttpGet("spendingDetails")] - public async Task> GetSpendingDetailsAsync([FromQuery]SpendingDetailRequest request) + public async Task> GetSpendingDetailsAsync([FromQuery] SpendingDetailRequest request) { return await _balanceService.GetSpendingDetailsAsync(request); } @@ -182,36 +183,13 @@ public class BalancesController : ControllerBase } /// - /// 查询餐补 + /// 查询餐补入账记录 /// /// /// - [HttpGet("balanceRecordByUser")] - public async Task> BalanceRecordByUserAsync([FromQuery]BalanceRecordByUserRequest request) + [HttpGet("balanceOfMealSupplementRecordByUser")] + public async Task> BalanceRecordByUserAsync([FromQuery] BalanceRecordByUserRequest request) { - return await _balanceService.BalanceRecordByUserAsync(request); + return await _balanceService.GetBalanceOfMealSupplementRecordByUser(request); } - - - /// - /// 电子餐券申请记录查询 - /// - /// - [HttpGet("oaemealvoucher")] - public async Task> GetOaEMealVoucherAsync([FromQuery] OaEMealVoucherRequest request) - { - return await _balanceService.GetOaEMealVoucherAsync(request); - } - - /// - /// 电子餐券使用记录查询 - /// - /// - /// - [HttpGet("oaemealvoucherdetail")] - public async Task> GetOaEMealVoucherDetailAsync([FromQuery] OaEMealVoucherDetailRequest request) - { - return await _balanceService.GetOaEMealVoucherDetailAsync(request); - } - } diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceRecordByUserRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceRecordByUserRequest.cs index 877cb0d4..dded4745 100644 --- a/Src/Dlhis.Canteen/Order/Request/BalanceRecordByUserRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/BalanceRecordByUserRequest.cs @@ -1,8 +1,11 @@ using Kurisu.Core.DataAccess.Dto; -namespace Dlhis.Canteen.Order.Request +namespace Dlhis.Canteen.Order.Request; + +public class BalanceRecordByUserRequest : PageDto { - public class BalanceRecordByUserRequest : PageDto - { - } + /// + /// 用户档案号 + /// + public string UserNo { get; set; } } diff --git a/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherDetailRequest.cs b/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherDetailRequest.cs deleted file mode 100644 index 216f85b1..00000000 --- a/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherDetailRequest.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Kurisu.Core.DataAccess.Dto; - -namespace Dlhis.Canteen.Dishes.Request -{ - public class OaEMealVoucherDetailRequest : PageDto - { - /// - /// 餐券id - /// - public long? OaEMealVoucherId { get; set; } - } -} diff --git a/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherRequest.cs b/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherRequest.cs deleted file mode 100644 index 232b4eeb..00000000 --- a/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherRequest.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Dlhis.Entity.Canteen.Enums; -using Kurisu.Core.DataAccess.Dto; -using System.ComponentModel.DataAnnotations; - -namespace Dlhis.Canteen.Dishes.Request -{ - public class OaEMealVoucherRequest : PageDto - { - } -} diff --git a/Src/Dlhis.Canteen/Order/Response/BalanceRecordByUserResponse.cs b/Src/Dlhis.Canteen/Order/Response/BalanceRecordByUserResponse.cs index 8c8cb4f4..9afd46b3 100644 --- a/Src/Dlhis.Canteen/Order/Response/BalanceRecordByUserResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/BalanceRecordByUserResponse.cs @@ -3,147 +3,27 @@ using SqlSugar.DbConvert; using SqlSugar; using Kurisu.AspNetCore.Utils.Extensions; -namespace Dlhis.Canteen.Order.Response +namespace Dlhis.Canteen.Order.Response; + +public class BalanceRecordByUserResponse { - public class BalanceRecordByUserResponse - { - /// - /// 流水号 - /// - public string No { get; set; } + /// + /// 流水号 + /// + public string No { get; set; } - /// - /// 档案号/QRCode - /// - public string UserNo { get; set; } + /// + /// 金额 + /// + public decimal Amount { get; set; } - /// - /// 姓名 - /// - public string Name { get; set; } + /// + /// 消费时间 + /// + public DateTime CostDateTime { get; set; } - /// - /// 学工号 - /// - public string UserCode { get; set; } - - /// - /// 部门号 - /// - public string DepartmentNo { get; set; } - - /// - /// 来源 - /// - public BalanceRecordSourceEnumType Source { get; set; } - - /// - /// 来源CN - /// - public string SourceCN => Source.GetDescription(); - - /// - /// 收入/支出 - /// - public BalanceRecordTypeEnumType Type { get; set; } - - /// - /// 收入/支出 - /// - public string TypeCN => Type.GetDescription(); - - /// - /// 金额 + - 表示 - /// - public decimal Amount { get; set; } - - - /// - /// 营业点 - /// - public Guid? BusinessPlaceCode { get; set; } - - /// - /// 餐别 - /// - public Guid? BusinessShiftCode { get; set; } - - /// - /// 餐次 - /// - public ShiftEnumType? ShiftType { get; set; } - - /// - /// 餐次CN - /// - public string ShiftTypeCN => ShiftType.GetDescription(); - - /// - /// 所属成本日期 - /// - public DateTime CostDate { get; set; } - - /// - /// 消费机器唯一信息 - /// - public string DeviceUniqueNo { get; set; } - - /// - /// 餐补月份 - /// - public string SubsidiesFromMonth { get; set; } - - /// - /// Ip - /// - public string IP { get; set; } - - /// - /// 成本中心 - /// - public string CostId { get; set; } - - /// - /// 消费者所在基地 - /// - public string OriginTenantId { get; set; } - - /// - /// 成本计算是否允许跨基地范围 - /// - public bool IsCostCrossTenant { get; set; } - - /// - /// 数据状态 - /// - public BalanceRecordStatusEnumType Status { get; set; } - - /// - /// 数据状态CN - /// - public string StatusCN => Status.GetDescription(); - - /// - /// 消费时间 - /// - public DateTime CostDateTime { get; set; } - - /// - /// 备注 - /// - public string Remark { get; set; } - - /// - /// 餐饮应用类型 - /// - public CanteenApplicaitonTypeEnumType ApplicationType { get; set; } - - /// - /// 餐饮应用类型CN - /// - public string ApplicationTypeCN => ApplicationType.GetDescription(); - - - public string TenantId { get; set; } - } + /// + /// 备注 + /// + public string Remark { get; set; } } diff --git a/Src/Dlhis.Canteen/Order/Response/OaEMealVoucherDetailResponse.cs b/Src/Dlhis.Canteen/Order/Response/OaEMealVoucherDetailResponse.cs deleted file mode 100644 index d57c1e7e..00000000 --- a/Src/Dlhis.Canteen/Order/Response/OaEMealVoucherDetailResponse.cs +++ /dev/null @@ -1,65 +0,0 @@ -using SqlSugar; - -namespace Dlhis.Canteen.Order.Response -{ - public class OaEMealVoucherDetailResponse - { - public long Id { get; set; } - - public long VoucherId { get; set; } - - public int Sequence { get; set; } - - public string DinnerType { get; set; } - - /// - /// 身份证 - /// - public string IdNo { get; set; } - - /// - /// 用餐人 - /// - public string Name { get; set; } - - /// - /// 手机号 - /// - public string Phone { get; set; } - - /// - /// 就餐开始 - /// - public DateTime Start { get; set; } - - /// - /// 就餐结束 - /// - public DateTime End { get; set; } - - /// - /// 就餐天数 - /// - public int Days { get; set; } - - /// - /// 金额 - /// - public decimal Amount { get; set; } - - /// - /// 二维码 - /// - public string QrCode { get; set; } - - /// - /// 状态 - /// - public string Status { get; set; } - - /// - /// 信息 - /// - public string Message { get; set; } - } -} diff --git a/Src/Dlhis.Canteen/Order/Response/OaEMealVoucherResponse.cs b/Src/Dlhis.Canteen/Order/Response/OaEMealVoucherResponse.cs deleted file mode 100644 index d21260fd..00000000 --- a/Src/Dlhis.Canteen/Order/Response/OaEMealVoucherResponse.cs +++ /dev/null @@ -1,97 +0,0 @@ -namespace Dlhis.Canteen.Order.Response; - -public class OaEMealVoucherResponse -{ - public long Id { get; set; } - - /// - /// 标题 - /// - public string Title { get; set; } - - /// - /// 申请人工号 - /// - public string UserCode { get; set; } - - /// - /// 申请人名称 - /// - public string Name { get; set; } - - /// - /// 基地代码 - /// - public string TenantId { get; set; } - - /// - /// 基地名称 - /// - public string TenantName { get; set; } - - /// - /// 成本中心 - /// - public string CostId { get; set; } - - /// - /// 成本中心名称 - /// - public string CostName { get; set; } - - /// - /// 来宾公司 - /// - public string Company { get; set; } - - /// - /// 联系人 - /// - public string Phone { get; set; } - - /// - /// 来宾人数 - /// - public int Num { get; set; } - - /// - /// 就餐食堂 - /// - public string Canteen { get; set; } - - /// - /// 就餐事由 - /// - public string Reason { get; set; } - - /// - /// 就餐次 - /// - public string CanteenShift { get; set; } - - /// - /// oa流程id - /// - public string OaId { get; set; } - - /// - /// 部门号 - /// - public string DepartmentNo { get; set; } - - /// - /// 部门名称 - /// - public string DepartmentName { get; set; } - - - /// - /// 申请日期 - /// - public DateTime LogDate { get; set; } - - /// - /// 数据创建时间 - /// - public DateTime CreateTime { get; set; } -} diff --git a/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs b/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs index 53d4c688..5d846bbc 100644 --- a/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs @@ -35,8 +35,5 @@ public interface IBalanceService : IScopeDependency Task> GetConsumeDeviceAsync(GetConsumeDeviceRequest request); - Task> GetOaEMealVoucherAsync([FromQuery] OaEMealVoucherRequest request); - - Task> GetOaEMealVoucherDetailAsync([FromQuery] OaEMealVoucherDetailRequest request); - Task> BalanceRecordByUserAsync(BalanceRecordByUserRequest request); + Task> GetBalanceOfMealSupplementRecordByUser(BalanceRecordByUserRequest request); } diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index aa177030..b669579f 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -744,13 +744,14 @@ public class BalanceService : IBalanceService return page; } - public async Task> BalanceRecordByUserAsync(BalanceRecordByUserRequest request) + public async Task> GetBalanceOfMealSupplementRecordByUser(BalanceRecordByUserRequest request) { var page = await _dbContext.Queryable() - .WhereIF(request.Search.IsPresent(), b => b.UserNo == request.Search || b.UserCode == request.Search) - .Where(b => b.Source == BalanceRecordSourceEnumType.LocalTenantSubsidies || b.Source == BalanceRecordSourceEnumType.OtherTenantSubsidies) + .Where(x => x.Source == BalanceRecordSourceEnumType.LocalTenantSubsidies || x.Source == BalanceRecordSourceEnumType.OtherTenantSubsidies) + .Where(x => x.UserNo == request.UserNo) .Select() .ToPageListAsync(request); + return page; } @@ -851,27 +852,6 @@ public class BalanceService : IBalanceService return list; } - - public async Task> GetOaEMealVoucherAsync(OaEMealVoucherRequest request) - { - var page = await _dbContext.Queryable() - .WhereIF(request.Search.IsPresent(),x => x.UserCode.Contains(request.Search) || x.Name.Contains(request.Search)) - .Select() - .ToPageListAsync(request); - return page; - } - - public async Task> GetOaEMealVoucherDetailAsync(OaEMealVoucherDetailRequest request) - { - var page = await _dbContext.Queryable() - .WhereIF(request.Search.IsPresent(),x => x.Name.Contains(request.Search)) - .WhereIF(request.OaEMealVoucherId.HasValue, x => x.VoucherId == request.OaEMealVoucherId) - .Select() - .ToPageListAsync(request); - - return page; - } - /// /// 获取当前年所有月 /// diff --git a/Src/Dlhis.Common/ApiLog/ApiLogController.cs b/Src/Dlhis.Common/ApiLog/Controller/ApiLogController.cs similarity index 83% rename from Src/Dlhis.Common/ApiLog/ApiLogController.cs rename to Src/Dlhis.Common/ApiLog/Controller/ApiLogController.cs index 355730be..91478b33 100644 --- a/Src/Dlhis.Common/ApiLog/ApiLogController.cs +++ b/Src/Dlhis.Common/ApiLog/Controller/ApiLogController.cs @@ -1,11 +1,11 @@ -using Dlhis.Common.Request; -using Dlhis.Common.Response; -using Dlhis.Common.Services.Implements; +using Dlhis.Common.ApiLog.Request; +using Dlhis.Common.ApiLog.Response; +using Dlhis.Common.ApiLog.Services.Implements; using Kurisu.Core.DataAccess.Dto; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -namespace Dlhis.Common.ApiLog +namespace Dlhis.Common.ApiLog.Controller { /// /// API日志控制器 diff --git a/Src/Dlhis.Common/Request/ApiLogRequest.cs b/Src/Dlhis.Common/ApiLog/Request/ApiLogRequest.cs similarity index 88% rename from Src/Dlhis.Common/Request/ApiLogRequest.cs rename to Src/Dlhis.Common/ApiLog/Request/ApiLogRequest.cs index ca4d00cc..c08de14e 100644 --- a/Src/Dlhis.Common/Request/ApiLogRequest.cs +++ b/Src/Dlhis.Common/ApiLog/Request/ApiLogRequest.cs @@ -1,7 +1,7 @@ using Kurisu.Core.DataAccess.Dto; using System.ComponentModel.DataAnnotations; -namespace Dlhis.Common.Request +namespace Dlhis.Common.ApiLog.Request { public class ApiLogRequest : PageDto { diff --git a/Src/Dlhis.Common/Response/ApiLogResponse.cs b/Src/Dlhis.Common/ApiLog/Response/ApiLogResponse.cs similarity index 96% rename from Src/Dlhis.Common/Response/ApiLogResponse.cs rename to Src/Dlhis.Common/ApiLog/Response/ApiLogResponse.cs index ff51f853..8d1aaf82 100644 --- a/Src/Dlhis.Common/Response/ApiLogResponse.cs +++ b/Src/Dlhis.Common/ApiLog/Response/ApiLogResponse.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Dlhis.Common.Response +namespace Dlhis.Common.ApiLog.Response { public class ApiLogResponse { diff --git a/Src/Dlhis.Common/Services/ApiLogService.cs b/Src/Dlhis.Common/ApiLog/Services/ApiLogService.cs similarity index 84% rename from Src/Dlhis.Common/Services/ApiLogService.cs rename to Src/Dlhis.Common/ApiLog/Services/ApiLogService.cs index 22c3d02c..e9d9cc66 100644 --- a/Src/Dlhis.Common/Services/ApiLogService.cs +++ b/Src/Dlhis.Common/ApiLog/Services/ApiLogService.cs @@ -1,6 +1,6 @@ -using Dlhis.Common.Request; -using Dlhis.Common.Response; -using Dlhis.Common.Services.Implements; +using Dlhis.Common.ApiLog.Request; +using Dlhis.Common.ApiLog.Response; +using Dlhis.Common.ApiLog.Services.Implements; using Dlhis.Entity.Common; using Kurisu.AspNetCore.Utils.Extensions; using Kurisu.Core.DataAccess.Dto; @@ -8,7 +8,7 @@ using Kurisu.SqlSugar.Extensions; using Kurisu.SqlSugar.Services; using SqlSugar; -namespace Dlhis.Common.Services +namespace Dlhis.Common.ApiLog.Services { public class ApiLogService : IApiLogService { @@ -20,7 +20,7 @@ namespace Dlhis.Common.Services } public async Task> GetLogsAsync(ApiLogRequest request) - { + { var logs = await _dbContext.ChangeDb("log").Queryable() .WhereIF(request.Search.IsPresent(), x => x.Message.Contains(request.Search)) .WhereIF(request.Level.HasValue, x => x.Level == request.Level) diff --git a/Src/Dlhis.Common/Services/Implements/IApiLogService.cs b/Src/Dlhis.Common/ApiLog/Services/Implements/IApiLogService.cs similarity index 59% rename from Src/Dlhis.Common/Services/Implements/IApiLogService.cs rename to Src/Dlhis.Common/ApiLog/Services/Implements/IApiLogService.cs index 4006c3b1..b8f27280 100644 --- a/Src/Dlhis.Common/Services/Implements/IApiLogService.cs +++ b/Src/Dlhis.Common/ApiLog/Services/Implements/IApiLogService.cs @@ -1,8 +1,8 @@ -using Dlhis.Common.Request; -using Dlhis.Common.Response; +using Dlhis.Common.ApiLog.Request; +using Dlhis.Common.ApiLog.Response; using Kurisu.Core.DataAccess.Dto; -namespace Dlhis.Common.Services.Implements +namespace Dlhis.Common.ApiLog.Services.Implements { public interface IApiLogService : IScopeDependency { diff --git a/Src/Dlhis.Common/Dlhis.Common.csproj b/Src/Dlhis.Common/Dlhis.Common.csproj index 02b72955..fd153a15 100644 --- a/Src/Dlhis.Common/Dlhis.Common.csproj +++ b/Src/Dlhis.Common/Dlhis.Common.csproj @@ -25,4 +25,8 @@ + + + + diff --git a/Src/Dlhis.Common/FileOperation/Controllers/ApkFileController.cs b/Src/Dlhis.Common/FileOperation/Controllers/ApkFileController.cs index 7ab679b7..a57f65ef 100644 --- a/Src/Dlhis.Common/FileOperation/Controllers/ApkFileController.cs +++ b/Src/Dlhis.Common/FileOperation/Controllers/ApkFileController.cs @@ -1,8 +1,6 @@ using Dlhis.Common.FileOperation.Request; using Dlhis.Common.FileOperation.Response; using Dlhis.Common.FileOperation.Services; -using Dlhis.Common.Request; -using Dlhis.Common.Response; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Org.BouncyCastle.Asn1.Ocsp; @@ -10,8 +8,9 @@ using Org.BouncyCastle.Asn1.Ocsp; namespace Dlhis.Common.FileOperation.Controllers; /// -/// 文件上传/下载 +/// APK文件操作 /// +[Obsolete("作废重写")] [Authorize] [Route("api/[controller]")] [ApiController] @@ -28,7 +27,7 @@ public class ApkFileController : ControllerBase /// /// /// - [HttpPost("minlo")] + [HttpPost("minio")] [RequestSizeLimit(300_000_000)] public async Task FormSingleFileUpload([FromForm] ApkRequest request) { @@ -56,9 +55,6 @@ public class ApkFileController : ControllerBase { return await _apkFIileService.GetLastVersionAsync(productCode); } - - - } diff --git a/Src/Dlhis.Common/Request/ApkRequest.cs b/Src/Dlhis.Common/FileOperation/Request/ApkRequest.cs similarity index 85% rename from Src/Dlhis.Common/Request/ApkRequest.cs rename to Src/Dlhis.Common/FileOperation/Request/ApkRequest.cs index 86156c02..aca49440 100644 --- a/Src/Dlhis.Common/Request/ApkRequest.cs +++ b/Src/Dlhis.Common/FileOperation/Request/ApkRequest.cs @@ -1,4 +1,4 @@ -namespace Dlhis.Common.Request +namespace Dlhis.Common.FileOperation.Request { public class ApkRequest { @@ -25,6 +25,6 @@ /// /// 产品代码 /// - public string? ProductCode { get; set; } + public string ProductCode { get; set; } } } diff --git a/Src/Dlhis.Common/FileOperation/Request/UploadFileReuqest.cs b/Src/Dlhis.Common/FileOperation/Request/UploadFileReuqest.cs index 1863e728..cf9cb6f4 100644 --- a/Src/Dlhis.Common/FileOperation/Request/UploadFileReuqest.cs +++ b/Src/Dlhis.Common/FileOperation/Request/UploadFileReuqest.cs @@ -4,8 +4,14 @@ namespace Dlhis.Common.FileOperation.Request; public class UploadFileReuqest { + /// + /// 路由获取 + /// [FromRoute] public string Bucket { get; set; } + /// + /// 文件 + /// public IFormFile File { get; set; } } diff --git a/Src/Dlhis.Common/Response/ApkFile1Response.cs b/Src/Dlhis.Common/FileOperation/Response/ApkFile1Response.cs similarity index 93% rename from Src/Dlhis.Common/Response/ApkFile1Response.cs rename to Src/Dlhis.Common/FileOperation/Response/ApkFile1Response.cs index 560d4356..143be5fb 100644 --- a/Src/Dlhis.Common/Response/ApkFile1Response.cs +++ b/Src/Dlhis.Common/FileOperation/Response/ApkFile1Response.cs @@ -1,6 +1,6 @@ using SqlSugar; -namespace Dlhis.Common.Response +namespace Dlhis.Common.FileOperation.Response { public class ApkFile1Response { diff --git a/Src/Dlhis.Common/Response/ApkFileFormLocalResponse.cs b/Src/Dlhis.Common/FileOperation/Response/ApkFileFormLocalResponse.cs similarity index 91% rename from Src/Dlhis.Common/Response/ApkFileFormLocalResponse.cs rename to Src/Dlhis.Common/FileOperation/Response/ApkFileFormLocalResponse.cs index 6d91bf30..b4c78bf2 100644 --- a/Src/Dlhis.Common/Response/ApkFileFormLocalResponse.cs +++ b/Src/Dlhis.Common/FileOperation/Response/ApkFileFormLocalResponse.cs @@ -1,4 +1,4 @@ -namespace Dlhis.Common.Response +namespace Dlhis.Common.FileOperation.Response { public class ApkFileFormLocalResponse { diff --git a/Src/Dlhis.Common/Services/Implements/ApkFIileService.cs b/Src/Dlhis.Common/FileOperation/Services/ApkFIileService.cs similarity index 91% rename from Src/Dlhis.Common/Services/Implements/ApkFIileService.cs rename to Src/Dlhis.Common/FileOperation/Services/ApkFIileService.cs index 03848263..2ebc1240 100644 --- a/Src/Dlhis.Common/Services/Implements/ApkFIileService.cs +++ b/Src/Dlhis.Common/FileOperation/Services/ApkFIileService.cs @@ -1,13 +1,13 @@ -using Dlhis.Common.FileOperation.Services; -using Dlhis.Common.Request; -using Dlhis.Common.Response; +using Dlhis.Common.ApiLog.Response; +using Dlhis.Common.FileOperation.Request; +using Dlhis.Common.FileOperation.Response; using Dlhis.Entity.Common; using Kurisu.AspNetCore.Utils.Extensions; using Kurisu.SqlSugar.Services; using Mapster; using Microsoft.AspNetCore.Mvc; -namespace Dlhis.Common.Services.Implements; +namespace Dlhis.Common.FileOperation.Services; public class ApkFIileService : IApkFIileService { @@ -143,7 +143,7 @@ public class ApkFIileService : IApkFIileService catch (Exception) { return null; - throw; + throw; } } /// @@ -155,7 +155,7 @@ public class ApkFIileService : IApkFIileService { var info = await _dbContext.Queryable() .Where(x => x.Name == fileName) - .OrderByDescending(x => x.VersionCode) + .OrderByDescending(x => x.VersionCode) .FirstAsync(); info.ThrowIfNull($"没有{fileName}信息"); var res = info.Adapt(); @@ -173,6 +173,16 @@ public class ApkFIileService : IApkFIileService string path = filePath + fileName; return new FileStreamResult(new FileStream(path, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName }; } + + Task IApkFIileService.FormSingleFileUpload(ApkRequest request) + { + throw new NotImplementedException(); + } + + public Task GetLastVersionAsync(string productCode) + { + throw new NotImplementedException(); + } } diff --git a/Src/Dlhis.Common/FileOperation/Services/IApkFIileService.cs b/Src/Dlhis.Common/FileOperation/Services/IApkFIileService.cs index 5dfa8536..047b8f6b 100644 --- a/Src/Dlhis.Common/FileOperation/Services/IApkFIileService.cs +++ b/Src/Dlhis.Common/FileOperation/Services/IApkFIileService.cs @@ -1,7 +1,5 @@ using Dlhis.Common.FileOperation.Request; using Dlhis.Common.FileOperation.Response; -using Dlhis.Common.Request; -using Dlhis.Common.Response; using Microsoft.AspNetCore.Mvc; namespace Dlhis.Common.FileOperation.Services; @@ -23,8 +21,6 @@ public interface IApkFIileService : IScopeDependency Task GetLastVersionAsync(string productCode); - - } diff --git a/Src/Dlhis.Common/FileOperation/Services/IMinioService.cs b/Src/Dlhis.Common/FileOperation/Services/IMinioService.cs index 7fd36cc2..f70c17f0 100644 --- a/Src/Dlhis.Common/FileOperation/Services/IMinioService.cs +++ b/Src/Dlhis.Common/FileOperation/Services/IMinioService.cs @@ -1,4 +1,4 @@ -using Dlhis.Common.Request; +using Dlhis.Common.FileOperation.Request; namespace Dlhis.Common.FileOperation.Services; diff --git a/Src/Dlhis.Common/FileOperation/Services/Implements/ApkFIileService.cs b/Src/Dlhis.Common/FileOperation/Services/Implements/ApkFIileService.cs index 4f5743aa..9b920f5c 100644 --- a/Src/Dlhis.Common/FileOperation/Services/Implements/ApkFIileService.cs +++ b/Src/Dlhis.Common/FileOperation/Services/Implements/ApkFIileService.cs @@ -1,8 +1,6 @@ using Dlhis.Common.FileOperation.Request; using Dlhis.Common.FileOperation.Response; using Dlhis.Common.FileOperation.Services; -using Dlhis.Common.Request; -using Dlhis.Common.Response; using Dlhis.Entity.Common; using Kurisu.AspNetCore.Utils.Extensions; using Kurisu.SqlSugar.Services; diff --git a/Src/Dlhis.Common/FileOperation/Services/Implements/MinioService.cs b/Src/Dlhis.Common/FileOperation/Services/Implements/MinioService.cs index 3abff519..f18cfb9c 100644 --- a/Src/Dlhis.Common/FileOperation/Services/Implements/MinioService.cs +++ b/Src/Dlhis.Common/FileOperation/Services/Implements/MinioService.cs @@ -1,6 +1,5 @@ using Dlhis.Common.FileOperation.Configurations; using Dlhis.Common.FileOperation.Request; -using Dlhis.Common.Request; using Microsoft.Extensions.Options; using Minio; using Minio.DataModel.Args; diff --git a/Src/Dlhis.Common/MealSupplementRecord/MealSupplementRecordController.cs b/Src/Dlhis.Common/MealSupplementRecord/MealSupplementRecordController.cs deleted file mode 100644 index 225243b2..00000000 --- a/Src/Dlhis.Common/MealSupplementRecord/MealSupplementRecordController.cs +++ /dev/null @@ -1,36 +0,0 @@ -using Dlhis.Common.Request; -using Dlhis.Common.Response; -using Dlhis.Common.Services; -using Kurisu.Core.DataAccess.Dto; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - -namespace Dlhis.Common.MealSupplementRecord -{ - /// - /// 餐补控制器 - /// - [Authorize] - [Route("api/[controller]")] - [ApiController] - public class MealSupplementRecordController - { - private readonly IMealSupplementRecordService _mealSupplementRecordService; - - public MealSupplementRecordController(IMealSupplementRecordService mealSupplementRecordService) - { - _mealSupplementRecordService = mealSupplementRecordService; - } - - /// - /// 餐补分页 - /// - /// - /// - [HttpGet("mealSupplementRecordPage")] - public async Task> MealSupplementRecordPageAsync([FromQuery]MealSupplementRecordRequest request) - { - return await _mealSupplementRecordService.MealSupplementRecordPageAsync(request); - } - } -} diff --git a/Src/Dlhis.Common/Request/MealSupplementRecordRequest.cs b/Src/Dlhis.Common/Request/MealSupplementRecordRequest.cs deleted file mode 100644 index ce64bcce..00000000 --- a/Src/Dlhis.Common/Request/MealSupplementRecordRequest.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Kurisu.Core.DataAccess.Dto; - -namespace Dlhis.Common.Request -{ - public class MealSupplementRecordRequest : PageDto - { - - } -} diff --git a/Src/Dlhis.Common/Response/MealSupplementRecordResponse.cs b/Src/Dlhis.Common/Response/MealSupplementRecordResponse.cs deleted file mode 100644 index c03d0277..00000000 --- a/Src/Dlhis.Common/Response/MealSupplementRecordResponse.cs +++ /dev/null @@ -1,62 +0,0 @@ -using Dlhis.Entity.Basic.Enums; -using SqlSugar.DbConvert; -using SqlSugar; -using Kurisu.AspNetCore.Utils.Extensions; - -namespace Dlhis.Common.Response -{ - public class MealSupplementRecordResponse - { - /// - /// 唯一号 - /// - public string UniqueId { get; set; } - - /// - /// 工号 - /// - public string Code { get; set; } - - /// - /// 餐补状态 - /// - public MealSupplementStatusEnumtype Status { get; set; } - - /// - /// 餐补状态CN - /// - public string StatusCN => Status.GetDescription(); - - /// - /// 考勤日期 - /// - public DateTime Date { get; set; } - - /// - /// 工作地 - /// - public string Workplace { get; set; } - - /// - /// 厂区 - /// - public string Factory { get; set; } - - public string Remark { get; set; } - - /// - /// 餐补 - /// - public decimal Amount { get; set; } - - /// - /// 处理结果 - /// - public string Result { get; set; } - - /// - /// 状态同步 - /// - public bool Sync { get; set; } - } -} diff --git a/Src/Dlhis.Common/Services/IApkFIileService.cs b/Src/Dlhis.Common/Services/IApkFIileService.cs deleted file mode 100644 index c6d9624b..00000000 --- a/Src/Dlhis.Common/Services/IApkFIileService.cs +++ /dev/null @@ -1,40 +0,0 @@ -using Dlhis.Common.Request; -using Dlhis.Common.Response; -using Microsoft.AspNetCore.Mvc; - -namespace Dlhis.Common.Services; - - public interface IApkFIileService : IScopeDependency -{ - /// - /// 文件上传 - /// - /// - /// - Task FormSingleFileUpload(ApkRequest request); - - /// - /// 文件下载 - /// - /// - Task RequestDownloadFile(string fileName); - - /// - /// 本地上传 - /// - /// - /// - Task FormLocalFileUpload(ApkRequest request); - - Task LatestFile(string fileName); - - /// - /// 本地下载 - /// - /// - /// - IActionResult FormLocalDownloadFile(string fileName); -} - - - diff --git a/Src/Dlhis.Common/Services/IMealSupplementRecordService.cs b/Src/Dlhis.Common/Services/IMealSupplementRecordService.cs deleted file mode 100644 index c193b966..00000000 --- a/Src/Dlhis.Common/Services/IMealSupplementRecordService.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Dlhis.Common.Request; -using Dlhis.Common.Response; -using Kurisu.Core.DataAccess.Dto; - -namespace Dlhis.Common.Services -{ - public interface IMealSupplementRecordService : IScopeDependency - { - Task> MealSupplementRecordPageAsync(MealSupplementRecordRequest request); - } -} diff --git a/Src/Dlhis.Common/Services/Implements/MealSupplementRecordService.cs b/Src/Dlhis.Common/Services/Implements/MealSupplementRecordService.cs deleted file mode 100644 index 60d908a3..00000000 --- a/Src/Dlhis.Common/Services/Implements/MealSupplementRecordService.cs +++ /dev/null @@ -1,31 +0,0 @@ -using Dlhis.Common.Request; -using Dlhis.Common.Response; -using Dlhis.Entity.Basic.Entity; -using Kurisu.AspNetCore.Utils.Extensions; -using Kurisu.Core.DataAccess.Dto; -using Kurisu.SqlSugar.Extensions; -using Kurisu.SqlSugar.Services; - -namespace Dlhis.Common.Services.Implements -{ - public class MealSupplementRecordService : IMealSupplementRecordService - { - - private readonly IDbContext _dbContext; - - public MealSupplementRecordService(IDbContext dbContext) - { - _dbContext = dbContext; - } - - public async Task> MealSupplementRecordPageAsync(MealSupplementRecordRequest request) - { - var page = await _dbContext.Queryable() - .WhereIF(request.Search.IsPresent(), x => x.Code.Contains(request.Search)) - .Select() - .ToPageListAsync(request); - - return page; - } - } -}