Txgy.CSharp
/
Txgy.EWS.Client
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Txgy.CSharp:fix/database-bug
Branches Tags
Txgy.CSharp:fix/database-bug
Txgy.CSharp:master
..
compare: Txgy.CSharp:master
Branches Tags
Txgy.CSharp:fix/database-bug
Txgy.CSharp:master

No commits in common. 'fix/database-bug' and 'master' have entirely different histories.
fix/databa ... master

4 changed files with 21 additions and 44 deletions
Show Stats

56
Txgy.EWS.Client.DAL/RemoteMySQLDataAccess.cs
Unescape Escape View File

@ -7,13 +7,11 @@ using System.Data.SqlClient;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.Remoting.Contexts;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Txgy.EWS.Client.Common;
using Txgy.EWS.Client.Common.Helpers;
using Txgy.EWS.Client.IDAL;
using Txgy.EWS.Client.Models;
using Txgy.Microseismic.BaseLib.Common;
@ -25,7 +23,6 @@ namespace Txgy.EWS.Client.DAL
{
public class RemoteMySQLDataAccess : IRemoteMySQLDataAccess
{
private static readonly log4net.ILog logger = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
IFreeSql fsql = FreeSqlTencent.tencentRemoteMySQL;
public string saveWavePath = "";
public MySqlConnection RemoteConn { get; set; }
@ -72,9 +69,8 @@ namespace Txgy.EWS.Client.DAL
}
return true;
}
catch (Exception ex)
catch
{
logger.Error("数据库连接失败", ex);
return false;
}
}
@ -135,7 +131,6 @@ namespace Txgy.EWS.Client.DAL
}
catch (Exception ex)
{
logger.Error($"获取事件列表失败 - 开始时间:{startTime}, 结束时间:{endTime}, 页码:{pageIndex}, 每页数量:{perPageCount}", ex);
return null;
}
}
@ -183,8 +178,7 @@ namespace Txgy.EWS.Client.DAL
}
catch (Exception ex)
{
logger.Error($"获取事件列表失败 - 开始时间:{startTime}, 结束时间:{endTime}", ex);
throw;
throw ex;
}
finally
{
@ -237,7 +231,7 @@ namespace Txgy.EWS.Client.DAL
}
catch (Exception ex)
{
logger.Error($"获取事件列表失败 - 开始时间:{startTime}, 结束时间:{endTime}, minML:{minML}, maxML:{maxML}", ex);
//messagebox.show
}
finally
{
@ -315,7 +309,7 @@ namespace Txgy.EWS.Client.DAL
}
catch (Exception ex)
{
logger.Error($"根据SQL查询事件失败 - QueryStr:{QueryStr}, SortTarget:{ssm}, SortMode:{sm}", ex);
//throw ex;
}
finally
{
@ -382,8 +376,7 @@ namespace Txgy.EWS.Client.DAL
}
catch (Exception ex)
{
logger.Error($"获取最新事件失败 - MaxCnt:{MaxCnt}, PreCnt:{PreCnt}", ex);
throw;
throw ex;
}
finally
{
@ -449,8 +442,7 @@ namespace Txgy.EWS.Client.DAL
}
catch (Exception ex)
{
logger.Error($"下载波形数据失败 - 事件时间:{eventTime}, 保存路径:{savePath}, 保存名称:{saveName}, 表名:{tableName}", ex);
throw;
throw ex;
}
finally
{
@ -506,7 +498,7 @@ namespace Txgy.EWS.Client.DAL
}
catch (Exception ex)
{
logger.Error($"获取事件详情失败 - 事件ID:{eventID}", ex);
//messagebox.show
}
finally
{
@ -559,8 +551,7 @@ namespace Txgy.EWS.Client.DAL
}
catch (Exception ex)
{
logger.Error($"获取事件详情失败 - 事件时间:{eventTime}", ex);
throw;
throw ex;
}
finally
{
@ -613,8 +604,7 @@ namespace Txgy.EWS.Client.DAL
}
catch (Exception ex)
{
logger.Error("获取最新事件失败", ex);
throw;
throw ex;
}
finally
{
@ -668,8 +658,7 @@ namespace Txgy.EWS.Client.DAL
}
catch (Exception ex)
{
logger.Error($"获取最新事件失败 - 截止时间:{deadline}", ex);
throw;
throw ex;
}
finally
{
@ -775,10 +764,9 @@ namespace Txgy.EWS.Client.DAL
}
catch (Exception ex)
{
logger.Error($"统计事件数量失败 - 开始时间:{startTime}, 结束时间:{endTime}", ex);
// 异常处理代码
Console.WriteLine($"DownloadDataAsync error: {ex.StackTrace}");
throw;
throw ex;
}
// 如果没有查询到数据，则返回空引用
return 0;
@ -849,10 +837,9 @@ namespace Txgy.EWS.Client.DAL
}
catch (Exception ex)
{
logger.Error($"异步下载波形数据失败 - 事件时间:{gier.EventTime}, 保存路径:{savePath}", ex);
// 异常处理代码
Console.WriteLine($"DownloadDataAsync error: {ex.StackTrace}");
throw;
throw ex;
}
finally
{
@ -919,10 +906,9 @@ namespace Txgy.EWS.Client.DAL
}
catch (Exception ex)
{
logger.Error($"异步下载JSON数据失败 - 事件时间:{gier.EventTime}, 保存路径:{savePath}", ex);
// 异常处理代码
Console.WriteLine($"DownloadDataAsync error: {ex.StackTrace}");
throw;
throw ex;
}
finally
{
@ -989,10 +975,9 @@ namespace Txgy.EWS.Client.DAL
catch (Exception ex)
{
_semaphore.Release();
logger.Error($"查询和下载数据失败 - 事件ID:{eventID}, 保存路径:{savePath}", ex);
// 异常处理代码
Console.WriteLine($"QueryAndDownloadDataAsync error: {ex.StackTrace}");
throw;
throw ex;
}
}
@ -1058,10 +1043,9 @@ namespace Txgy.EWS.Client.DAL
catch (Exception ex)
{
_semaphore.Release();
logger.Error($"按ID查询和下载数据失败 - 事件ID:{eventID}, 保存路径:{savePath}", ex);
// 异常处理代码
Console.WriteLine($"QueryAndDownloadDataAsync error: {ex.StackTrace}");
throw;
throw ex;
}
}
public async Task QueryEventByIDAsync(int eventID, string savePath, Action<GridItemEventResult> callback)
@ -1126,10 +1110,9 @@ namespace Txgy.EWS.Client.DAL
catch (Exception ex)
{
_semaphore.Release();
logger.Error($"按ID查询事件失败 - 事件ID:{eventID}, 保存路径:{savePath}", ex);
// 异常处理代码
Console.WriteLine($"QueryAndDownloadDataAsync error: {ex.StackTrace}");
throw;
throw ex;
}
}
public List<GridItemEventResult> GetLastEvents(int lastEventID)
@ -1222,8 +1205,7 @@ namespace Txgy.EWS.Client.DAL
}
catch (Exception ex)
{
logger.Error($"获取最新事件失败 - 数量:{QueryCount}", ex);
throw;
throw ex;
}
finally
{
@ -1279,8 +1261,8 @@ namespace Txgy.EWS.Client.DAL
}
catch (Exception ex)
{
logger.Error($"获取网格事件失败 - 开始时间:{startTime}, 结束时间:{endTime}, minML:{minML}, maxML:{maxML}", ex);
throw;
//messagebox.show
throw ex;
}
finally
{

3
Txgy.EWS.Client.DAL/Txgy.EWS.Client.DAL.csproj
Unescape Escape View File

@ -62,9 +62,6 @@
<Reference Include="K4os.Hash.xxHash, Version=1.0.6.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
<HintPath>..\packages\K4os.Hash.xxHash.1.0.6\lib\net46\K4os.Hash.xxHash.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
</Reference>
<Reference Include="MySql.Data, Version=8.0.30.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.8.0.30\lib\net48\MySql.Data.dll</HintPath>
</Reference>

1
Txgy.EWS.Client.DAL/packages.config
Unescape Escape View File

@ -22,5 +22,4 @@
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
<package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net48" />
<package id="log4net" version="2.0.15" targetFramework="net48" />
</packages>

5
Txgy.EWS.Client.Log/log4net.config
Unescape Escape View File

@ -34,10 +34,8 @@
<conversionPattern value="＝＝＝＝＝＝＝＝＝＝
%n【日志级别】%-5level
%n【记录时间】%date
%n【线程ID】[%thread]
%n【错误位置】%logger 属性[%property{NDC}]
%n【错误描述】%message
%n【异常详情】%exception
%n【错误详情】%newline"/>
</layout>
<filter type="log4net.Filter.LevelRangeFilter,log4net">
@ -64,7 +62,8 @@
<layout type="log4net.Layout.PatternLayout">
<!--输出格式 模板-->
<!--样例：INFO 2008-03-26 13:42:32, Log4NetDemo.MainClass [(null)] - info-->
<conversionPattern value="%[-2level] %date [%thread] %logger 属性[%property{NDC}] %message %exception %n"/>
<!--<conversionPattern value="%newline %n记录时间：%date %n线程ID:[%thread] %n日志级别： %-5level %n错误描述：%message%newline %n"/>-->
<conversionPattern value="%[-2level] %date %logger 属性[%property{NDC}] %message %n"/>
</layout>
<filter type="log4net.Filter.LevelRangeFilter,log4net">
<levelMin value="DEBUG" />

Write Preview
Loading…
Cancel
Save