From e2f151957b38d3c02c26be4343b6916d65e800b7 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 09 一月 2025 13:52:51 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/AOP/SqlSugarAop.cs | 73 +++++++++++-------------------------
1 files changed, 23 insertions(+), 50 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/AOP/SqlSugarAop.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/AOP/SqlSugarAop.cs"
index 2732123..14b05f2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/AOP/SqlSugarAop.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/AOP/SqlSugarAop.cs"
@@ -30,22 +30,25 @@
CodeRuleAttribute? codeRuleAttribute = propertyInfo.GetCustomAttribute<CodeRuleAttribute>();
if (codeRuleAttribute != null)
{
- SqlSugarClient sugarClient = new SqlSugarClient(new ConnectionConfig
+ if (propertyInfo.GetValue(entityInfo.EntityValue) == null)
{
- ConfigId = MainDb.CurrentDbConnId,
- ConnectionString = DBContext.GetMainConnectionDb().Connection,
- IsAutoCloseConnection = true,
- DbType = MainDb.DbType,
- });
- dynamic ruleConfig = sugarClient.Queryable(MainDb.CodeRuleConfig, "x").Where(nameof(CodeRuleAttribute.RuleCode), "=", codeRuleAttribute.RuleCode.ToString()).First();
- if (ruleConfig != null)
- {
- string code = CreateCodeByRule(ruleConfig, sugarClient);
- propertyInfo.SetValue(entityInfo.EntityValue, code, null);
+ SqlSugarClient sugarClient = new SqlSugarClient(new ConnectionConfig
+ {
+ ConfigId = MainDb.CurrentDbConnId,
+ ConnectionString = DBContext.GetMainConnectionDb().Connection,
+ IsAutoCloseConnection = true,
+ DbType = MainDb.DbType,
+ });
+ dynamic ruleConfig = sugarClient.Queryable(MainDb.CodeRuleConfig, "x").Where(nameof(CodeRuleAttribute.RuleCode), "=", codeRuleAttribute.RuleCode.ToString()).First();
+ if (ruleConfig != null)
+ {
+ string code = CreateCodeByRule(ruleConfig, sugarClient);
+ propertyInfo.SetValue(entityInfo.EntityValue, code, null);
+ }
}
}
- SequenceAttirbute? sequenceAttirbute = propertyInfo.GetCustomAttribute<SequenceAttirbute>();
+ SequenceAttribute? sequenceAttirbute = propertyInfo.GetCustomAttribute<SequenceAttribute>();
if (sequenceAttirbute != null)
{
if (propertyInfo.GetValue(entityInfo.EntityValue)?.ObjToInt() <= 0)
@@ -66,26 +69,21 @@
int seq = sugarClient.Ado.GetScalar($"SELECT NEXT VALUE FOR {sequenceAttirbute.SequenceName}").ObjToInt();
propertyInfo.SetValue(entityInfo.EntityValue, seq, null);
}
-
}
}
if (entityInfo.EntityValue is BaseEntity baseEntity)
{
// 鏂板鎿嶄綔
- if (entityInfo.OperationType == DataFilterType.InsertByObject)
+ if (entityInfo.OperationType == DataFilterType.InsertByObject && entityInfo.PropertyName == nameof(BaseEntity.CreateDate))
{
- if (entityInfo.PropertyName == nameof(BaseEntity.CreateDate))
- {
- baseEntity.CreateDate = DateTime.Now;
- }
+ baseEntity.CreateDate = DateTime.Now;
}
- if (entityInfo.OperationType == DataFilterType.UpdateByObject)
+ if (entityInfo.OperationType == DataFilterType.UpdateByObject && entityInfo.PropertyName == nameof(BaseEntity.ModifyDate))
{
baseEntity.ModifyDate = DateTime.Now;
}
-
//if (App.User?.UserId > 0)
{
@@ -100,17 +98,13 @@
}
}
}
- }
- private static void UpdateConfigData(dynamic ruleConfig)
- {
- try
+ if (entityInfo.EntityValue is IBaseHistoryEntity baseHistoryEntity)
{
-
- }
- catch (Exception ex)
- {
-
+ if (entityInfo.OperationType == DataFilterType.InsertByObject && entityInfo.PropertyName == nameof(IBaseHistoryEntity.InsertTime))
+ {
+ baseHistoryEntity.InsertTime = DateTime.Now;
+ }
}
}
@@ -159,27 +153,6 @@
sugarClient.Updateable(keyValuePairs).AS(MainDb.CodeRuleConfig).WhereColumns(nameof(ruleConfig.Id)).ExecuteCommand();
}
return code;
- }
-
- private static string GetWholeSql(SugarParameter[] paramArr, string sql)
- {
- foreach (var param in paramArr)
- {
- sql = sql.Replace(param.ParameterName, $@"'{param.Value.ObjToString()}'");
- }
-
- return sql;
- }
-
- private static string GetParas(SugarParameter[] pars)
- {
- string key = "銆怱QL鍙傛暟銆戯細";
- foreach (var param in pars)
- {
- key += $"{param.ParameterName}:{param.Value}\n";
- }
-
- return key;
}
}
}
--
Gitblit v1.9.3