From 9190340264f947b7978072aad4b0d9660f9f891f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 16 一月 2023 18:09:13 +0800
Subject: [PATCH] '交易策略优化'
---
app/JsonUtil.h | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/app/JsonUtil.h b/app/JsonUtil.h
index ef9010a..865bca8 100644
--- a/app/JsonUtil.h
+++ b/app/JsonUtil.h
@@ -13,20 +13,20 @@
public:
- static Json::Value toJson(std::list<TradeData> dataList) {
+ static Json::Value toJson(std::list<TradeData*> dataList) {
Json::Value root;
- std::list<TradeData>::iterator ele;
+ std::list<TradeData*>::iterator ele;
int index = 0;
for (ele = dataList.begin();ele != dataList.end();ele++) {
Json::Value item;
- item["time"] = (*ele).time;
- item["price"] = (*ele).price;
- item["num"] = (*ele).num;
- item["limitPrice"] = (*ele).limitPrice;
- item["operateType"] = (*ele).operateType;
- item["cancelTime"] = (*ele).cancelTime;
- item["cancelTimeUnit"] = (*ele).cancelTimeUnit;
+ item["time"] = (*ele)->time;
+ item["price"] = (*ele)->price;
+ item["num"] = (*ele)->num;
+ item["limitPrice"] = (*ele)->limitPrice;
+ item["operateType"] = (*ele)->operateType;
+ item["cancelTime"] = (*ele)->cancelTime;
+ item["cancelTimeUnit"] = (*ele)->cancelTimeUnit;
root[index++] = item;
}
return root;
@@ -54,10 +54,12 @@
std::unique_ptr<Json::StreamWriter> jsonWriter(writerBuilder.newStreamWriter());
jsonWriter->write(json, &os);
string jsonStr = os.str();
+ //释放资源
+ jsonWriter.reset();
return jsonStr;
}
- static std::string loadL2Data(int clientID, int channel, string code, long captureTime, long processTime, std::list<TradeData> dataList) {
+ static std::string loadL2Data(int clientID, int channel, string code, long captureTime, long processTime, std::list<TradeData*> dataList) {
Json::Value data;
data["channel"] = channel;
data["code"] = code;
@@ -305,6 +307,25 @@
root["data"] = data;
return toJsonStr(root);
}
+ // ocr识别
+ static std::string loadOcrData(int client,cv::Mat mat,string key) {
+ Json::Value data;
+ Json::Value array;
+ int len = mat.rows * mat.cols;
+ for (int i = 0; i < len; i++) {
+ Json::Value d;
+ d[0] = mat.data[i];
+ array[i] = d;
+ }
+ data["data"] = array;
+ data["width"] = mat.cols;
+ data["height"] = mat.rows;
+ data["key"] = key;
+ Json::Value root;
+ root["data"] = data;
+ root["type"] = 100;
+ return toJsonStr(root);
+ }
static std::string toJson(ClientEnvState state) {
Json::Value root;
--
Gitblit v1.8.0