fix: 正常请求ruoyi系统数据；解析动量数据

basedatamanager.cpp

@@ -22,3 +22,8 @@ UserInfo BaseDataManager::Login(const QString &userName, const QString &password
 {
     return UserInfo();
 }
+
+void BaseDataManager::GetTrends(QDate date,const QString& token)
+{
+
+}

basedatamanager.h

@@ -4,6 +4,7 @@
 #include <QObject>
 #include <QPixmap>
 #include "structs.h"
+#include <QDate>
 
 class BaseDataManager : public QObject
 {
@@ -14,6 +15,7 @@ public:
 
     virtual QPixmap GetVerificationCode();
     virtual UserInfo Login(const QString& userName,const QString& password,const QString& code);
+    virtual void GetTrends(QDate date,const QString& token);
 
 signals:
     //请求结束 ret 返回值 0成功 非0失败

main.cpp

@@ -20,6 +20,8 @@ int main(int argc, char *argv[])
     if(login.exec() == QDialog::Accepted)
     {
         MainWindow w;
+        w.SetUserInfo(login.GetUserInfo());
+        w.LoadTrendsData();
         w.show();
         return app.exec();
     }

mainwindow.cpp

@@ -12,6 +12,7 @@ MainWindow::MainWindow(QWidget *parent)
     ui->setupUi(this);
     this->setWindowTitle("mojin");
     InitTradeTable();
+    m_UserData.SetManagerType(ManagerType::Ruoyi);
 }
 
 MainWindow::~MainWindow()
@@ -24,6 +25,11 @@ void MainWindow::SetUserInfo(UserInfo user)
     m_UserInfo = user;
 }
 
+void MainWindow::LoadTrendsData()
+{
+    m_UserData.GetTrends(QDate(),m_UserInfo.token);
+}
+
 void MainWindow::InitTradeTable()
 {
     //    m_pTradesModel = new TradeTableModel(ui->tradeTableView);
@@ -54,14 +60,14 @@ void MainWindow::on_addTrade_pushButton_clicked()
     AddTradeDialog ad;
     ad.setWindowTitle("添加记录");
     ad.exec();
-    for (int row = 0; row < 4; ++row)
+//    for (int row = 0; row < 4; ++row)
-    {
+//    {
-        m_pTradeStandardModel->insertRow(row);
+//        m_pTradeStandardModel->insertRow(row);
-        for (int column = 0; column < 3; ++column) {
+//        for (int column = 0; column < 3; ++column) {
-            QStandardItem *item = new QStandardItem(QString("row %0, column %1").arg(row).arg(column));
+//            QStandardItem *item = new QStandardItem(QString("row %0, column %1").arg(row).arg(column));
-            m_pTradeStandardModel->setItem(row, column, item);
+//            m_pTradeStandardModel->setItem(row, column, item);
-        }
+//        }
-    }
+//    }
 
 }
 

mainwindow.h

@@ -3,6 +3,7 @@
 
 #include <QMainWindow>
 #include "structs.h"
+#include "userdata.h"
 
 QT_BEGIN_NAMESPACE
 namespace Ui { class MainWindow; }
@@ -18,6 +19,9 @@ public:
     MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
     void SetUserInfo(UserInfo user);
+    //临时使用，后续需要重新创建
+    void SetUserData();
+    void LoadTrendsData();
 
 private:
     void InitTradeTable();
@@ -28,6 +32,7 @@ private slots:
 private:
     Ui::MainWindow *ui;
     UserInfo m_UserInfo;
+    UserData m_UserData;
 //    TradeTableModel* m_pTradesModel;
     QStandardItemModel* m_pTradeStandardModel;
 };

ruoyi/ruoyidatamanager.cpp

@@ -6,6 +6,7 @@
 #include <QJsonDocument>
 #include <QJsonParseError>
 #include <QJsonObject>
+#include <QJsonArray>
 #include <QEventLoop>
 #include <QTimer>
 
@@ -72,6 +73,35 @@ UserInfo RuoyiDataManager::Login(const QString &userName, const QString &passwor
     return m_userInfo;
 }
 
