million/Million
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/V1.1' of http://222.96.13.116/Million into feature/V1.1

Browse Source
This commit is contained in:
jwlee
2023-03-21 12:45:08 +09:00
parent 9958586239 0105c8ae6c
commit 96768aa238
3 changed files with 66 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Million Buyer/MainForm.cs
View File

@@ -296,7 +296,7 @@ namespace Million_Buyer
}
}));
//5초에 한번씩 부르게 처리
//5초에 한번씩 부르게 처리
Thread.Sleep(5000);
}
InsertLog("Order Thread End");

2
Million Hunter/HunterSubForm/LoadResultViewerForm.cs
View File

@@ -145,6 +145,8 @@ namespace Million.HunterSubForm
var selectedResultData = (SavedResultData)treeList.GetDataRecordByNode(hitInfo.Node);
selectedResultData = DBConnection.QueryGetExcuter_SearchResultData(selectedResultData);
//Main 폼의 SaveResultData 초기화
_mainForm._saveResultData = null;
//Main 폼의 SaveResultData 초기화 (클론 복사 해야할 수 있음)

65
Million/DbMangement/DBConnection.cs
View File

@@ -674,6 +674,49 @@ namespace Million.DbManagement
return returnData;
}
/// <summary>
/// SavedResultData의 데이터를 기준으로 SearchResultList를 포함
/// </summary>
/// <param name="data"></param>
/// <param name="id"></param>
/// <returns></returns>
public static SavedResultData QueryGetExcuter_SearchResultData(SavedResultData data)
{
if (data != null && data.Id > 0)
{
var sqlQuery = @"SELECT [SearchResultList] FROM [ResultData].[dbo].[SavedResultData] WHERE [Id] = " + data.Id;
var strDBCon = CommonProperty.DbConnectionResultData;
using (var conn = new SqlConnection(strDBCon))
{
using (var cmd = new SqlCommand(sqlQuery, conn))
{
try
{
conn.Open();
using (var rdr = cmd.ExecuteReader())
{
while (rdr.Read())
{
data.SearchResultList = (List<SearchResult>)GetBinaryConvertClass(rdr, "SearchResultList");
}
}
conn.Close();
}
catch (Exception ex)
{
Console.WriteLine(" ============= exception ===============");
Console.WriteLine(ex.Message);
conn.Close();
return data;
}
}
}
}
return data;
}
/// <summary>
/// Get SavedResultData
@@ -684,7 +727,25 @@ namespace Million.DbManagement
public static List<SavedResultData> QueryGetExcuter_SavedResultData(List<int> idList = null, bool includeFolder = true)
{
var returnData = new List<SavedResultData>();
var sqlQuery = "SELECT * FROM [ResultData].[dbo].[SavedResultData] WHERE [Type] IN('Data'";
var sqlQuery = @"SELECT [Id]
,[ParentId]
,[Name]
,[StartDateTime]
,[EndDateTime]
,[SavedDateTime]
,[BuySetupList]
,[SellSetupList]
,[BuyRegularExpression]
,[SellRegularExpression]
,[ResultDataCount]
,[WinRate]
,[ProfitRate]
,[FirstProfitRate]
,[FirstWinRate]
,[ExchangePlace]
,[Type]
,[SaveResultType]
,[Description] FROM [ResultData].[dbo].[SavedResultData] WHERE [Type] IN('Data'";
if (includeFolder)
sqlQuery += ",'Folder'";
@@ -723,7 +784,7 @@ namespace Million.DbManagement
var data = new SavedResultData();
data.BuySetupList = (List<object>)GetBinaryConvertClass(rdr, "BuySetupList");
data.SellSetupList = (List<object>)GetBinaryConvertClass(rdr, "SellSetupList");
data.SearchResultList = (List<SearchResult>)GetBinaryConvertClass(rdr, "SearchResultList");
//data.SearchResultList = (List<SearchResult>)GetBinaryConvertClass(rdr, "SearchResultList");
int.TryParse(rdr["Id"]?.ToString(), out var id);
data.Id = id;