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

fix 移除无用代码

Browse Source
This commit is contained in:
liguoyang
2024-05-31 16:04:41 +08:00
parent fc0da62986
commit abe6a52ee1
9 changed files with 70 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs
View File

@@ -115,16 +115,6 @@ public class DevicePageResponse
}
}
/// <summary>
/// 消费总额
/// </summary>
public decimal Amount { get; set; }
/// <summary>
/// 消费人次
/// </summary>
public int UserCount { get; set; }
/// <summary>
/// 营业点code
/// </summary>

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

@@ -54,30 +54,6 @@ public class DeviceService : IDeviceService
}, true)
.ToPageListAsync(request);
var deviceUniqueNos = page.Data.Select(x => x.UniqueNo).ToList();
var balanceInfos = await _dbContext.Queryable<BalanceRecordEntity>().Where(x => x.Type == BalanceRecordTypeEnumType.Out)
.Where(x=>x.Status == BalanceRecordStatusEnumType.Valid)
.Where(x => deviceUniqueNos.Contains(x.DeviceUniqueNo))
.Select(x => new
{
x.DeviceUniqueNo,
Amount = SqlFunc.AggregateSum(x.Amount),
UserCount = SqlFunc.AggregateDistinctCount(x.UserCode)
})
.GroupBy(x => x.DeviceUniqueNo)
.ToListAsync();
page.Data.ForEach(device =>
{
var info = balanceInfos.FirstOrDefault(x => x.DeviceUniqueNo == device.UniqueNo);
if (info != null)
{
device.Amount = info.Amount;
device.UserCount = info.UserCount;
}
});
return page;
}
@@ -180,7 +156,7 @@ public class DeviceService : IDeviceService
private async Task GenerateUploadRecordLogForBeginTimeAsync(DeviceEntity entity)
{
if (entity.Type == DeviceTypeEnumType.Door || entity.Type == DeviceTypeEnumType.Attendance)
if (entity.Type is DeviceTypeEnumType.Door or DeviceTypeEnumType.Attendance)
{
var exists = await _dbContext.Queryable<DeviceUploadLogEntity>()
.Where(x => x.DeviceUniqueNo == entity.UniqueNo)
@@ -244,10 +220,6 @@ public class DeviceService : IDeviceService
{
throw new UserFriendlyException("连接信息参数格式不正确");
}
catch (Exception)
{
throw;
}
}

2
Src/Dlhis.Basic/Organization/Controllers/GainfoCardsController.cs
View File

@@ -29,7 +29,7 @@ public class GainfoCardsController : ControllerBase
/// <returns></returns>
[HttpPost("change")]
[Transactional]
public async Task ChangeCardAsync(ChangeCardRequest request)
public async Task ChangeCardAsync(GainfoChangeCardRequest request)
{
await _gainfoCardService.ChangeCardAsync(request);
}

17
Src/Dlhis.Basic/Organization/Request/ChangeCardRequest.cs
View File

@@ -1,17 +0,0 @@
using System.ComponentModel.DataAnnotations;
namespace Dlhis.Basic.Organization.Request;
public class ChangeCardRequest
{
[Required]
public string UserNo { get; set; }
[Required]
public string CardNo { get; set; }
[Required]
public string Reason { get; set; }
public string Remark { get; set; }
}

29
Src/Dlhis.Basic/Organization/Request/GainfoChangeCardRequest.cs Normal file
View File

@@ -0,0 +1,29 @@
using System.ComponentModel.DataAnnotations;
namespace Dlhis.Basic.Organization.Request;
public class GainfoChangeCardRequest
{
/// <summary>
/// 档案号
/// </summary>
[Required(ErrorMessage = "档案号不能为空")]
public string UserNo { get; set; }
/// <summary>
/// 卡号
/// </summary>
[Required(ErrorMessage = "卡号不能为空")]
public string CardNo { get; set; }
/// <summary>
/// 事由
/// </summary>
[Required(ErrorMessage = "事由不能为空")]
public string Reason { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
}

14
Src/Dlhis.Basic/Organization/Services/IGainfoCardService.cs
View File

@@ -5,7 +5,17 @@ namespace Dlhis.Basic.Organization.Services;
public interface IGainfoCardService
{
Task ChangeCardAsync(ChangeCardRequest request);
/// <summary>
/// 换卡
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
Task ChangeCardAsync(GainfoChangeCardRequest request);
/// <summary>
/// 获取换卡记录
/// </summary>
/// <param name="userNo"></param>
/// <returns></returns>
Task<List<ChangeCardResponse>> GetChangeRecordsAsync(string userNo);
}
}

39
Src/Dlhis.Basic/Organization/Services/Implements/GainfoCardService.cs
View File

@@ -3,6 +3,7 @@ using Dlhis.Basic.Organization.Response;
using Dlhis.Entity.Basic.Entity;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
using Kurisu.AspNetCore.Utils.Extensions;
using Mapster;
namespace Dlhis.Basic.Organization.Services.Implements;
@@ -17,7 +18,7 @@ public class GainfoCardService : IGainfoCardService
_gainfoStore = gainfoStore;
}
public async Task ChangeCardAsync(ChangeCardRequest request)
public async Task ChangeCardAsync(GainfoChangeCardRequest request)
{
var gainfo = await _gainfoStore.Queryable().Where(x => x.No == request.UserNo).FirstAsync();
gainfo.ThrowIfNull("档案不存在");
@@ -25,30 +26,24 @@ public class GainfoCardService : IGainfoCardService
gainfo.CardNo = request.CardNo;
await _gainfoStore.UpdateAsync(gainfo);
await _dbContext.InsertAsync(new GainfoCardRecordEntity
{
UserNo = request.UserNo,
CardNo = request.CardNo,
Reason = request.Reason,
Remark = request.Remark,
});
await _dbContext.InsertAsync(request.Adapt<GainfoCardRecordEntity>());
}
public async Task<List<ChangeCardResponse>> GetChangeRecordsAsync(string userNo)
{
return await _dbContext.Queryable<GainfoCardRecordEntity>()
.LeftJoin<GainfoEntity>((x, ga) => x.UserNo == ga.No)
.Where(x => x.UserNo == userNo)
.Select((x, ga) => new ChangeCardResponse
{
UserNo = x.UserNo,
UserCode = ga.Code,
UserName = ga.Name,
CardNo = x.CardNo,
Reason = x.Reason,
Remark = x.Remark,
CreateTime = x.CreateTime,
})
.ToListAsync();
.LeftJoin<GainfoEntity>((x, ga) => x.UserNo == ga.No)
.Where(x => x.UserNo == userNo)
.Select((x, ga) => new ChangeCardResponse
{
UserNo = x.UserNo,
UserCode = ga.Code,
UserName = ga.Name,
CardNo = x.CardNo,
Reason = x.Reason,
Remark = x.Remark,
CreateTime = x.CreateTime
})
.ToListAsync();
}
}
}

