'bug修复'

admin

2022-09-30 1a16b19acb23a4f28bafd01f3ed80fb225a96c3e

 app/appDlg.cpp

@@ -30,6 +30,7 @@
#include "loginDlg.h"
#include <psapi.h>
#pragma comment(lib,"psapi.lib")
#include "ExcelUtil.h"


// 用于应用程序“关于”菜单项的 CAboutDlg 对话框
@@ -130,6 +131,7 @@
   DDX_Control(pDX, IDC_CHECK_TRADE_TIME_TRADE_SUCCESS, tradeSuccessTimeCheck);
   DDX_Control(pDX, IDC_CHECK_TRADE_TIME_DELEGATE, delegateTimeCheck);
   DDX_Control(pDX, IDC_CHECK_TRADE_TIME_LIMIT_UP, limitUpTimeCheck);
   DDX_Control(pDX, IDC_BUTTON_UPLOAD_EXCEL_CODE, uploadExcelGPBtn);
}

BEGIN_MESSAGE_MAP(CappDlg, CDialogEx)
@@ -160,6 +162,7 @@
   ON_BN_CLICKED(IDC_CHECK_TRADE_TIME_TRADE_SUCCESS, &CappDlg::OnBnClickedCheckTradeTimeTradeSuccess)
   ON_BN_CLICKED(IDC_CHECK_TRADE_TIME_DELEGATE, &CappDlg::OnBnClickedCheckTradeTimeDelegate)
   ON_BN_CLICKED(IDC_CHECK_PRICE_TIME_LIMIT, &CappDlg::OnBnClickedCheckPriceTimeLimit)
   ON_BN_CLICKED(IDC_BUTTON_UPLOAD_EXCEL_CODE, &CappDlg::OnBnClickedButtonUploadExcelCode)
END_MESSAGE_MAP()


@@ -203,9 +206,17 @@
   L2DataCapture::setTradeTimeCapture(true);

   limitUpTimeCheck.SetCheck(TRUE);
   LimitUpCapture::setTradeTimeCapture(limitUpTimeCheck.GetCheck());
	
   tradeSuccessTimeCheck.SetCheck(TRUE);
   TradeListCapture::setTradeTimeCapture_success(tradeSuccessTimeCheck.GetCheck());

   delegateTimeCheck.SetCheck(TRUE);
   TradeListCapture::setTradeTimeCapture_delegate(delegateTimeCheck.GetCheck());

   priceTimeLimitCheck.SetCheck(TRUE);
   CurrentPriceCapture::setTradeTimeCapture(priceTimeLimitCheck.GetCheck());
	



@@ -273,9 +284,11 @@

   if (authoritySet.count(AUTHORITY_UPLOAD_CODE) > 0) {
      uploadGPBtn.EnableWindow(TRUE);
      uploadExcelGPBtn.EnableWindow(TRUE);
   }
   else {
      uploadGPBtn.EnableWindow(FALSE);
      uploadExcelGPBtn.EnableWindow(FALSE);
   }


@@ -352,14 +365,14 @@
}


void  CappDlg::OnL2DataCallback(int index, string code, list<TradeData> dataList, void* context) {
void  CappDlg::OnL2DataCallback(int index, string code, long captureTime, long processTime, list<TradeData> dataList, void* context) {
   //转为json
   CappDlg* app = (CappDlg*)context;
   //cout << "回调:" << std::this_thread::get_id() << ":" << index << endl;
   CButton* btn = (CButton*)app->GetDlgItem(IDC_CHECK1);
   bool check = btn->GetCheck();
   if (check) {
      string data = JsonUtil::loadL2Data(app->clientNum, index, code, dataList);
      string data = JsonUtil::loadL2Data(app->clientNum, index, code, captureTime, processTime, dataList);
      clock_t time_start = clock();
      try {
         app->socketManager->sendMsg(index, data.c_str());
@@ -562,6 +575,8 @@
            int key = (*ele).first;
            string value = (*ele).second;
            app->capture->setGPCode(key, value);
            cout << "代码位：" << key << " CODE:" << value;
                //TODO 记录日志  
         }
         Sleep(500);
      }
@@ -735,6 +750,14 @@
      root["data"] = data;
      root["client"] = clientNum;
      return JsonUtil::toJsonStr(root);
   }
   else if (action == "updateTHSSite") {
      try {
         THSActionUtil::updateMainSite();
      }
      catch (string st) {
         throw st;
      }
   }

   return "";
@@ -1259,7 +1282,12 @@
   for (list<CString>::iterator ele = paths.begin();ele != paths.end();ele++) {
      CString path = *ele;
   std:string p = Tool::cstring2String(path);
      cv::Mat grayImg = gpDataCapture->grayImgs(cv::imread(p));
      cv::Mat img = cv::imread(p);
      //cv::Mat _img;
      //cv::resize(img, _img, cv::Size(img.cols * 2 / 3, img.rows * 2 / 3));

      cv::Mat grayImg = gpDataCapture->grayImgs(img);


      SplitType types[] = { NUM_TYPE_MONEY, NUM_TYPE_CODE };

@@ -1297,6 +1325,22 @@
   codesDataDlog dlg;
   dlg.DoModal();
}

// Excel上传股票代码
void CappDlg::OnBnClickedButtonUploadExcelCode()
{
   CString cpath = GUITool::selectImage();
std:string path = Tool::cstring2String(cpath);
   if (path.length() > 0)
   {
      ExcelUtil::read(path);
   }


	
}



//涨停上传
void CappDlg::OnBnClickedButton12()
@@ -1495,7 +1539,7 @@



   string data = JsonUtil::loadL2Data(clientNum, 0, "002338", dataList);
   string data = JsonUtil::loadL2Data(clientNum, 0, "002338",0,0, dataList);
   clock_t time_start = clock();
   try {
      socketManager->sendMsg(index, data.c_str());
@@ -1717,3 +1761,6 @@
   // 现价识别时段限制
   CurrentPriceCapture::setTradeTimeCapture(priceTimeLimitCheck.GetCheck());
}