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:
DESKTOP-1A3P75F\lee
2023-04-10 17:29:12 +09:00
parent 9f1e551e9d b2c7669408
commit 99ccac6231
12 changed files with 154 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DataSaver/MainForm.cs
View File

@@ -163,7 +163,7 @@ namespace DataSaver
sqlQuery += Million.DbManagement.DbServiceFunctions.CreateMarketTable_ToDB(item);
if (!string.IsNullOrWhiteSpace(sqlQuery))
Million.DbManagement.DBConnection.QueryUpdateExcuter(CommonProperty.DbConnectionStr + placeName, sqlQuery);
Million.DbManagement.DBConnection.QueryUpdateExecuter(CommonProperty.DbConnectionStr + placeName, sqlQuery);
}
@@ -202,12 +202,12 @@ namespace DataSaver
count++;
if (count % 50 == 0)
{
Million.DbManagement.DBConnection.QueryUpdateExcuter(CommonProperty.DbConnectionStr + placeName, sqlQuery);
Million.DbManagement.DBConnection.QueryUpdateExecuter(CommonProperty.DbConnectionStr + placeName, sqlQuery);
sqlQuery = "";
}
}
if (!string.IsNullOrWhiteSpace(sqlQuery)) Million.DbManagement.DBConnection.QueryUpdateExcuter(CommonProperty.DbConnectionStr + placeName, sqlQuery);
if (!string.IsNullOrWhiteSpace(sqlQuery)) Million.DbManagement.DBConnection.QueryUpdateExecuter(CommonProperty.DbConnectionStr + placeName, sqlQuery);
MessageBox.Show("기간 삭제 완료");
@@ -244,7 +244,7 @@ namespace DataSaver
DbServiceFunctions.GetMarketTable_FromDB("Upbit", "KRW");
// Result Data DB에 생성
Million.DbManagement.DBConnection.QueryUpdateExcuter
Million.DbManagement.DBConnection.QueryUpdateExecuter
(CommonProperty.DbConnectionResultData, DbServiceFunctions.CreateVerifyTickerDataTableQuery());
//market List
@@ -285,7 +285,7 @@ namespace DataSaver
recentlyDate = recentlyDate.AddMilliseconds(-1 * date.Millisecond);
var dicList = list.Where(t => ((DateTime)t["DateTime"]) >= beforeDate && ((DateTime)t["DateTime"]) < recentlyDate).ToList();
DBConnection.QueryInsertExcuter_VerifyTickerData(dicList, beforeDate);
DBConnection.QueryInsertExecuter_VerifyTickerData(dicList, beforeDate);
foreach(var item in dicList)
{
@@ -305,7 +305,7 @@ namespace DataSaver
// //insertDateTime = insertDateTime.AddSeconds(-1 * insertDateTime.Second);
// //insertDateTime = insertDateTime.AddMilliseconds(-1 * insertDateTime.Millisecond);
// //var dicList = list.Where(t => ((DateTime)t["DateTime"]).Hour == hour).ToList();
// //DBConnection.QueryInsertExcuter_VerifyTickerData(dicList, insertDateTime);
// //DBConnection.QueryInsertExecuter_VerifyTickerData(dicList, insertDateTime);
// ////clear 작업
// //list = list.OrderBy(t => t["DateTime"]).ToList();
// //var index = list.FindLastIndex(t => ((DateTime)t["DateTime"]).Hour == hour);

6
Million Buyer/MainForm.cs
View File

@@ -657,7 +657,7 @@ namespace Million_Buyer
try
{
//result data insert
DBConnection.QueryInsertExcuter_SavedBuyerResultData(cb_UserList.Text, Enum.GetName(typeof(BuyerMode), programMode), time, result);
DBConnection.QueryInsertExecuter_SavedBuyerResultData(cb_UserList.Text, Enum.GetName(typeof(BuyerMode), programMode), time, result);
//Grid 처리
TreeListNode buyNode = null;
@@ -790,7 +790,7 @@ namespace Million_Buyer
_saveResultData.SearchResultList = resultDataList;
DBConnection.QueryInsertExcuter_SavedResultData(_saveResultData);
DBConnection.QueryInsertExecuter_SavedResultData(_saveResultData);
_saveResultData.StartDateTime = DateTime.Now;
resultDataList.Clear();
@@ -821,7 +821,7 @@ namespace Million_Buyer
lb_log.Items.Clear();
}
lb_log.Items.Insert(0, log);
DBConnection.QueryInsertExcuter_MainLog(DateTime.Now, cb_UserList.Text, log);
DBConnection.QueryInsertExecuter_MainLog(DateTime.Now, cb_UserList.Text, log);
}));
return true;