73
Src/Dlhis.Basic/Organization/Services/Implements/GainfoPermissionService.cs
View File

@@ -4,8 +4,6 @@ using Dlhis.Basic.Organization.Request;
using Dlhis.Basic.Organization.Response;
using Dlhis.Basic.Places.Response;
using Dlhis.Entity.Basic.Entity;
using Dlhis.Entity.Canteen.Entities;
using Dlhis.Entity.Canteen.Enums;
using Dlhis.Entity.Device.Entities;
using Dlhis.Entity.Device.Enums;
using Dlhis.Entity.Sys.Enums;
@@ -13,7 +11,6 @@ using Kurisu.AspNetCore.DataAccess.Dto;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
using Kurisu.AspNetCore.Utils.Extensions;
using SqlSugar;
namespace Dlhis.Basic.Organization.Services.Implements;
@@ -80,19 +77,15 @@ public class GainfoPermissionService : IGainfoPermissionService
var groups = RecursionGetNext(currentGroup, deviceGroups).ToList();
//用户所有deviceCode权限
var deviceCodes = await _devicePermissionService.GetAssignDeviceCodesAsync(userNo);
var lst = new List<GetDevicesUnderGroupByUserNoResponse>();
foreach (var groupcode in groups)
return groups.Select(groupCode =>
{
var nos = await _dbContext.Queryable<DeviceGroupRelationshipEntity>()
var nos = _dbContext.Queryable<DeviceGroupRelationshipEntity>()
.LeftJoin<DeviceEntity>((x, d) => x.DeviceCode == d.Code)
.Where(x => groupcode == x.GroupCode)
.Where(x => groupCode == x.GroupCode)
.Select((x, d) => d.UniqueNo)
.ToListAsync();
.ToList();
var page = await _dbContext.Queryable<DeviceEntity>()
var page = _dbContext.Queryable<DeviceEntity>()
.LeftJoin<DeviceTemplateEntity>((d, dt) => d.TemplateCode == dt.Code)
.LeftJoin<DeviceRegistryEntity>((d, dt, dr) => d.UniqueNo == dr.DeviceUniqueNo)
.LeftJoin<BusinessPlaceEntity>((d, dt, dr, bp) => dr.BusinessPlaceCode == bp.Code)
@@ -114,39 +107,14 @@ public class GainfoPermissionService : IGainfoPermissionService
ConnectionInfo = d.ConnectionInfo,
Enable = d.Enable,
})
.ToListAsync();
var deviceUniqueNos = page.Select(x => x.UniqueNo).ToList();
.ToList();
var balanceInfos = await _dbContext.Queryable<BalanceRecordEntity>().Where(x => x.Type == BalanceRecordTypeEnumType.Out)
.Where(x => deviceUniqueNos.Contains(x.DeviceUniqueNo))
.Select(x => new
{
x.DeviceUniqueNo,
Amount = SqlFunc.AggregateSum(x.Amount),
UserCount = SqlFunc.AggregateDistinctCount(x.UserCode)
})
.GroupBy(x => x.DeviceUniqueNo)
.ToListAsync();
page.ForEach(device =>
return new GetDevicesUnderGroupByUserNoResponse
{
var info = balanceInfos.FirstOrDefault(x => x.DeviceUniqueNo == device.UniqueNo);
if (info != null)
{
device.Amount = info.Amount;
device.UserCount = info.UserCount;
}
});
var res = new GetDevicesUnderGroupByUserNoResponse
{
GroupCode = groupcode,
GroupCode = groupCode,
Devices = page
};
lst.Add(res);
}
return lst;
}).ToList();
}
public async Task<Pagination<DevicePageResponse>> GetAssignDeviceCodesAsync(DeviceAssRequest request)
@@ -170,29 +138,6 @@ public class GainfoPermissionService : IGainfoPermissionService
}, true)
.ToPageListAsync(request);
var deviceUniqueNos = page.Data.Select(x => x.UniqueNo).ToList();
var balanceInfos = await _dbContext.Queryable<BalanceRecordEntity>().Where(x => x.Type == BalanceRecordTypeEnumType.Out)
.Where(x => deviceUniqueNos.Contains(x.DeviceUniqueNo))
.Select(x => new
{
x.DeviceUniqueNo,
Amount = SqlFunc.AggregateSum(x.Amount),
UserCount = SqlFunc.AggregateDistinctCount(x.UserCode)
})
.GroupBy(x => x.DeviceUniqueNo)
.ToListAsync();
page.Data.ForEach(device =>
{
var info = balanceInfos.FirstOrDefault(x => x.DeviceUniqueNo == device.UniqueNo);
if (info != null)
{
device.Amount = info.Amount;
device.UserCount = info.UserCount;
}
});
return page;
}

2
Src/Dlhis.Sys/Identity/Services/Implements/RoleService.cs
View File

@@ -88,7 +88,7 @@ public class RoleService : IRoleService
if (request.RoleId.HasValue)
{
var existsRole = await _dbContext.Queryable<RoleEntity>().Where(x => x.Id == request.RoleId).AnyAsync();
existsUser.ThrowIfFalse("分配的角色不存在");
existsRole.ThrowIfFalse("分配的角色不存在");
if (userRole == null)
{