From 4383bfcc87a7726f39391eb78d830aca160d8efd Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期一, 30 九月 2024 10:07:52 +0800
Subject: [PATCH] bug修复
---
WIDESEAWCS_Server/WIDESEAWCS_Core/BaseServices/ServiceBase.cs | 291 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 231 insertions(+), 60 deletions(-)
diff --git a/WIDESEAWCS_Server/WIDESEAWCS_Core/BaseServices/ServiceBase.cs b/WIDESEAWCS_Server/WIDESEAWCS_Core/BaseServices/ServiceBase.cs
index 952bb0c..9518cfe 100644
--- a/WIDESEAWCS_Server/WIDESEAWCS_Core/BaseServices/ServiceBase.cs
+++ b/WIDESEAWCS_Server/WIDESEAWCS_Core/BaseServices/ServiceBase.cs
@@ -2,7 +2,9 @@
using Magicodes.ExporterAndImporter.Core.Models;
using Magicodes.ExporterAndImporter.Excel;
using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.RazorPages;
using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
using System.Drawing.Drawing2D;
@@ -13,6 +15,7 @@
using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_Core.Utilities;
+using static OfficeOpenXml.ExcelErrorValue;
namespace WIDESEAWCS_Core.BaseServices
{
@@ -51,37 +54,6 @@
Dictionary<string, OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
PageGridData<TEntity> pageGridData = new PageGridData<TEntity>();
- //if (QueryRelativeExpression != null)
- //{
- // queryable = QueryRelativeExpression.Invoke(queryable);
- //}
- //if (options.Export)
- //{
- // queryable = queryable.GetIQueryableOrderBy(orderbyDic);
- // if (Limit > 0)
- // {
- // queryable = queryable.Take(Limit);
- // }
- // pageGridData.rows = queryable.ToList();
- //}
- //else
- //{
- // pageGridData.rows = repository.IQueryablePage(queryable,
- // options.Page,
- // options.Rows,
- // out int rowCount,
- // orderbyDic).ToList();
- // pageGridData.total = rowCount;
- // //鏌ヨ鐣岄潰缁熻姹傜瓑瀛楁
- // if (SummaryExpress != null)
- // {
- // pageGridData.summary = SummaryExpress.Invoke(queryable);
- // //Func<T, T> groupExpress = x =>x;
- // //pageGridData.summary = queryable.GroupBy(groupExpress).Select(SummaryExpress).FirstOrDefault();
- // }
- //}
- //GetPageDataOnExecuted?.Invoke(pageGridData);
-
pageGridData = BaseDal.QueryPage(wheres, options.Page, options.Rows, orderbyDic);
return pageGridData;
@@ -119,27 +91,38 @@
if (property == null) continue;
- (bool, string, object) result = property.ValidationVal(searchParametersList[i].Value.Split(','));
- if (!result.Item1)
+ List<(bool, string, object)> results = property.ValidationValueForDbType(searchParametersList[i].Value.Split(',')).ToList();
+ if (results == null || results.Count() == 0)
{
continue;
}
+ for (int j = 0; j < results.Count(); j++)
+ {
+ if (j == 0)
+ {
+ where += "(";
+ }
+ LinqExpressionType expressionType = searchParametersList[i].DisplayType.GetLinqCondition();
+ if (expressionType == LinqExpressionType.Equal)
+ {
+ where += $"{searchParametersList[i].Name} = '{results[j].Item3}'";
+ }
+ else
+ {
+ where += $"{searchParametersList[i].Name} {searchParametersList[i].DisplayType} '{results[j].Item3}'";
+ }
- LinqExpressionType expressionType = searchParametersList[i].DisplayType.GetLinqCondition();
- if (expressionType == LinqExpressionType.Equal)
- {
- if (string.IsNullOrEmpty(where))
- where += $"{searchParametersList[i].Name} = '{searchParametersList[i].Value}'";
+ if (j == results.Count() - 1)
+ {
+ where += ")";
+ }
else
- where += $" and {searchParametersList[i].Name} = '{searchParametersList[i].Value}'";
+ {
+ where += " or ";
+ }
}
- else
- {
- if (string.IsNullOrEmpty(where))
- where += $"{searchParametersList[i].Name} {searchParametersList[i].DisplayType} '{searchParametersList[i].Value}'";
- else
- where += $" and {searchParametersList[i].Name} {searchParametersList[i].DisplayType} '{searchParametersList[i].Value}'";
- }
+ if (i < searchParametersList.Count - 1)
+ where += " and ";
}
return where;
}
@@ -164,7 +147,7 @@
}
return sortDic;
}
- else if (propertyInfo.Any(x => x.Name == pageData.Sort))
+ else if (propertyInfo.Any(x => x.Name == pageData.Sort.FirstLetterToLower() || x.Name == pageData.Sort.FirstLetterToUpper()))
{
return new Dictionary<string, OrderByType> {
{
@@ -267,17 +250,64 @@
saveModel.MainData.Remove(keyPro.Name.FirstLetterToLower());
}
}
-
TEntity entity = saveModel.MainData.DicToModel<TEntity>();
+ if (saveModel.DetailData == null || saveModel.DetailData.Count == 0)
+ {
+ BaseDal.AddData(entity);
+ return WebResponseContent.Instance.OK();
+ }
- BaseDal.AddData(entity);
+ if (typeof(TEntity).GetNavigatePro() == null)
+ {
+ return WebResponseContent.Instance.Error("鏈厤缃鑸睘鎬�");
+ }
- return WebResponseContent.Instance.OK();
+ Type detailType = typeof(TEntity).GetDetailType();
+ MethodInfo? methodInfo = GetType().GetMethod("AddDataIncludesDetail");
+ methodInfo = methodInfo?.MakeGenericMethod(new Type[] { detailType });
+ object? obj = methodInfo?.Invoke(this, new object[] { entity, detailType, saveModel.DetailData });
+ return obj as WebResponseContent;
}
catch (Exception ex)
{
return WebResponseContent.Instance.Error(ex.Message);
}
+ }
+
+ public WebResponseContent AddDataIncludesDetail<TDetail>(TEntity entity, Type detailType, List<Dictionary<string, object>> detailDics) where TDetail : class, new()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ string name = typeof(TEntity).GetMainIdByDetail();
+ string reslut = detailType.ValidateDicInEntity(detailDics, true, new string[] { name });
+ if (reslut != string.Empty)
+ return WebResponseContent.Instance.Error(reslut);
+
+ List<TDetail> list = detailDics.DicToIEnumerable<TDetail>();
+
+ ((SqlSugarClient)BaseDal.Db).BeginTran();
+
+ int id = BaseDal.Db.Insertable(entity).ExecuteReturnIdentity();
+
+ for (int i = 0; i < list.Count; i++)
+ {
+ TDetail detail = list[i];
+ typeof(TDetail).SetDetailId(detail, id, name);
+ }
+
+ BaseDal.Db.Insertable(list).ExecuteCommand();
+
+ ((SqlSugarClient)BaseDal.Db).CommitTran();
+
+ content = WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ ((SqlSugarClient)BaseDal.Db).RollbackTran();
+ content = WebResponseContent.Instance.Error(ex.Message);
+ }
+ return content;
}
/// <summary>
@@ -335,11 +365,11 @@
return WebResponseContent.Instance.Error(validResult);
}
- //PropertyInfo keyPro = typeof(TEntity).GetKeyProperty();
- //if (keyPro == null)
- //{
- // return WebResponseContent.Instance.Error("璇峰厛璁剧疆涓婚敭");
- //}
+ PropertyInfo keyPro = typeof(TEntity).GetKeyProperty();
+ if (keyPro == null)
+ {
+ return WebResponseContent.Instance.Error("璇峰厛璁剧疆涓婚敭");
+ }
TEntity entity = saveModel.MainData.DicToModel<TEntity>();
@@ -358,16 +388,108 @@
listCol.Add(propertyInfo?.Name);
}
- if (list != null)
- listCol = listCol.Where(x => !list.Contains(x)).ToList();
- bool result = BaseDal.UpdateData(entity, listCol, list);
- return WebResponseContent.Instance.OK();
+ if (saveModel.DetailData == null || saveModel.DetailData.Count == 0)
+ {
+ if (list != null)
+ listCol = listCol.Where(x => !list.Contains(x)).ToList();
+ bool result = BaseDal.UpdateData(entity, listCol, list);
+ return WebResponseContent.Instance.OK();
+ }
+
+ if (typeof(TEntity).GetNavigatePro() == null)
+ {
+ return WebResponseContent.Instance.Error("鏈厤缃鑸睘鎬�");
+ }
+
+ Type detailType = typeof(TEntity).GetDetailType();
+ MethodInfo? methodInfo = GetType().GetMethod("UpdateDataInculdesDetail");
+ methodInfo = methodInfo?.MakeGenericMethod(new Type[] { detailType });
+ object? obj = methodInfo?.Invoke(this, new object[] { entity, detailType, saveModel.DetailData, saveModel.DelKeys });
+ return obj as WebResponseContent;
}
catch (Exception ex)
{
return WebResponseContent.Instance.Error(ex.Message);
}
+ }
+
+ public WebResponseContent UpdateDataInculdesDetail<TDetail>(TEntity entity, Type detailType, List<Dictionary<string, object>> detailDics, List<object> delKeys) where TDetail : class, new()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ string name = typeof(TEntity).GetMainIdByDetail();
+ string reslut = detailType.ValidateDicInEntity(detailDics, true, new string[] { name });
+ if (reslut != string.Empty)
+ return WebResponseContent.Instance.Error(reslut);
+
+ List<TDetail> list = detailDics.DicToIEnumerable<TDetail>();
+
+ List<object> dynamicDelKeys = new List<object>();
+ if (delKeys != null)
+ {
+ for (int i = 0; i < delKeys.Count; i++)
+ {
+ dynamicDelKeys.Add(delKeys[i]);
+ }
+ }
+
+ List<TDetail> updateRows = new List<TDetail>();
+ List<TDetail> addRows = new List<TDetail>();
+
+ for (int i = 0; i < list.Count; i++)
+ {
+ object detailId = typeof(TDetail).GetPropertyValue(list[i], typeof(TDetail).GetKeyName());
+ if (detailId != null)
+ {
+ if (detailId.ToString() != "0")
+ {
+ updateRows.Add(list[i]);
+ }
+ else
+ {
+ addRows.Add(list[i]);
+ }
+ }
+ }
+
+ object mainId = typeof(TEntity).GetPropertyValue(entity, typeof(TEntity).GetKeyName());
+ if (mainId != null)
+ {
+ ((SqlSugarClient)BaseDal.Db).BeginTran();
+
+ if (dynamicDelKeys.Count > 0)
+ BaseDal.Db.Deleteable<object>().AS(detailType.Name).Where($"{detailType.GetKeyName()} in (@id)", new { id = dynamicDelKeys.ToArray() }).ExecuteCommandHasChange();
+
+ BaseDal.Db.Updateable(entity).ExecuteCommandHasChange();
+
+ BaseDal.Db.Updateable(updateRows).ExecuteCommand();
+
+ for (int i = 0; i < addRows.Count; i++)
+ {
+ TDetail detail = addRows[i];
+ typeof(TDetail).SetDetailId(detail, mainId, name);
+ }
+
+ BaseDal.Db.Insertable(addRows).ExecuteCommand();
+
+ ((SqlSugarClient)BaseDal.Db).CommitTran();
+
+ content = WebResponseContent.Instance.OK();
+ }
+ else
+ {
+ content = WebResponseContent.Instance.Error("鏈壘鍒颁富琛ㄤ富閿��");
+ }
+
+ }
+ catch (Exception ex)
+ {
+ ((SqlSugarClient)BaseDal.Db).RollbackTran();
+ content = WebResponseContent.Instance.Error(ex.Message);
+ }
+ return content;
}
/// <summary>
@@ -396,10 +518,40 @@
{
try
{
- return BaseDal.DeleteDataByIds(keys) ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
+ if (typeof(TEntity).GetNavigatePro() == null)
+ return BaseDal.DeleteDataByIds(keys) ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
+ else
+ {
+ if (keys != null)
+ {
+ Type detailType = typeof(TEntity).GetDetailType();
+ string name = typeof(TEntity).GetMainIdByDetail();
+ List<object> dynamicDelKeys = new List<object>();
+
+ for (int i = 0; i < keys.Length; i++)
+ {
+ dynamicDelKeys.Add(keys[i]);
+ }
+ ((SqlSugarClient)BaseDal.Db).BeginTran();
+
+ if (dynamicDelKeys.Count > 0)
+ BaseDal.Db.Deleteable<object>().AS(detailType.Name).Where($"{name} in (@id)", new { id = dynamicDelKeys.ToArray() }).ExecuteCommandHasChange();
+
+ BaseDal.DeleteDataByIds(keys);
+
+ ((SqlSugarClient)BaseDal.Db).CommitTran();
+
+ return WebResponseContent.Instance.OK();
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error("鍙傛暟閿欒");
+ }
+ }
}
catch (Exception ex)
{
+ ((SqlSugarClient)BaseDal.Db).RollbackTran();
return WebResponseContent.Instance.Error(ex.Message);
}
}
@@ -553,5 +705,24 @@
content = WebResponseContent.Instance.OK(data: savePath + "\\" + fileName);
return content;
}
+
+ public WebResponseContent ExportSeedData()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ string seedDataFolder = $"WIDESEAWCS_DB.DBSeed.Json/{typeof(TEntity).Name}.tsv";
+ List<TEntity> deviceInfos = BaseDal.QueryData();
+ string str = JsonConvert.SerializeObject(deviceInfos, Formatting.Indented);
+ List<Dictionary<string, object>> keyValuePairs = JsonConvert.DeserializeObject<List<Dictionary<string, object>>>(str);
+ FileHelper.WriteFileAndDelOldFile($"{AppDomain.CurrentDomain.BaseDirectory}wwwroot/{seedDataFolder}", str);
+ content = WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ content = WebResponseContent.Instance.Error(ex.Message);
+ }
+ return content;
+ }
}
}
--
Gitblit v1.9.3