+void RuoyiDataManager::GetTrends(QDate date,const QString& token)
+{
+    QNetworkRequest request;
+    QString urlStr(m_sUrl + "/prod-api/stocksystem/trends/listSection");
+
+    QUrl url = QUrl(urlStr);
+
+    QUrlQuery query;
+    query.addQueryItem("Token", token.toUtf8());
+    query.addQueryItem("pageNum", "1");
+    query.addQueryItem("pageSize", "10");
+    query.addQueryItem("tradeDay", "2023-12-07");
+    query.addQueryItem("type", "20");
+    url.setQuery(query);
+
+    request.setUrl(url);
+    request.setHeader(QNetworkRequest::ContentTypeHeader,"application/json;charset=UTF-8");
+    request.setRawHeader("Authorization",QString("Bearer %1").arg(token).toLocal8Bit());
+    qDebug() << __FUNCTION__ << " rawHeader: " << QString("Bearer %1").arg(token).toLocal8Bit();
+
+    QNetworkReply *reply = m_pNetworkManager->get(request);
+    reply->setProperty("msgType",QVariant(int(GETTRENDS)));
+    connect(reply,&QNetworkReply::finished,this,&RuoyiDataManager::RequestFinished);
+
+    QEventLoop loop;
+    connect(this, SIGNAL(ParseReplyFinished()), &loop, SLOT(quit()));
+    loop.exec();
+}
+
 void RuoyiDataManager::RequestFinished()
 {
     QNetworkReply *reply = dynamic_cast< QNetworkReply* >(sender());
@@ -84,6 +114,10 @@ void RuoyiDataManager::RequestFinished()
     {
         ParseLogin(reply);
     }
+    else if(type == GETTRENDS)
+    {
+        ParseTrends(reply);
+    }
     emit ParseReplyFinished();
 }
 
@@ -160,3 +194,73 @@ void RuoyiDataManager::ParseLogin(QNetworkReply *reply)
     }
 }
 
+void RuoyiDataManager::ParseTrends(QNetworkReply *reply)
+{
+    QByteArray readAllArray;
+    QVariant statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
+    if(statusCode.isValid())
+    {
+        qDebug() << "status code=" << statusCode.toInt();
+    }
+
+    QNetworkReply::NetworkError err = reply->error();
+    if(err != QNetworkReply::NoError)
+    {
+        qDebug() << "Failed: " << reply->errorString();
+    }
+    else
+    {
+        readAllArray = reply->readAll();
+        qDebug() << __FUNCTION__ << readAllArray;
+/**
+ * total:
+ * rows:[{title:2级行业,sortDataList:["煤炭","营销服务"]},{title:2023-12-07,sortDataList:["1","2"]}]
+ * msg:""
+ *
+ * 第0行是第一列行业；title是列名
+*/
+        QJsonParseError jsonError;
+        QJsonDocument document = QJsonDocument::fromJson(readAllArray,&jsonError);
+        if(jsonError.error == QJsonParseError::NoError && !document.isNull())
+        {
+            QList< QList<QString> > rowsList;
+            QList<QString> dates;
+            int rowCounts = 0;
+            QJsonObject root = document.object();
+            if(root.contains("total"))
+            {
+                qDebug() << __FUNCTION__ << root["total"];
+                rowCounts = root["total"].toInt();
+            }
+            if(root.contains("rows"))
+            {
+                QJsonArray rows = root["rows"].toArray();
+                for(int i = 0 ; i < rowCounts; i++)
+                {
+                    QJsonObject obj = rows[i].toObject();
+                    if(obj.contains("title"))
+                    {
+                        dates.append(obj["title"].toString());
+                    }
+                    if(obj.contains("sortDataList"))
+                    {
+                        QList<QString> datasList;
+                        QJsonArray datas = obj["sortDataList"].toArray();
+                        for(int c = 0 ; c < datas.count(); c++)
+                        {
+                            datasList.append(datas[c].toString());
+                        }
+                        rowsList.append(datasList);
+                    }
+                }
+                rowsList.prepend(dates);
+            }
+            qDebug() << __FUNCTION__ << rowsList;
+        }
+        else
+        {
+            qDebug() << __FUNCTION__ << __LINE__ << jsonError.errorString();
+        }
+    }
+}
+

ruoyi/ruoyidatamanager.h

@@ -11,7 +11,8 @@ class RuoyiDataManager : public BaseDataManager
     enum MsgType
     {
         GETVERIFICATIONCODE = 0,
-        LOGIN
+        LOGIN,
+        GETTRENDS,
     };
 
 public:
@@ -20,6 +21,7 @@ public:
 
     QPixmap GetVerificationCode() override;
     UserInfo Login(const QString& userName,const QString& password,const QString& code) override;
+    void GetTrends(QDate date,const QString& token) override;
 
 public slots:
     void RequestFinished();
