Teams/kunshan-bzfm-mes-backend
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

统一转本地时间

Browse Source
This commit is contained in:
qianhao.xu
2025-02-19 13:37:58 +08:00
parent af71630882
commit f80aca492c
3 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DOAN.Service/MES/Group/AchievementService.cs
View File

@@ -67,8 +67,6 @@ namespace DOAN.Service.MES.Group
.AndIF(!string.IsNullOrEmpty(parm.Worker), it => it.Worker.Contains(parm.Worker))
.AndIF(parm.JobDatetime != null&& parm.JobDatetime[0]>DateTime.MinValue, it => it.JobDateTime >=parm.JobDatetime[0])
.AndIF(parm.JobDatetime != null&& parm.JobDatetime[0]>DateTime.MinValue, it => it.JobDateTime <=parm.JobDatetime[1])
;
return predicate;

40
DOAN.ServiceCore/Filters/GlobalActionMonitor.cs
View File

@@ -29,27 +29,35 @@ namespace DOAN.ServiceCore.Middleware
/// <returns></returns>
public override Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
{
string msg = string.Empty;
var values = context.ModelState.Values;
foreach (var item in values)
{
foreach (var err in item.Errors)
// 打印请求参数
string msg = string.Empty;
var values = context.ModelState.Values;
foreach (var item in values)
{
if (!string.IsNullOrEmpty(msg))
foreach (var err in item.Errors)
{
msg += " | ";
if (!string.IsNullOrEmpty(msg))
{
msg += " | ";
}
msg += err.ErrorMessage;
}
msg += err.ErrorMessage;
}
}
if (!string.IsNullOrEmpty(msg))
{
logger.Info($"请求参数错误,{msg}");
ApiResult response = new((int)ResultCode.PARAM_ERROR, msg);
if (!string.IsNullOrEmpty(msg))
{
logger.Info($"请求参数错误,{msg}");
ApiResult response = new((int)ResultCode.PARAM_ERROR, msg);
context.Result = new JsonResult(response);
}
context.Result = new JsonResult(response);
}
return base.OnActionExecutionAsync(context, next);
}

10
Infrastructure/Converter/JsonConverterUtil.cs
View File

@@ -16,7 +16,7 @@ namespace Infrastructure.Converter
=> string.IsNullOrEmpty(reader.GetString()) ? default : ParseDateTime(reader.GetString());
public override void Write(Utf8JsonWriter writer, DateTime? value, JsonSerializerOptions options)
=> writer.WriteStringValue(value?.ToString("yyyy-MM-dd HH:mm:ss"));
=> writer.WriteStringValue(value?.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss"));
}
public class DateTimeConverter : JsonConverter<DateTime>
@@ -28,13 +28,13 @@ namespace Infrastructure.Converter
}
public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
=> writer.WriteStringValue(value.ToString("yyyy-MM-dd HH:mm:ss"));
=> writer.WriteStringValue(value.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss"));
}
public static DateTime? ParseDateTime(string dateStr)
{
if (System.Text.RegularExpressions.Regex.IsMatch(dateStr, @"^\d{4}[/-]") && DateTime.TryParse(dateStr, null, System.Globalization.DateTimeStyles.AssumeLocal, out var dateVal))
return dateVal;
return dateVal.ToLocalTime();
return null;
}
@@ -55,7 +55,7 @@ namespace Infrastructure.Converter
public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
{
writer.WriteStringValue(value.ToString("yyyy-MM-ddTHH:mm:ss"));
writer.WriteStringValue(value.ToLocalTime().ToString("yyyy-MM-ddTHH:mm:ss"));
}
}
@@ -109,7 +109,7 @@ namespace Infrastructure.Converter
{
if (date.HasValue)
{
writer.WriteStringValue(date.Value.ToString("yyyy-MM-dd HH:mm:ss"));
writer.WriteStringValue(date.Value.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss"));
}
else
{