4
Million Buyer/SubForm/IndicatorLoad.cs
View File

@@ -28,7 +28,7 @@ namespace Million_Buyer.SubForm
{
tl_Indicator.ClearNodes();
datas = DBConnection.QueryGetExcuter_RealTimeIndicator();
datas = DBConnection.QueryGetExecuter_RealTimeIndicator();
if (datas.Count > 0)
{
@@ -86,7 +86,7 @@ namespace Million_Buyer.SubForm
private void bt_Delete_Click(object sender, EventArgs e)
{
var strId = tl_Indicator.Selection.First()["Id"].ToString();
DBConnection.QueryUpdateExcuter(CommonProperty.DbConnectionResultData,
DBConnection.QueryUpdateExecuter(CommonProperty.DbConnectionResultData,
"DELETE FROM [ResultData].[dbo].[RealTimeIndicator] WHERE Id = " + strId);
Init();
}

32
Million Hunter/HunterMainForm.cs
View File

@@ -20,6 +20,7 @@ using System.Drawing;
using static Million.CommonProperty;
using Million.Data.SaveData;
using Million_Hunter.HunterSubForm;
using System.Threading;
namespace Million
{
@@ -34,9 +35,7 @@ namespace Million
// 현재 수정/삭제 대기중인 클래스의 초기화
private IndicatorCoditionSetup _curIndicatorSetup = null;
private int _indexOfList = 0;
private int _indexOfList = 0;
public MainForm()
{
@@ -279,7 +278,7 @@ namespace Million
CalculateDatas(_saveResultData, cb_UpperMainIndi.Checked, cb_IncludeClearIndicator.Checked, cb_DownBeforeValueFlag.Checked, rd_Hunter.Checked);
// 3. 자동으로 저장하기
if (DBConnection.QueryInsertExcuter_SavedResultData(_saveResultData))
if (DBConnection.QueryInsertExecuter_SavedResultData(_saveResultData))
{
MessageBox.Show("데이터 저장 성공");
}
@@ -486,6 +485,9 @@ namespace Million
var mDataList = DbServiceFunctions.GetCandleData(market, standardStartDate, standardEndDate);
var breakFlag = true;
var count = 0;
while (true)
{
if (mDataList.CandleDataLists_Im.Count == 0) break;
@@ -606,6 +608,7 @@ namespace Million
recentlyData.BuyCount = 1;
buyList.Add(buyData);
overlapBuyManagementList[item] = false;
count++;
}
}
else
@@ -616,6 +619,13 @@ namespace Million
//Hunter의 경우 1분안에 사고 팔고가 다 끝날수도 있음 그러므로 처리해야함
if (buyList.Any(t => t.ConGoodsData.CoinFullName == item))
{
//buy count 수
var flagData = buyScript.DicExcuteScript(recentlyData.CalculateFlag);
if (flagData)
{
count++;
}
var flag = false;
var scriptStr = sellScript.regularExpressionString;
@@ -651,7 +661,7 @@ namespace Million
var buyCandleData = buyItem.CandleDataLists_Im[0];
var result = DataManager.GetBuyerSearchResult(buyCandleData, recentlyData, buyItem.ConGoodsData);
result.BuyCount = count;
resultData.Add(result);
@@ -663,6 +673,7 @@ namespace Million
//처리한 buyList는 삭제
buyList.Remove(buyItem);
count = 0;
}
}
mDataList.CandleDataLists_Im.RemoveAt(0);
@@ -949,7 +960,7 @@ namespace Million
_saveResultData.BuyRegularExpression = textEdit_BuyRegularExpression.Text;
_saveResultData.SellRegularExpression = textEdit_SellRegularExpression.Text;
_saveResultData.SellExceptionRegularExpression = textEdit_SellExceptionRegularExpression.Text;
if (DBConnection.QueryInsertExcuter_SavedResultData(_saveResultData))
if (DBConnection.QueryInsertExecuter_SavedResultData(_saveResultData))
MessageBox.Show("데이터 저장 성공");
else
MessageBox.Show("데이터 저장 실패");
@@ -971,7 +982,7 @@ namespace Million
_saveResultData.BuyRegularExpression = textEdit_BuyRegularExpression.Text;
_saveResultData.SellRegularExpression = textEdit_SellRegularExpression.Text;
_saveResultData.SellExceptionRegularExpression = textEdit_SellExceptionRegularExpression.Text;
if (DBConnection.QueryInsertExcuter_RealTimeIndicator(_saveResultData, name))
if (DBConnection.QueryInsertExecuter_RealTimeIndicator(_saveResultData, name))
MessageBox.Show("데이터 저장 성공");
else
MessageBox.Show("데이터 저장 실패");
@@ -987,14 +998,15 @@ namespace Million
if(multiSavedResultDatas.Count > 0)
{
LogManager.WriteLog("헌터 리스트 계산 시작", "Hunter List 계산");
CommonProperty.InsertLogFlag = true;
CommonProperty.InsertLogFlag = true;
foreach (var item in multiSavedResultDatas)
{
{
CalculateDatas(item.SavedResultData, item.UpperMainIndicatorFlag, item.IncludeClearIndicator, item.DownBeforeValueFlag, item.HunterMode);
LogManager.WriteLog("헌터 리스트 계산 완료. Name : " + item.SavedResultData.Name, "Hunter List 계산");
// 3. 자동으로 저장하기
if (DBConnection.QueryInsertExcuter_SavedResultData(_saveResultData))
if (DBConnection.QueryInsertExecuter_SavedResultData(item.SavedResultData))
{
LogManager.WriteLog("데이터 저장 성공. Name : " + item.SavedResultData.Name, "Hunter List 계산");
}

2
Million Hunter/HunterSubForm/LoadAnalysisResultDataForm.cs
View File

@@ -36,7 +36,7 @@ namespace Million.HunterSubForm
var list = new List<int>();
list.Add(_resultViewerForm._savedResultData.Id);
treeList_ResultData.DataSource = DBConnection.QueryGetExcuter_SavedAnalysisData(list);
treeList_ResultData.DataSource = DBConnection.QueryGetExecuter_SavedAnalysisData(list);
}
private void treeList_ResultData_MouseDoubleClick(object sender, MouseEventArgs e)

6
Million Hunter/HunterSubForm/LoadResultViewerForm.cs
View File

@@ -51,7 +51,7 @@ namespace Million.HunterSubForm
}
// 결과 데이터 정보 가져오기
savedResultDatas = DBConnection.QueryGetExcuter_SavedResultData();
savedResultDatas = DBConnection.QueryGetExecuter_SavedResultData();
//foreach (var filePath in Directory.GetFiles(CommonProperty.SaveProgramDirecotryPath).ToList()
@@ -109,7 +109,7 @@ namespace Million.HunterSubForm
treeList_AnalysisResultData.DataSource = null;
var data = new List<int>();
data.Add(selectedResultData.Id);
treeList_AnalysisResultData.DataSource = DBConnection.QueryGetExcuter_SavedAnalysisData(data);
treeList_AnalysisResultData.DataSource = DBConnection.QueryGetExecuter_SavedAnalysisData(data);
// 분석 데이터 정보 파일 항목 불러오기(.data)
// 폴더 검사
@@ -145,7 +145,7 @@ namespace Million.HunterSubForm
var selectedResultData = (SavedResultData)treeList.GetDataRecordByNode(hitInfo.Node);
selectedResultData = DBConnection.QueryGetExcuter_SearchResultData(selectedResultData);
selectedResultData = DBConnection.QueryGetExecuter_SearchResultData(selectedResultData);
//Main 폼의 SaveResultData 초기화
_mainForm._saveResultData = null;

2
Million Hunter/HunterSubForm/ResultViewerForm.cs
View File

@@ -140,7 +140,7 @@ namespace Million.HunterSubForm
// 저장 하기
if (DBConnection.QueryInsertExcuter_SavedAnalysisData(savedAnalysisData, _savedResultData))
if (DBConnection.QueryInsertExecuter_SavedAnalysisData(savedAnalysisData, _savedResultData))
{
MessageBox.Show("데이터 저장 성공");
textEdit_Description.Text = "";

6
Million Prototype/Form1.cs
View File

@@ -153,7 +153,7 @@ namespace Million_Prototype
int firstFlag = 0;
var savedResultDatas = DBConnection.QueryGetExcuter_SavedResultData();
var savedResultDatas = DBConnection.QueryGetExecuter_SavedResultData();
var savedResultData = savedResultDatas.FirstOrDefault(t=>t.Name == "IndicatorTemplate");
var sellIndicator = savedResultData.SellSetupList.OfType<IndicatorCoditionSetup>().ToList();
@@ -276,7 +276,7 @@ namespace Million_Prototype
savedResultData.ExchangePlace = "Upbit";
savedResultData.ParentId = null;
DBConnection.QueryInsertExcuter_SavedResultData(savedResultData);
DBConnection.QueryInsertExecuter_SavedResultData(savedResultData);
savedResultData.StartDateTime = DateTime.Now;
resultDataList.Clear();
@@ -400,7 +400,7 @@ namespace Million_Prototype
private void button11_Click(object sender, EventArgs e)
{
//select 관련 처리
var list = DBConnection.QueryGetExcuter_SavedResultData();
var list = DBConnection.QueryGetExecuter_SavedResultData();
}
private void button4_Click(object sender, EventArgs e)

116
Million/DbMangement/DBConnection.cs
View File

@@ -23,7 +23,7 @@ namespace Million.DbManagement
return CommonProperty.DbConnectionStr + databaseName;
}
public static List<MarketData> QueryGetExcuter_Market(string strDBCon, string sqlQuery)
public static List<MarketData> QueryGetExecuter_Market(string strDBCon, string sqlQuery)
{
if (string.IsNullOrWhiteSpace(sqlQuery))
return null;
@@ -84,7 +84,7 @@ namespace Million.DbManagement
/// <param name="strDBCon"></param>
/// <param name="sqlQuery"></param>
/// <returns></returns>
public static List<CandleData> QueryGetExcuter_Candle(string strDBCon, string sqlQuery)
public static List<CandleData> QueryGetExecuter_Candle(string strDBCon, string sqlQuery)
{
var returnData = new List<CandleData>();
@@ -155,7 +155,7 @@ namespace Million.DbManagement
/// <param name="strDBCon"></param>
/// <param name="sqlQuery"></param>
/// <returns></returns>
public static List<Dictionary<string, object>> QueryGetExcuter_MainLog(string strDBCon, string userName, DateTime startDate, DateTime endDate)
public static List<Dictionary<string, object>> QueryGetExecuter_MainLog(string strDBCon, string userName, DateTime startDate, DateTime endDate)
{
var returnData = new List<Dictionary<string, object>>();
@@ -207,7 +207,7 @@ namespace Million.DbManagement
/// <param name="strDBCon"></param>
/// <param name="sqlQuery"></param>
/// <returns></returns>
public static List<CandleData> QueryGetExcuterTest_Candle(string strDBCon, string sqlQuery)
public static List<CandleData> QueryGetExecuterTest_Candle(string strDBCon, string sqlQuery)
{
var returnData = new List<CandleData>();
@@ -238,7 +238,7 @@ namespace Million.DbManagement
/// </summary>
/// <param name="strDBCon">conn</param>
/// <param name="sqlQuery">create table sql</param>
public static void QueryUpdateExcuter(string strDBCon, string sqlQuery)
public static void QueryUpdateExecuter(string strDBCon, string sqlQuery)
{
SqlConnection conn = null;
SqlDataReader rdr = null;
@@ -277,7 +277,7 @@ namespace Million.DbManagement
/// <param name="savedDateTime"></param>
/// <param name="data"></param>
/// <returns></returns>
public static bool QueryInsertExcuter_SavedBuyerResultData(string userName, string mode, DateTime savedDateTime, SearchResult data)
public static bool QueryInsertExecuter_SavedBuyerResultData(string userName, string mode, DateTime savedDateTime, SearchResult data)
{
var binaryFormatter = new BinaryFormatter();
@@ -321,11 +321,93 @@ namespace Million.DbManagement
}
}
/// <summary>
/// SavedResultData List 삭제
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
public static bool QueryDeleteExecuter_SavedResultData(List<int> ids)
{
var sqlQuery = @"DELETE FROM [ResultData].[dbo].[SavedResultData] WHERE Id in(" + string.Join(",", ids) + ")";
var strDBCon = CommonProperty.DbConnectionResultData;
SqlConnection conn = null;
SqlDataReader rdr = null;
try
{
using (conn = new SqlConnection(strDBCon))
{
using (var cmd = new SqlCommand(sqlQuery, conn))
{
conn.Open();
using (rdr = cmd.ExecuteReader())
{
}
}
conn.Close();
}
return true;
}
catch (Exception e)
{
Console.WriteLine(" ============= exception ===============");
Console.WriteLine(e.Message);
if (rdr != null)
rdr.Close();
if (conn != null)
conn.Close();
return false;
}
}
/// <summary>
/// SavedResultData 삭제
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public static bool QueryDeleteExecuter_SavedResultData(int id)
{
var sqlQuery = @"DELETE FROM [ResultData].[dbo].[SavedResultData] WHERE Id =" + id;
var strDBCon = CommonProperty.DbConnectionResultData;
SqlConnection conn = null;
SqlDataReader rdr = null;
try
{
using (conn = new SqlConnection(strDBCon))
{
using (var cmd = new SqlCommand(sqlQuery, conn))
{
conn.Open();
using (rdr = cmd.ExecuteReader())
{
}
}
conn.Close();
}
return true;
}
catch (Exception e)
{
Console.WriteLine(" ============= exception ===============");
Console.WriteLine(e.Message);
if (rdr != null)
rdr.Close();
if (conn != null)
conn.Close();
return false;
}
}
/// <summary>
/// Insert SavedResultData
/// </summary>
/// <param name="item"></param>
public static bool QueryInsertExcuter_SavedResultData(SavedResultData item)
public static bool QueryInsertExecuter_SavedResultData(SavedResultData item)
{
var baBinaryFormatter = new BinaryFormatter();
@@ -384,7 +466,7 @@ namespace Million.DbManagement
/// </summary>
/// <param name="savedData"></param>
/// <returns></returns>
public static bool QueryInsertExcuter_MainLog(DateTime savedData, string user, string data)
public static bool QueryInsertExecuter_MainLog(DateTime savedData, string user, string data)
{
var sqlQuery = string.Format(@"INSERT INTO [ResultData].[dbo].[MainLog] VALUES('{0}', '{1}', '{2}');",
@@ -430,7 +512,7 @@ namespace Million.DbManagement
/// </summary>
/// <param name="item"></param>
/// <returns></returns>
public static bool QueryInsertExcuter_RealTimeIndicator(SavedResultData item, string name)
public static bool QueryInsertExecuter_RealTimeIndicator(SavedResultData item, string name)
{
var baBinaryFormatter = new BinaryFormatter();
@@ -484,7 +566,7 @@ namespace Million.DbManagement
/// <param name="item"></param>
/// <param name="name"></param>
/// <returns></returns>
public static bool QueryInsertExcuter_VerifyTickerData(List<Dictionary<string, object>> data, DateTime savedDateTime)
public static bool QueryInsertExecuter_VerifyTickerData(List<Dictionary<string, object>> data, DateTime savedDateTime)
{
var baBinaryFormatter = new BinaryFormatter();
@@ -536,7 +618,7 @@ namespace Million.DbManagement
/// </summary>
/// <param name="analysis"></param>
/// <param name="item"></param>
public static bool QueryInsertExcuter_SavedAnalysisData(SavedAnalysisData savedAnalysisData, SavedResultData savedResultData)
public static bool QueryInsertExecuter_SavedAnalysisData(SavedAnalysisData savedAnalysisData, SavedResultData savedResultData)
{
var baBinaryFormatter = new BinaryFormatter();
@@ -588,7 +670,7 @@ namespace Million.DbManagement
/// <param name="startDate"></param>
/// <param name="endDate"></param>
/// <returns></returns>
public static List<SearchResult> QueryGetExcuter_SavedBuyerResultData(string userName, string mode, DateTime startDate, DateTime endDate)
public static List<SearchResult> QueryGetExecuter_SavedBuyerResultData(string userName, string mode, DateTime startDate, DateTime endDate)
{
var returnData = new List<SearchResult>();
var sqlQuery = string.Format(@"SELECT * FROM [ResultData].[dbo].[SavedBuyerResultData] WHERE [Mode] = '{0}' AND [UserName] = '{1}'
@@ -635,7 +717,7 @@ namespace Million.DbManagement
/// <param name="startDate"></param>
/// <param name="endDate"></param>
/// <returns></returns>
public static List<Dictionary<string, object>> QueryGetExcuter_VerifyTickerData(DateTime startDate, DateTime endDate)
public static List<Dictionary<string, object>> QueryGetExecuter_VerifyTickerData(DateTime startDate, DateTime endDate)
{
var returnData = new List<Dictionary<string, object>>();
var sqlQuery = string.Format(@"SELECT * FROM [ResultData].[dbo].[VerifyTickerData] WHERE [SavedDateTime] >= '{0}' AND [SavedDateTime] <= '{1}';",
@@ -680,7 +762,7 @@ namespace Million.DbManagement
/// <param name="data"></param>
/// <param name="id"></param>
/// <returns></returns>
public static SavedResultData QueryGetExcuter_SearchResultData(SavedResultData data)
public static SavedResultData QueryGetExecuter_SearchResultData(SavedResultData data)
{
if (data != null && data.Id > 0)
{
@@ -724,7 +806,7 @@ namespace Million.DbManagement
/// </summary>
/// <param name="idList"></param>
/// <returns></returns>
public static List<SavedResultData> QueryGetExcuter_SavedResultData(List<int> idList = null, bool includeFolder = true)
public static List<SavedResultData> QueryGetExecuter_SavedResultData(List<int> idList = null, bool includeFolder = true)
{
var returnData = new List<SavedResultData>();
var sqlQuery = @"SELECT [Id]
@@ -843,7 +925,7 @@ namespace Million.DbManagement
/// </summary>
/// <param name="resultIdList"></param>
/// <returns></returns>
public static List<SavedAnalysisData> QueryGetExcuter_SavedAnalysisData(List<int> resultIdList)
public static List<SavedAnalysisData> QueryGetExecuter_SavedAnalysisData(List<int> resultIdList)
{
var returnData = new List<SavedAnalysisData>();
var sqlQuery = "SELECT * FROM [ResultData].[dbo].[SavedAnalysisData] WHERE ";
@@ -923,7 +1005,7 @@ namespace Million.DbManagement
/// 실시간 Indicator 가져오는 함수
/// </summary>
/// <returns></returns>
public static List<Dictionary<string, object>> QueryGetExcuter_RealTimeIndicator()
public static List<Dictionary<string, object>> QueryGetExecuter_RealTimeIndicator()
{
var returnData = new List<Dictionary<string, object>>();
var sqlQuery = "SELECT * FROM [ResultData].[dbo].[RealTimeIndicator]";

12
Million/DbMangement/DBServiceFunctions.cs
View File

@@ -199,7 +199,7 @@ namespace Million.DbManagement
// Query문 만들기
var sqlQuery = string.Format("select * from dbo.{0} where IsValid = 1 {1};", tableName, subSql);
return DBConnection.QueryGetExcuter_Market(strDbCon, sqlQuery);
return DBConnection.QueryGetExecuter_Market(strDbCon, sqlQuery);
}
/// <summary>
@@ -237,7 +237,7 @@ namespace Million.DbManagement
var sqlQuery = string.Format(@"SELECT [DateTime],[StartValue],[EndValue],[HighValue],[LowValue],[MoneyVolume],[CandleTimeType] FROM [{0}] WHERE [DateTime] >= '{1}' AND [DateTime] < '{2}' AND [CandleTimeType] = {3} ORDER BY [DateTime] ASC", marketData.CoinFullName, startDate.ToString("yyyy-MM-dd HH:mm:ss"), endDate.ToString("yyyy-MM-dd HH:mm:ss"), (int)candleTimeType);
var dataList = DBConnection.QueryGetExcuter_Candle(strDbCon, sqlQuery);
var dataList = DBConnection.QueryGetExecuter_Candle(strDbCon, sqlQuery);
if (dataList == null) return returnData;
@@ -282,7 +282,7 @@ namespace Million.DbManagement
var sqlQuery = string.Format(@"SELECT TOP({0}) [DateTime],[StartValue],[EndValue],[HighValue],[LowValue],[MoneyVolume],[CandleTimeType] FROM [{1}] WHERE [DateTime] >= '{2}' AND [CandleTimeType] = {3} ORDER BY [DateTime] ASC", count, marketData.CoinFullName, startDate.ToString("yyyy-MM-dd HH:mm:ss"), ((int)candleTimeType).ToString());
var dataList = DBConnection.QueryGetExcuter_Candle(strDbCon, sqlQuery);
var dataList = DBConnection.QueryGetExecuter_Candle(strDbCon, sqlQuery);
if (dataList == null) return returnData;
@@ -313,7 +313,7 @@ namespace Million.DbManagement
data.ConGoodsData = item;
var sqlQuery = string.Format(@"SELECT TOP(1) [DateTime],[StartValue],[EndValue],[HighValue],[LowValue],[MoneyVolume],[CandleTimeType] FROM [{0}] WHERE [CandleTimeType] = {1} ORDER BY [DateTime] DESC", item.CoinFullName, ((int) candleTimeType).ToString());
var recentlyDataList = DBConnection.QueryGetExcuter_Candle(strDbCon, sqlQuery);
var recentlyDataList = DBConnection.QueryGetExecuter_Candle(strDbCon, sqlQuery);
if (recentlyDataList.Count > 0)
{
@@ -336,7 +336,7 @@ namespace Million.DbManagement
// 1개라도 있을 경우
var sqlQuery = string.Format("SELECT TOP(1) [DateTime],[StartValue],[EndValue],[HighValue],[LowValue],[MoneyVolume],[CandleTimeType] FROM [{0}] WHERE [CandleTimeType] = {1} ORDER BY [DateTime] ASC", item.ConGoodsData.CoinFullName, ((int)candleTimeType).ToString());
var recentlyDataList = DBConnection.QueryGetExcuter_Candle(strDbCon, sqlQuery);
var recentlyDataList = DBConnection.QueryGetExecuter_Candle(strDbCon, sqlQuery);
if (recentlyDataList.Count > 0)
{
recentlyDataList[0].CandleType = CandleType.Old;
@@ -514,7 +514,7 @@ namespace Million.DbManagement
break;
//초당 8회 이상안됨 (0.125초)
if (!string.IsNullOrWhiteSpace(insertQuery))
DBConnection.QueryUpdateExcuter(DbConnectionStr + placeName, insertQuery);
DBConnection.QueryUpdateExecuter(DbConnectionStr + placeName, insertQuery);
Thread.Sleep(60);
insertQuery = "";
}

14
Million/Manager/InitManager.cs
View File

@@ -22,15 +22,15 @@ namespace Million.Manager
DbServiceFunctions.GetMarketTable_FromDB(marketName, Enum.GetName(typeof(PaymentType), payment));
// Result Data DB에 생성
Million.DbManagement.DBConnection.QueryUpdateExcuter
Million.DbManagement.DBConnection.QueryUpdateExecuter
(CommonProperty.DbConnectionResultData, DbServiceFunctions.CreateSavedAnalysisDataTableQuery());
Million.DbManagement.DBConnection.QueryUpdateExcuter
Million.DbManagement.DBConnection.QueryUpdateExecuter
(CommonProperty.DbConnectionResultData, DbServiceFunctions.CreateSavedResultDataTableQuery());
Million.DbManagement.DBConnection.QueryUpdateExcuter
Million.DbManagement.DBConnection.QueryUpdateExecuter
(CommonProperty.DbConnectionResultData, DbServiceFunctions.CreateRealTimeIndicatorTableQuery());
Million.DbManagement.DBConnection.QueryUpdateExcuter
Million.DbManagement.DBConnection.QueryUpdateExecuter
(CommonProperty.DbConnectionResultData, DbServiceFunctions.CreateMainLogTableQuery());
Million.DbManagement.DBConnection.QueryUpdateExcuter
Million.DbManagement.DBConnection.QueryUpdateExecuter
(CommonProperty.DbConnectionResultData, DbServiceFunctions.CreateSavedBuyerResultDataTableQuery());
@@ -39,7 +39,7 @@ namespace Million.Manager
foreach (var placeName in GetMarketList())
{
var createTableSql = Million.DbManagement.DbServiceFunctions.CreateMarketTableQuery(placeName);
Million.DbManagement.DBConnection.QueryUpdateExcuter
Million.DbManagement.DBConnection.QueryUpdateExecuter
(CommonProperty.DbConnectionMarket, createTableSql);
}
UpdateMarketTableOfPlace(placeType, payment);
@@ -98,7 +98,7 @@ namespace Million.Manager
data.CoinFullName);
}
if (!string.IsNullOrWhiteSpace(sqlQuery))
Million.DbManagement.DBConnection.QueryUpdateExcuter(CommonProperty.DbConnectionMarket, sqlQuery);
Million.DbManagement.DBConnection.QueryUpdateExecuter(CommonProperty.DbConnectionMarket, sqlQuery);
GetRecentlyMarketOfPlaceList(placeType);
}

2
Million/Manager/RealtimeDataSettingManager.cs
View File

@@ -168,7 +168,7 @@ namespace Million.Manager
/// </summary>
private void GetAllTickerDataList()
{
var tickerDickList = DBConnection.QueryGetExcuter_VerifyTickerData(startDateTime, endDateTime);
var tickerDickList = DBConnection.QueryGetExecuter_VerifyTickerData(startDateTime, endDateTime);
tickerDickList = tickerDickList.OrderBy(t => t["DateTime"]?.ToString()).ToList();
foreach (var item in tickerDickList)
{