diff --git a/HHWMS.Web/Areas/Api/IWCSController.cs b/HHWMS.Web/Areas/Api/IWCSController.cs
index f66f5f2..fd76db2 100644
--- a/HHWMS.Web/Areas/Api/IWCSController.cs
+++ b/HHWMS.Web/Areas/Api/IWCSController.cs
@@ -1,10 +1,13 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Concurrent;
using System.Linq;
+using System.Threading.Tasks;
using AutoMapper;
using HHWMS.Web.Models;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using WalkingTec.Mvvm.Core;
+using Microsoft.Extensions.Caching.Memory;
namespace HHWMS.Web
{
@@ -20,130 +23,123 @@ namespace HHWMS.Web
{
private readonly IUnitWork _unitWork;
private readonly IMapper _mapper;
+ private readonly IMemoryCache _cache;
+ private const int DEBOUNCE_INTERVAL_MS = 1000; // 防抖间隔1秒
- public IWCSController(IUnitWork unitWork, IMapper mapper)
+ public IWCSController(IUnitWork unitWork, IMapper mapper, IMemoryCache cache)
{
_unitWork = unitWork;
_mapper = mapper;
+ _cache = cache;
}
///
- /// 请求入库
+ /// 防抖处理装饰器
///
- ///
- [HttpPost]
- public IActionResult RequestIn(WcsRequest request)
+ private async Task WithDebounce(string key, Func> action)
{
- return ApiResult();
+ try
+ {
+ // 使用key作为请求标识
+ string requestKey = $"Debounce_{key}";
+
+ // 检查是否存在处理中的相同请求
+ if (_cache.TryGetValue(requestKey, out DateTime lastRequestTime))
+ {
+ var timeSinceLastRequest = DateTime.Now - lastRequestTime;
+ if (timeSinceLastRequest.TotalMilliseconds < DEBOUNCE_INTERVAL_MS)
+ {
+ var remainingSeconds = Math.Ceiling((DEBOUNCE_INTERVAL_MS - timeSinceLastRequest.TotalMilliseconds) / 1000);
+ return ApiResultError($"请求过于频繁,请等待{remainingSeconds}秒后重试");
+ }
+ }
+
+ // 添加或更新缓存(设置防抖间隔时间)
+ var cacheEntryOptions = new MemoryCacheEntryOptions()
+ .SetAbsoluteExpiration(TimeSpan.FromMilliseconds(DEBOUNCE_INTERVAL_MS));
+ _cache.Set(requestKey, DateTime.Now, cacheEntryOptions);
+
+ try
+ {
+ // 执行实际的业务逻辑
+ return await action();
+ }
+ catch (Exception ex)
+ {
+ // 处理失败时移除缓存,允许重试
+ _cache.Remove(requestKey);
+ throw;
+ }
+ }
+ catch (Exception ex)
+ {
+ return ApiResultError($"处理请求时发生错误: {ex.Message}");
+ }
}
///
- /// 状态返回
+ /// 请求入库(带防抖)
///
- ///
[HttpPost]
- public IActionResult TaskStatusResult(WcsRequest request)
+ public Task RequestIn(WcsRequest request)
{
- return ApiResult();
+ if (request == null || string.IsNullOrEmpty(request.PalletNo))
+ {
+ return Task.FromResult(ApiResultError("请求参数无效"));
+ }
+
+ return WithDebounce($"RequestIn_{request.PalletNo}", async () =>
+ {
+ await ProcessRequestIn(request);
+ return ApiResult(new { Message = "入库请求处理成功" });
+ });
}
///
- /// 请求空闲库位
+ /// 处理入库请求的具体业务逻辑
+ ///
+ private async Task ProcessRequestIn(WcsRequest request)
+ {
+ // TODO: 实现具体的入库处理逻辑
+ await Task.Delay(1000); // 模拟异步处理
+ }
+
+ ///
+ /// 状态返回(带防抖)
///
- /// 包含容器编码的请求
- /// 返回空闲库位信息
[HttpPost]
- /*public IActionResult RequestLocation(WcsRequest request)
+ public Task TaskStatusResult(WcsRequest request)
+ {
+ if (request == null || string.IsNullOrEmpty(request.PalletNo))
+ {
+ return Task.FromResult(ApiResultError("请求参数无效"));
+ }
+
+ return WithDebounce($"TaskStatus_{request.PalletNo}", () => Task.FromResult(ApiResult()));
+ }
+
+ ///
+ /// 请求空闲库位(带防抖)
+ ///
+ [HttpPost]
+ public Task RequestLocation(WcsRequest request)
{
if (string.IsNullOrEmpty(request?.PalletNo))
{
- return ApiResultError("容器编码不能为空");
+ return Task.FromResult(ApiResultError("容器编码不能为空"));
}
- // 1. 优先查找里外仓位都为空的里仓位
- var innerLocation = _unitwork.Find(x => 1 == 1)
- .Join(_unitwork.Find(x => 1 == 1),
- inner => inner.ContiguousCode,
- outer => outer.Code,
- (inner, outer) => new { Inner = inner, Outer = outer })
- .Where(x => x.Inner.RowFlag == 1
- && x.Inner.Status == "empty"
- && x.Outer.Status == "empty")
- .Select(x => x.Inner)
- .FirstOrDefault();
-
- if (innerLocation != null)
+ return WithDebounce($"RequestLocation_{request.PalletNo}", () =>
{
- // 更新库位表的ContainerCode为请求的PalletNo
- innerLocation.ContainerCode = request.PalletNo;
- _unitwork.Update(innerLocation);
-
- // 更新容器表的LocationCode为分配到的库位编码
- var container = _unitwork.Find(x => x.Code == request.PalletNo).FirstOrDefault();
- if (container != null)
+ var vm = Wtm.CreateVM();
+ var code = vm.GetLocation(request);
+ if (code.Status)
{
- container.LocationCode = innerLocation.Code;
- _unitwork.Update(container);
+ UpdateLocationAndContainer(code.Data.LocationCode, request.PalletNo);
+ return Task.FromResult(ApiResult(code.Data));
}
-
- return ApiResult(new
- {
- LocationCode = innerLocation.Code
- });
- }
-
- // 2. 查找里仓位有货,外仓位无货的外仓位
- var outerLocation = _unitwork.Find(x => 1 == 1)
- .Join(_unitwork.Find(x => 1 == 1),
- outer => outer.ContiguousCode,
- inner => inner.Code,
- (outer, inner) => new { Outer = outer, Inner = inner })
- .Where(x => x.Outer.RowFlag == 0
- && x.Outer.Status == "empty"
- && x.Inner.Status == "some")
- .Select(x => x.Outer)
- .FirstOrDefault();
-
- if (outerLocation != null)
- {
- // 更新库位表的ContainerCode为请求的PalletNo
- outerLocation.ContainerCode = request.PalletNo;
- _unitwork.Update(outerLocation);
-
- // 更新容器表的LocationCode为分配到的库位编码
- var container = _unitwork.Find(x => x.Code == request.PalletNo).FirstOrDefault();
- if (container != null)
- {
- container.LocationCode = outerLocation.Code;
- _unitwork.Update(container);
- }
-
- return ApiResult(new
- {
- LocationCode = outerLocation.Code
- });
- }
-
- return ApiResultError("没有符合条件的可用库位");
- }
- */
- public IActionResult RequestLocation(WcsRequest request)
- {
- if (string.IsNullOrEmpty(request?.PalletNo))
- {
- return ApiResultError("容器编码不能为空");
- }
-
- var vm = Wtm.CreateVM();
- var code = vm.GetLocation(request);
- if (code.Status)
- {
- UpdateLocationAndContainer(code.Data.LocationCode, request.PalletNo);
- return ApiResult(code.Data);
- }
-
- return ApiResultError("没有符合条件的可用库位");
-
+ return Task.FromResult(ApiResultError("没有符合条件的可用库位"));
+ });
}
private IActionResult UpdateLocationAndContainer(string locationCode, string palletNo)