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

File Controller 제거

Browse Source
This commit is contained in:
kyh
2022-09-15 18:11:56 +09:00
parent 4336516b5f
commit df8ee85a13
5 changed files with 50 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Million Hunter/HunterMainForm.cs
View File

@@ -385,9 +385,9 @@ namespace Million
_saveResultData.WinRate = winRate;
_saveResultData.ProfitRate = totalVal / totalResultList.Count;
_saveResultData.SearchResultList = totalResultList;
// 3. 자동으로 저장하기
if (FileManager.SaveResultDataToFile(_saveResultData))
if (DBConnection.QueryInsertExcuter_SavedResultData(_saveResultData))
MessageBox.Show("데이터 저장 성공");
else
MessageBox.Show("데이터 저장 실패");
@@ -459,7 +459,7 @@ namespace Million
_saveResultData.BuyRegularExpression = textEdit_BuyRegularExpression.Text;
_saveResultData.SellRegularExpression = textEdit_SellRegularExpression.Text;
if (FileManager.SaveResultDataToFile(_saveResultData))
if (DBConnection.QueryInsertExcuter_SavedResultData(_saveResultData))
MessageBox.Show("데이터 저장 성공");
else
MessageBox.Show("데이터 저장 실패");

57
Million Hunter/HunterSubForm/LoadResultViewerForm.cs
View File

@@ -13,6 +13,8 @@ using DevExpress.XtraTreeList;
using Million;
using Million.SaveData;
using Million.FileDBManagement;
using System.Data.Common;
using Million.DbManagement;
namespace Million.HunterSubForm
{
@@ -47,19 +49,22 @@ namespace Million.HunterSubForm
directoryInfo.Create();
return;
}
// 결과 데이터 정보 가져오기
foreach (var filePath in Directory.GetFiles(CommonProperty.SaveProgramDirecotryPath).ToList()
.FindAll(item => item.Contains(CommonProperty.InfoExtend)))
{
var savedResult = FileManager.LoadResultDataInfoFromFile(filePath);
savedResult.SavedInfoDataPath = filePath;
savedResult.SavedResultDataPath =
filePath.Replace(CommonProperty.InfoExtend, CommonProperty.DataExtend);
savedResult.SavedResultAnalysisDataPath =
filePath.Replace(CommonProperty.InfoExtend, CommonProperty.AnalysisExtendFolder);
savedResultDatas.Add(savedResult);
}
savedResultDatas = DBConnection.QueryGetExcuter_SavedResultData();
//foreach (var filePath in Directory.GetFiles(CommonProperty.SaveProgramDirecotryPath).ToList()
// .FindAll(item => item.Contains(CommonProperty.InfoExtend)))
//{
// var savedResult = FileManager.LoadResultDataInfoFromFile(filePath);
// savedResult.SavedInfoDataPath = filePath;
// savedResult.SavedResultDataPath =
// filePath.Replace(CommonProperty.InfoExtend, CommonProperty.DataExtend);
// savedResult.SavedResultAnalysisDataPath =
// filePath.Replace(CommonProperty.InfoExtend, CommonProperty.AnalysisExtendFolder);
// savedResultDatas.Add(savedResult);
//}
// 트리 리스트에 추가
treeList_SavedResultData.DataSource = savedResultDatas;
@@ -102,23 +107,27 @@ namespace Million.HunterSubForm
treeList_AnalysisResultData.DataSource = null;
var data = new List<int>();
data.Add(selectedResultData.Id);
treeList_AnalysisResultData.DataSource = DBConnection.QueryGetExcuter_SavedAnalysisData(data);
// 분석 데이터 정보 파일 항목 불러오기(.data)
// 폴더 검사
if (Directory.Exists(selectedResultData.SavedResultAnalysisDataPath))
{
var fileList = Directory.GetFiles(selectedResultData.SavedResultAnalysisDataPath,
"*info");
//if (Directory.Exists(selectedResultData.SavedResultAnalysisDataPath))
//{
// var fileList = Directory.GetFiles(selectedResultData.SavedResultAnalysisDataPath,
// "*info");
var savedAnalysisDataList = new List<SavedAnalysisData>();
// var savedAnalysisDataList = new List<SavedAnalysisData>();
foreach (var filePath in fileList)
{
var savedSnalysisData = FileManager.LoadResultAnalysisDataInfoFromFile(filePath);
savedAnalysisDataList.Add(savedSnalysisData);
}
// foreach (var filePath in fileList)
// {
// var savedSnalysisData = FileManager.LoadResultAnalysisDataInfoFromFile(filePath);
// savedAnalysisDataList.Add(savedSnalysisData);
// }
treeList_AnalysisResultData.DataSource = savedAnalysisDataList;
}
// treeList_AnalysisResultData.DataSource = savedAnalysisDataList;
//}
treeList_AnalysisResultData.RefreshDataSource();
}