@@ -29,6 +31,7 @@ signals:
 private:
     void ParseVerificationCode(QNetworkReply* reply);
     void ParseLogin(QNetworkReply* reply);
+    void ParseTrends(QNetworkReply* reply);
 
 private:
     QNetworkAccessManager* m_pNetworkManager;

treasurefinder_zh_CN.ts

@@ -107,6 +107,55 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LoginDialog</name>
+    <message>
+        <location filename="widget/logindialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widget/logindialog.ui" line="29"/>
+        <source>Verification code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widget/logindialog.ui" line="65"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widget/logindialog.ui" line="72"/>
+        <source>UserName</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widget/logindialog.ui" line="85"/>
+        <source>admin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widget/logindialog.ui" line="98"/>
+        <source>1qazse42W3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widget/logindialog.ui" line="117"/>
+        <location filename="widget/logindialog.cpp" line="43"/>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widget/logindialog.ui" line="124"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widget/logindialog.cpp" line="43"/>
+        <source>Login Error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
@@ -196,79 +245,79 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="36"/>
+        <location filename="mainwindow.cpp" line="38"/>
         <source>date</source>
         <translatorcomment>日期</translatorcomment>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="36"/>
+        <location filename="mainwindow.cpp" line="38"/>
         <source>week</source>
         <translatorcomment>星期</translatorcomment>
         <translation>星期</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="36"/>
+        <location filename="mainwindow.cpp" line="38"/>
         <source>name</source>
         <translatorcomment>证券名称</translatorcomment>
         <translation>证券名称</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="36"/>
+        <location filename="mainwindow.cpp" line="38"/>
         <source>operate</source>
         <translatorcomment>操作</translatorcomment>
         <translation>操作</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="36"/>
+        <location filename="mainwindow.cpp" line="38"/>
         <source>operateprice</source>
         <translatorcomment>操作价格</translatorcomment>
         <translation>操作价格</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="36"/>
+        <location filename="mainwindow.cpp" line="38"/>
         <source>volume</source>
         <translatorcomment>操作数量</translatorcomment>
         <translation>操作数量</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="37"/>
+        <location filename="mainwindow.cpp" line="39"/>
         <source>remainig</source>
         <translatorcomment>剩余数量</translatorcomment>
         <translation>剩余数量</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="37"/>
+        <location filename="mainwindow.cpp" line="39"/>
         <source>operatechange</source>
         <translatorcomment>操作涨跌幅</translatorcomment>
         <translation>操作涨跌幅</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="37"/>
+        <location filename="mainwindow.cpp" line="39"/>
         <source>close</source>
         <translatorcomment>收盘价</translatorcomment>
         <translation>收盘价</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="37"/>
+        <location filename="mainwindow.cpp" line="39"/>
         <source>operateprofit</source>
         <translatorcomment>操作盈亏</translatorcomment>
         <translation>操作盈亏</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="37"/>
+        <location filename="mainwindow.cpp" line="39"/>
         <source>totalprofit</source>
         <translatorcomment>收盘盈亏</translatorcomment>
         <translation>收盘盈亏</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="38"/>
+        <location filename="mainwindow.cpp" line="40"/>
         <source>finalprofit</source>
         <translatorcomment>总盈亏</translatorcomment>
         <translation>总盈亏</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="38"/>
+        <location filename="mainwindow.cpp" line="40"/>
         <source>remark</source>
         <translatorcomment>备注</translatorcomment>
         <translation>备注</translation>

userdata.cpp

@@ -42,3 +42,9 @@ UserInfo UserData::Login(const QString &userName, const QString &password, const
     else
         return m_pDataManager->Login(userName,password,code);
 }
+
+void UserData::GetTrends(QDate date, const QString &token)
+{
+    if(m_pDataManager != nullptr)
+        m_pDataManager->GetTrends(date,token);
+}

userdata.h

@@ -17,6 +17,8 @@ public:
     QPixmap GetVerificationCode();
     //登录 获取用户信息,同步等待
     UserInfo Login(const QString& userName,const QString& password,const QString& code);
+    //获取trends
+    void GetTrends(QDate date,const QString& token);
 
 private:
     BaseDataManager* m_pDataManager;

widget/logindialog.h

@@ -17,7 +17,7 @@ class LoginDialog : public QDialog
 public:
     explicit LoginDialog(QWidget *parent = nullptr);
     ~LoginDialog();
-
+    UserInfo GetUserInfo(){return m_UserInfo;}
 private:
     //加载验证码
     void GetVerificationCode();