SW/CPXV2
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[성현모] TRA Recovery 기능 수정

Browse Source
This commit is contained in:
SHM
2025-05-21 14:09:29 +09:00
parent 0b69c113ec
commit 57fdf665c0
16 changed files with 384 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
CPXV2 TRA JSON Recovery/SystemX.Product.CP.TRA/MainForm.cs
View File

@ -365,39 +365,14 @@ namespace SystemX.Product.CP.TRA
{
try
{
//TODO : Conn Database
if (strConnIPAddressTL == string.Empty)
{
DatabaseConnControl.ConnectTestListDB();
DatabaseConnControl.ConnectTestListDB();
DBConnMain = DatabaseConnControl.GetMainConn();
DBConnMain = DatabaseConnControl.GetMainConn();
}
else
{
// DatabaseConnControl.ConnectTestListDB(strConnIPAddressTL, nConnPortTL);
DBConnMain = DatabaseConnControl.GetMainConn();
}
//Data Server 1
if (strConnIPAddressDT1 == string.Empty)
{
DatabaseConnControl.ConnectDataDB1();
DBConnShortTerm1 = DatabaseConnControl.GetShortTermConn1();
DBConnLongTerm1 = DatabaseConnControl.GetLongTermConn1();
}
else
{
foreach (string catalog in DatabaseConnControl.LongTermCatalogName)
{
DatabaseConnControl.ConnectDataDB1(strConnIPAddressDT1, nConnPortDT1, catalog);
}
DBConnShortTerm1 = DatabaseConnControl.GetShortTermConn1();
DBConnLongTerm1 = DatabaseConnControl.GetLongTermConn1();
}
DatabaseConnControl.ConnectDataDB1();
DBConnShortTerm1 = DatabaseConnControl.GetShortTermConn1();
DBConnLongTerm1 = DatabaseConnControl.GetLongTermConn1();
//Data Server 2
if (bUseDataServer2)
{
@ -440,7 +415,7 @@ namespace SystemX.Product.CP.TRA
//
CheckSqlOption(DatabaseConnControl.GetMainConn());
CheckSqlOption(DatabaseConnControl.GetShortTermConn1());
// CheckSqlOption(DatabaseConnControl.GetShortTermConn1());
foreach (var con in DatabaseConnControl.GetLongTermConn1())
{
CheckSqlOption(con.Value);
@ -481,7 +456,7 @@ namespace SystemX.Product.CP.TRA
}
finally
{
if (DBConnMain == null || DBConnShortTerm1 == null || DBConnLongTerm1 == null)
if (DBConnMain == null || DBConnLongTerm1 == null)
{
bDatabaseConnState = false;
@ -2138,8 +2113,8 @@ namespace SystemX.Product.CP.TRA
$"{DMCommon.SummaryHistTable}.[ProductID], " +
$"{DMCommon.SummaryHistTable}.[Result] " +
$"FROM {DMCommon.SummaryHistTable} WITH(NOLOCK) " +
$"LEFT JOIN [CPXV2].[dbo].[PROD_Variant] AS X WITH(NOLOCK) ON X.No = CONVERT(NVARCHAR, {DMCommon.SummaryHistTable}.[TestListVariantNo]) " +
$"LEFT JOIN [CPXV2].[dbo].[PROD_Group] AS Y WITH(NOLOCK) ON Y.No = X.GroupNo " +
$"LEFT JOIN [{DatabaseConnControl.MainCatalogName}].[dbo].[PROD_Variant] AS X WITH(NOLOCK) ON X.No = CONVERT(NVARCHAR, {DMCommon.SummaryHistTable}.[TestListVariantNo]) " +
$"LEFT JOIN [{DatabaseConnControl.MainCatalogName}].[dbo].[PROD_Group] AS Y WITH(NOLOCK) ON Y.No = X.GroupNo " +
$"WHERE " +
$"TestDT >= '{dtStart.ToString("yyyy-MM-dd HH:mm:ss")}' AND " +
$"TestDT <= '{dtEnd.ToString("yyyy-MM-dd HH:mm:ss")}' AND " +