diff --git a/Dlis.Jinko.Yikatong.sln b/Dlis.Jinko.Yikatong.sln
index 254bd420..ff1fecaa 100644
--- a/Dlis.Jinko.Yikatong.sln
+++ b/Dlis.Jinko.Yikatong.sln
@@ -29,6 +29,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.Canteen", "Src\Dlhis.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.Sys.Api", "Src\Dlhis.Sys.Api\Dlhis.Sys.Api.csproj", "{85A345C7-913E-4C1B-BE1C-600DE408A02F}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dlhis.Basic.Api", "Src\Dlhis.Basic.Api\Dlhis.Basic.Api.csproj", "{1F337648-8A22-4601-A842-0F634FBA2825}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -71,6 +73,10 @@ Global
{85A345C7-913E-4C1B-BE1C-600DE408A02F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{85A345C7-913E-4C1B-BE1C-600DE408A02F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{85A345C7-913E-4C1B-BE1C-600DE408A02F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1F337648-8A22-4601-A842-0F634FBA2825}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1F337648-8A22-4601-A842-0F634FBA2825}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1F337648-8A22-4601-A842-0F634FBA2825}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1F337648-8A22-4601-A842-0F634FBA2825}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -84,6 +90,7 @@ Global
{925048C9-5940-4B51-8480-4DC908C754A1} = {57074FD8-1A2F-40C7-8476-001778A3F65D}
{8317C526-3523-4195-9B19-2F17CFD71927} = {3D8A98C1-83C9-4375-AEAB-4F72AFAF365B}
{85A345C7-913E-4C1B-BE1C-600DE408A02F} = {57074FD8-1A2F-40C7-8476-001778A3F65D}
+ {1F337648-8A22-4601-A842-0F634FBA2825} = {4EBCE46B-CE3A-4A47-9432-82A1854CA58A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {7439494A-E2FD-4FEA-8ABF-74AE57A4A5A0}
diff --git a/Src/Dlhis.Basic.Api/Dlhis.Basic.Api.csproj b/Src/Dlhis.Basic.Api/Dlhis.Basic.Api.csproj
new file mode 100644
index 00000000..e41324f5
--- /dev/null
+++ b/Src/Dlhis.Basic.Api/Dlhis.Basic.Api.csproj
@@ -0,0 +1,13 @@
+
+
+
+ net6.0
+ enable
+ enable
+
+
+
+
+
+
+
diff --git a/Src/Dlhis.Basic.Api/IDevicePermissionApi.cs b/Src/Dlhis.Basic.Api/IDevicePermissionApi.cs
new file mode 100644
index 00000000..0792994e
--- /dev/null
+++ b/Src/Dlhis.Basic.Api/IDevicePermissionApi.cs
@@ -0,0 +1,11 @@
+using Kurisu.Core.Result;
+using Kurisu.RemoteCall.Attributes;
+
+namespace Dlhis.Basic.Api;
+
+[EnableRemoteClient(Name = "basic-service", BaseUrl = "${InternalRequest:BasicRequestUrl}")]
+public interface IDevicePermissionApi
+{
+ [Get("/api/devicepermissions/canteen/uniqueNos")]
+ Task>> GetCanteenDeviceUniqueNosByUserNoAsync(string userNo);
+}
\ No newline at end of file
diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
index b0ecaf24..ad89e286 100644
--- a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
+++ b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
@@ -4,6 +4,7 @@ using Dlhis.Basic.Device.Services;
using Kurisu.Core.DataAccess.Dto;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
+using Org.BouncyCastle.Asn1.Ocsp;
namespace Dlhis.Basic.Device.Controllers;
@@ -51,4 +52,16 @@ public class DevicePermissionsController : ControllerBase
{
return await _devicePermissionService.GetAssigmentByCodeAsync(request);
}
+
+
+ ///
+ /// 就餐设备唯一号权限
+ ///
+ ///
+ ///
+ [HttpGet("canteen/uniqueNos")]
+ public async Task> GetCanteenDeviceUniqueNosByUserNoAsync(string userNo)
+ {
+ return await _devicePermissionService.GetCanteenDeviceUniqueNosByUserNoAsync(userNo);
+ }
}
diff --git a/Src/Dlhis.Basic/Device/Response/DeviceGroupTreeResponse.cs b/Src/Dlhis.Basic/Device/Response/DeviceGroupTreeResponse.cs
index 54d2c7fc..9a1e26de 100644
--- a/Src/Dlhis.Basic/Device/Response/DeviceGroupTreeResponse.cs
+++ b/Src/Dlhis.Basic/Device/Response/DeviceGroupTreeResponse.cs
@@ -5,6 +5,9 @@ namespace Dlhis.Basic.Device.Response;
public class DeviceGroupTreeResponse
{
+ public long Id { get; set; }
+
+
///
/// 上级分组code
///
diff --git a/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs
index 040d00ac..ef313da0 100644
--- a/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs
+++ b/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs
@@ -50,6 +50,14 @@ public interface IDevicePermissionService : IScopeDependency
///
Task> GetAssignDeviceCodesAsync(string userNo);
+
+ ///
+ /// 获取就餐权限唯一号
+ ///
+ ///
+ ///
+ Task> GetCanteenDeviceUniqueNosByUserNoAsync(string userNo);
+
///
/// 获取用户权限设备
///
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
index 1fbc6c88..e0c3d564 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
@@ -198,6 +198,17 @@ public class DevicePermissionService : IDevicePermissionService
}
+ public async Task> GetCanteenDeviceUniqueNosByUserNoAsync(string userNo)
+ {
+ var all = await GetAssignDeviceCodesAsync(userNo);
+
+ return await _dbContext.Queryable().Where(x => x.Type == DeviceTypeEnumType.Meal)
+ .Where(x => all.Contains(x.Code))
+ .Select(x => x.UniqueNo)
+ .ToListAsync();
+ }
+
+
///
/// 获取用户所有设备权限
///
@@ -340,7 +351,7 @@ public class DevicePermissionService : IDevicePermissionService
var devices = await _dbContext.Queryable().ToListAsync();
- if(ggs != null && ggs.Count > 0)
+ if (ggs != null && ggs.Count > 0)
{
foreach (var gid in ggs)
{
@@ -351,7 +362,7 @@ public class DevicePermissionService : IDevicePermissionService
gds.AddRange(ds);
}
}
-
+
var dds = gds.Distinct().ToList();
var lst = devices.Where(x => dds.Contains(x.Code))
.Select(x => new AssigmentByCodeResponse
diff --git a/Src/Dlhis.Canteen/Dlhis.Canteen.csproj b/Src/Dlhis.Canteen/Dlhis.Canteen.csproj
index 36fc7e42..9e21386c 100644
--- a/Src/Dlhis.Canteen/Dlhis.Canteen.csproj
+++ b/Src/Dlhis.Canteen/Dlhis.Canteen.csproj
@@ -17,6 +17,7 @@
+
@@ -36,6 +37,7 @@
+
diff --git a/Src/Dlhis.Canteen/Dockerfile b/Src/Dlhis.Canteen/Dockerfile
index b148099c..5e510329 100644
--- a/Src/Dlhis.Canteen/Dockerfile
+++ b/Src/Dlhis.Canteen/Dockerfile
@@ -7,6 +7,7 @@ EXPOSE 80
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
WORKDIR /src
COPY ["Src/Dlhis.Canteen/Dlhis.Canteen.csproj", "Src/Dlhis.Canteen/"]
+COPY ["Src/Dlhis.Basic.Api/Dlhis.Basic.Api.csproj", "Src/Dlhis.Basic.Api/"]
COPY ["Src/Dlhis.Common.Api/Dlhis.Common.Api.csproj", "Src/Dlhis.Common.Api/"]
COPY ["Src/Dlhis.Entity/Dlhis.Entity.csproj", "Src/Dlhis.Entity/"]
RUN dotnet restore "Src/Dlhis.Canteen/Dlhis.Canteen.csproj"
diff --git a/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs b/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs
index 3e8f30e5..86e9a5c6 100644
--- a/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs
+++ b/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs
@@ -43,5 +43,4 @@ public class OrdersController : ControllerBase
{
return await _orderService.AddAsync(request);
}
-
}
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
index b3d1e7f0..dedd2a4e 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
@@ -1,10 +1,12 @@
-using Dlhis.Canteen.Order.Request;
+using Dlhis.Basic.Api;
+using Dlhis.Canteen.Order.Request;
using Dlhis.Canteen.Order.Response;
using Dlhis.Canteen.Setting.Services;
using Dlhis.Entity.Basic.Entity;
using Dlhis.Entity.Canteen.Entities;
using Dlhis.Entity.Canteen.Enums;
using Dlhis.Entity.Device.Entities;
+using Dlhis.Entity.Sys.Entities;
using Kurisu.AspNetCore.UnifyResultAndValidation;
using Kurisu.AspNetCore.Utils;
using Kurisu.AspNetCore.Utils.Extensions;
@@ -22,14 +24,17 @@ public class OrderService : IOrderService
{
private readonly IDbContext _dbContext;
private readonly ICanteenSettingService _canteenSettingService;
+ private readonly IDevicePermissionApi _devicePermissionApi;
private readonly ILogger _logger;
public OrderService(IDbContext dbContext,
ICanteenSettingService canteenSettingService,
+ IDevicePermissionApi devicePermissionApi,
ILogger logger)
{
_dbContext = dbContext;
_canteenSettingService = canteenSettingService;
+ _devicePermissionApi = devicePermissionApi;
_logger = logger;
}
@@ -42,6 +47,14 @@ public class OrderService : IOrderService
return page;
}
+ private async Task CheckPAsync(string userNo, string deviceUniqueNo)
+ {
+ var uniqueNosResult = await _devicePermissionApi.GetCanteenDeviceUniqueNosByUserNoAsync(userNo);
+ var uniqueNos = uniqueNosResult.Data;
+
+ uniqueNos.Contains(deviceUniqueNo).ThrowIfFalse("无消费权限");
+ }
+
[IgnoreTenant]
public async Task AddAsync(OrderAddRequest request)
{
@@ -59,7 +72,8 @@ public class OrderService : IOrderService
.AnyAsync();
canteenUserExists.ThrowIfFalse($"就餐用户{request.UserUniqueNo}不存在,无法操作");
-
+ //消费权限控制
+ await CheckPAsync(gainfo.No, request.DeviceUniqueNo);
//消费
if (request.Type == BalanceRecordTypeEnumType.Out)
diff --git a/Src/Dlhis.Canteen/appsettings.Development.json b/Src/Dlhis.Canteen/appsettings.Development.json
index 20ab3f6d..69b2958a 100644
--- a/Src/Dlhis.Canteen/appsettings.Development.json
+++ b/Src/Dlhis.Canteen/appsettings.Development.json
@@ -6,7 +6,8 @@
}
},
"InternalRequest": {
- "CommonRequestUrl": "http://localhost:5001"
+ "CommonRequestUrl": "http://localhost:5001",
+ "BasicRequestUrl": "http://localhost:5002"
},
"SwaggerOptions": {
"Enable": true,
diff --git a/Src/Dlhis.Canteen/appsettings.json b/Src/Dlhis.Canteen/appsettings.json
index d322419a..7ea06e04 100644
--- a/Src/Dlhis.Canteen/appsettings.json
+++ b/Src/Dlhis.Canteen/appsettings.json
@@ -7,7 +7,8 @@
},
"AllowedHosts": "*",
"InternalRequest": {
- "CommonRequestUrl": "http://common"
+ "CommonRequestUrl": "http://common",
+ "BasicRequestUrl": "http://basic"
},
"SqlSugarOptions": {
"DefaultConnectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=yikatong;charset=utf8mb4;",
diff --git a/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceGroupEntity.cs b/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceGroupEntity.cs
new file mode 100644
index 00000000..fdb19b6c
--- /dev/null
+++ b/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceGroupEntity.cs
@@ -0,0 +1,25 @@
+using Kurisu.Core.DataAccess.Entity;
+using Kurisu.SqlSugar;
+using SqlSugar;
+
+namespace Dlhis.Entity.Basic.Entity;
+
+///
+/// 营业点分组
+///
+[SugarTable(TableName = "BusinessPlaceGroup", TableDescription = "营业点分组")]
+public class BusinessPlaceGroupEntity : SugarBaseEntity, ITenantId
+{
+ public Guid? PCode { get; set; }
+
+ public Guid Code { get; set; }
+
+ [SugarColumn(ColumnDescription = "名称")]
+ public string Name { get; set; }
+
+
+ [SugarColumn(ColumnDescription = "备注")]
+ public string Remark { get; set; }
+
+ public string TenantId { get; set; }
+}
diff --git a/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceGroupRelationshipEntity.cs b/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceGroupRelationshipEntity.cs
new file mode 100644
index 00000000..49a36419
--- /dev/null
+++ b/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceGroupRelationshipEntity.cs
@@ -0,0 +1,16 @@
+using Kurisu.Core.DataAccess.Entity;
+using Kurisu.SqlSugar;
+using SqlSugar;
+
+namespace Dlhis.Entity.Basic.Entity;
+
+
+[SugarTable(TableName = "BusinessPlaceGroupRelationship", TableDescription = "营业点分组")]
+public class BusinessPlaceGroupRelationshipEntity : SugarBaseEntity, ITenantId
+{
+ public Guid BusinessPlaceGroupCode { get; set; }
+
+ public Guid BusinessPlaceCode { get; set; }
+
+ public string TenantId { get; set; }
+}