5
Million Hunter/HunterSubForm/ResultViewerForm.cs
View File

@@ -12,6 +12,7 @@ using Million.SaveData;
using Million.FileDBManagement;
using Million.Data;
using DevExpress.XtraTreeList;
using Million.DbManagement;
namespace Million.HunterSubForm
{
@@ -135,7 +136,9 @@ namespace Million.HunterSubForm
};
// 저장 하기
if (FileManager.SavedResultAnalysisDataToFile(savedAnalysisData, _savedResultData.SavedResultAnalysisDataPath))
if (DBConnection.QueryInsertExcuter_SavedAnalysisData(savedAnalysisData, _savedResultData))
{
MessageBox.Show("데이터 저장 성공");
textEdit_Description.Text = "";

13
Million Prototype/Form1.cs
View File

@@ -143,19 +143,14 @@ namespace Million_Prototype
RealtimeDataSettingManager realTimeMsg = null;
int firstFlag = 0;
var savedResultDatas = DBConnection.QueryGetExcuter_SavedResultData();
//파일에서 데이터 가져와서 처리 해야하는 부분 Indicator List(임시 데이터)
var savedResultDatas = new List<SavedResultData>();
foreach (var filePath in Directory.GetFiles(CommonProperty.SaveProgramDirecotryPath).ToList()
.FindAll(item => item.Contains(CommonProperty.InfoExtend)))
{
var savedResult = FileManager.LoadResultDataInfoFromFile(filePath);
savedResultDatas.Add(savedResult);
}
var savedResultData = savedResultDatas[0];
var sellIndicator = savedResultData.SellSetupList.OfType<IndicatorCoditionSetup>().ToList();
var buyIndicator = savedResultData.BuySetupList.OfType<IndicatorCoditionSetup>().ToList();
var totalIndicatorList = new List<IndicatorCoditionSetup>();
totalIndicatorList.AddRange(sellIndicator);
totalIndicatorList.AddRange(buyIndicator);
@@ -267,7 +262,7 @@ namespace Million_Prototype
savedResultData.ProfitRate = totalVal / resultDataList.Count;
savedResultData.SearchResultList = resultDataList;
FileManager.SaveResultDataToFile(savedResultData);
DBConnection.QueryInsertExcuter_SavedResultData(savedResultData);
savedResultData.StartDateTime = DateTime.Now;
resultDataList.Clear();

8
Million/DbMangement/DBConnection.cs
View File

@@ -219,7 +219,7 @@ namespace Million.DbManagement
/// Insert SavedResultData
/// </summary>
/// <param name="item"></param>
public static void QueryInsertExcuter_SavedResultData(SavedResultData item)
public static bool QueryInsertExcuter_SavedResultData(SavedResultData item)
{
var baBinaryFormatter = new BinaryFormatter();
@@ -259,6 +259,7 @@ namespace Million.DbManagement
conn.Close();
}
return true;
}
catch (Exception e)
{
@@ -268,6 +269,7 @@ namespace Million.DbManagement
rdr.Close();
if (conn != null)
conn.Close();
return false;
}
}
@@ -276,7 +278,7 @@ namespace Million.DbManagement
/// </summary>
/// <param name="analysis"></param>
/// <param name="item"></param>
public static void QueryInsertExcuter_SavedAnalysisData(SavedAnalysisData savedAnalysisData, SavedResultData savedResultData)
public static bool QueryInsertExcuter_SavedAnalysisData(SavedAnalysisData savedAnalysisData, SavedResultData savedResultData)
{
var baBinaryFormatter = new BinaryFormatter();
@@ -306,6 +308,7 @@ namespace Million.DbManagement
conn.Close();
}
return true;
}
catch (Exception e)
{
@@ -315,6 +318,7 @@ namespace Million.DbManagement
rdr.Close();
if (conn != null)
conn.Close();
return false;
}
}