实现系统管理表格操作接口、分页操作

2026-05-27 18:59:26 +08:00 · 2025-08-22 19:06:50 +08:00
parent 7e965b6fb4
commit 7fe51ea362
56 changed files with 2234 additions and 1304 deletions
--- a/src/widgets/WebHandler.cpp
+++ b/src/widgets/WebHandler.cpp
@@ -10,7 +10,7 @@
 #include "app/Admin.h"
 #include "app/Device.h"

-static void VariantListRes(std::vector<DataFields>& data, QVariantList& listRes)
+static void VariantListRes(std::vector<Fields>& data, QVariantList& listRes)
 {
    for (auto& fields: data)
    {
@@ -23,7 +23,7 @@ static void VariantListRes(std::vector<DataFields>& data, QVariantList& listRes)
    }
 }

-static void JSsetResPaginaion(QVariantMap& result, std::vector<DataFields>& data, int page, int pageSize, int count, int code, string err)
+static void JSsetResPaginaion(QVariantMap& result, std::vector<Fields>& data, int page, int pageSize, int count, int code, string err)
 {
    result["code"] = code;
    result["err"] = "操作成功";
@@ -44,7 +44,7 @@ static void JSsetResPaginaion(QVariantMap& result, std::vector<DataFields>& data
    result["data"] = listRow;
 }

-static void JSgetReqParam(QString key, QVariantMap& params, DataFields& fields)
+static void JSgetReqParam(QString key, QVariantMap& params, Fields& fields)
 {
    if (params.contains(key)) fields.set(key.toStdString(), params[key].toString().toStdString());
 }
@@ -103,7 +103,7 @@ void MyWebHandler::loginOut(const QString& username)
 QVariantMap MyWebHandler::queryUserList(int page, int pageSize)
 {
    XLOGD() << "[cppNative] queryUserList";
-    std::vector<DataFields> res;
+    std::vector<Fields> res;
    DAO::queryUser(res);

    QVariantMap result;
@@ -113,7 +113,7 @@ QVariantMap MyWebHandler::queryUserList(int page, int pageSize)

 int MyWebHandler::insertUser(QVariantMap params)
 {
-    DataFields fields;
+    Fields fields;
    JSgetReqParam("account", params, fields);
    fields.set("passwd", "123456");
    JSgetReqParam("name", params, fields);
@@ -133,7 +133,7 @@ int MyWebHandler::insertUser(QVariantMap params)
    if (params.contains("role_id")) {

        int role_id = params["role_id"].toInt();
-        DataFields fieldsUserRole;
+        Fields fieldsUserRole;
        fieldsUserRole.set("user_id", user_id);
        fieldsUserRole.set("role_id", role_id);
        fieldsUserRole.set("create_time", Utils::timeNowStr());
@@ -150,7 +150,7 @@ int MyWebHandler::updateUser(const QString& userId, QVariantMap params)
    XLOGD() << "[cppNative] updateUser";

    int ret = 1;
-    DataFields fields;
+    Fields fields;
    
    JSgetReqParam("account", params, fields);
    JSgetReqParam("name", params, fields);
@@ -190,7 +190,7 @@ QVariantMap MyWebHandler::queryRoleList(int page, int pageSize)
 {
    QVariantMap result;

-    std::vector<DataFields> res;
+    std::vector<Fields> res;
    auto dao = DAO::get("role");
    bool ret = dao->exec("SELECT * FROM role;", res);
    JSsetResPaginaion(result, res, page, pageSize, res.size(), 0, "操作成功");
@@ -208,7 +208,7 @@ QVariantMap MyWebHandler::queryRoleList(int page, int pageSize)

 int MyWebHandler::insertRole(QVariantMap params) 
 {
-    DataFields fields;
+    Fields fields;
    if (params.contains("name")) fields.set("name", params["name"].toString().toStdString());
    if (fields.size() == 0)
    {
@@ -226,7 +226,7 @@ int MyWebHandler::insertRole(QVariantMap params)
 int MyWebHandler::deleteRole(const QString& roleId) { return 1; }
 int MyWebHandler::updateRole(const QString& roleId, QVariantMap params) 
 {
-    DataFields fields;
+    Fields fields;
    JSgetReqParam("name", params, fields);
    JSgetReqParam("describe", params, fields);
    if (fields.size() <= 0)
@@ -243,7 +243,7 @@ int MyWebHandler::updateRole(const QString& roleId, QVariantMap params)

 QVariantList MyWebHandler::queryRolePermissionList(int roleId)
 {
-    std::vector<DataFields> result;
+    std::vector<Fields> result;
    std::string sql = "SELECT p.permission_id, p.name, rp.role_id, rp.is_open FROM permission p "
        "LEFT JOIN role_permission rp ON(rp.permission_id = p.permission_id AND rp.role_id = '" + std::to_string(roleId) +"') WHERE p.is_open='1';";

@@ -269,13 +269,13 @@ int MyWebHandler::updateRolePermission(int roleId, QVariantList params)
    std::string sql = "DELETE FROM role_permission WHERE role_id='" + std::to_string(roleId) + "';";
    bool ret = dao->exec(sql);

-    std::vector<DataFields> vecFields;
+    std::vector<Fields> vecFields;
    for (QVariant& item: params)
    {
        if (item.canConvert<QVariantMap>())
        {
            QVariantMap itemMap = item.toMap();
-            DataFields fields;
+            Fields fields;
            fields.set("role_id", roleId);
            JSgetReqParam("permission_id", itemMap, fields);
            JSgetReqParam("is_open", itemMap, fields);
@@ -290,7 +290,7 @@ int MyWebHandler::updateRolePermission(int roleId, QVariantList params)
 // 权限管理接口
 QVariantMap MyWebHandler::queryPermissionList(int page, int pageSize)
 {
-    std::vector<DataFields> res;
+    std::vector<Fields> res;
    auto dao = DAO::get("permission");
    bool ret = dao->exec("SELECT * FROM permission;", res);

@@ -301,7 +301,7 @@ QVariantMap MyWebHandler::queryPermissionList(int page, int pageSize)

 int MyWebHandler::insertPermission(QVariantMap params) 
 {
-    DataFields fields; 
+    Fields fields; 
    JSgetReqParam("name", params, fields);
    JSgetReqParam("describe", params, fields);
    JSgetReqParam("is_open", params, fields);
@@ -316,7 +316,7 @@ int MyWebHandler::insertPermission(QVariantMap params)
 int MyWebHandler::deletePermission(const QString& permissionId) { return 1; }
 int MyWebHandler::updatePermission(const QString& permissionId, QVariantMap params) 
 {
-    DataFields fields;
+    Fields fields;
    JSgetReqParam("name", params, fields);
    JSgetReqParam("describe", params, fields);
    JSgetReqParam("is_open", params, fields);
@@ -338,7 +338,7 @@ QVariantMap MyWebHandler::queryDeviceList(int page, int pageSize)
 {
    XLOGD() << "queryDeviceList:";

-    std::vector<DataFields> res;
+    std::vector<Fields> res;
    auto dao = DAO::get("device");
    bool ret = dao->exec("SELECT * FROM device;", res);
    XLOGD() << "queryDeviceList: size=" << res.size();
@@ -397,7 +397,7 @@ QVariantList MyWebHandler::queryDevice(QVariantMap params)

    std::string sql = "SELECT * FROM device WHERE " + sqlc + ";";
    auto dao = DAO::get("device");
-    std::vector<DataFields> res;
+    std::vector<Fields> res;
    bool ret = dao->exec(sql, res);
    XLOGD() << "sql=" << sql;
    XLOGD() << "queryDevice: size=" << res.size();
@@ -410,7 +410,7 @@ QVariantList MyWebHandler::queryDevice(QVariantMap params)

 int MyWebHandler::insertDevice(QVariantMap params) 
 { 
-    DataFields fields;
+    Fields fields;
    JSgetReqParam("type", params, fields);
    JSgetReqParam("name", params, fields);
    JSgetReqParam("code", params, fields);
@@ -431,7 +431,7 @@ int MyWebHandler::insertDevice(QVariantMap params)
 int MyWebHandler::deleteDevice(const QString& deviceId) { return 1; }
 int MyWebHandler::updateDevice(const QString& deviceId, QVariantMap params) 
 {
-    DataFields fields;
+    Fields fields;
    JSgetReqParam("type", params, fields);
    JSgetReqParam("name", params, fields);
    JSgetReqParam("code", params, fields);
@@ -477,7 +477,7 @@ QVariantList MyWebHandler::queryDeviceTypeList()
 // 计费管理接口
 QVariantMap MyWebHandler::queryPriceList(int page, int pageSize)
 {
-    std::vector<DataFields> res;
+    std::vector<Fields> res;
    auto dao = DAO::get("price");
    bool ret = dao->exec("SELECT * FROM price;", res);
    XLOGD() << "queryPriceList: size=" << res.size();
@@ -488,7 +488,7 @@ QVariantMap MyWebHandler::queryPriceList(int page, int pageSize)
 }
 int MyWebHandler::insertPrice(QVariantMap params) 
 {
-    DataFields fields;
+    Fields fields;
    JSgetReqParam("type", params, fields);
    JSgetReqParam("describe", params, fields);
    JSgetReqParam("is_open", params, fields);
@@ -506,7 +506,7 @@ int MyWebHandler::insertPrice(QVariantMap params)
 int MyWebHandler::deletePrice(const QString& priceId) { return 1; }
 int MyWebHandler::updatePrice(const QString& priceId, QVariantMap params) 
 { 
-    DataFields fields;
+    Fields fields;
    JSgetReqParam("name", params, fields);
    JSgetReqParam("type", params, fields);
    JSgetReqParam("describe", params, fields);
@@ -543,7 +543,7 @@ QVariantList MyWebHandler::queryPriceTypeList()

 QVariantMap MyWebHandler::queryPolicyList(int page, int pageSize)
 {
-    std::vector<DataFields> res;
+    std::vector<Fields> res;
    auto dao = DAO::get("policy");
    bool ret = dao->exec("SELECT * FROM policy;", res);
    XLOGD() << "queryPolicyList: size=" << res.size();
@@ -555,7 +555,7 @@ QVariantMap MyWebHandler::queryPolicyList(int page, int pageSize)

 int MyWebHandler::insertPolicy(QVariantMap params) 
 { 
-    DataFields fields;
+    Fields fields;
    JSgetReqParam("type", params, fields);
    JSgetReqParam("name", params, fields);
    JSgetReqParam("value", params, fields);
@@ -577,7 +577,7 @@ int MyWebHandler::deletePolicy(const QString& policyId) { return 1; }

 int MyWebHandler::updatePolicy(const QString& policyId, QVariantMap params) 
 {
-    DataFields fields;
+    Fields fields;
    JSgetReqParam("type", params, fields);
    JSgetReqParam("name", params, fields);
    JSgetReqParam("value", params, fields);
@@ -618,7 +618,7 @@ QVariantList MyWebHandler::queryPolicyTypeList()

 QVariantMap MyWebHandler::querySyslogList(int page, int pageSize)
 {
-    std::vector<DataFields> res;
+    std::vector<Fields> res;
    auto dao = DAO::get("system_log");
    bool ret = dao->exec("SELECT * FROM system_log;", res);
    XLOGD() << "querySyslogList: size=" << res.size();
@@ -630,7 +630,7 @@ QVariantMap MyWebHandler::querySyslogList(int page, int pageSize)

 QVariantMap MyWebHandler::querySecPolicyList(int page, int pageSize)
 {
-    std::vector<DataFields> res;
+    std::vector<Fields> res;
    auto dao = DAO::get("sec_policy");
    bool ret = dao->exec("SELECT * FROM sec_policy;", res);
    XLOGD() << "querySecPolicyList: size=" << res.size();
@@ -642,7 +642,7 @@ QVariantMap MyWebHandler::querySecPolicyList(int page, int pageSize)

 int MyWebHandler::insertSecPolicy(QVariantMap params)
 {
-    DataFields fields;
+    Fields fields;
    JSgetReqParam("name", params, fields);
    JSgetReqParam("type", params, fields);
    JSgetReqParam("code", params, fields);
@@ -664,7 +664,7 @@ int MyWebHandler::insertSecPolicy(QVariantMap params)

 int MyWebHandler::updateSecPolicy(const QString& policyId, QVariantMap params)
 {
-    DataFields fields;
+    Fields fields;
    JSgetReqParam("name", params, fields);
    JSgetReqParam("type", params, fields);
    JSgetReqParam("code", params, fields);
@@ -686,7 +686,7 @@ int MyWebHandler::updateSecPolicy(const QString& policyId, QVariantMap params)

 QVariantMap MyWebHandler::querySecRecordList(int page, int pageSize) 
 {
-    std::vector<DataFields> res;
+    std::vector<Fields> res;
    auto dao = DAO::get("sec_record");
    bool ret = dao->exec("SELECT * FROM sec_record;", res);
    XLOGD() << "querySecRecordList: size=" << res.size();
--- a/src/widgets/uihelper.cpp
+++ b/src/widgets/uihelper.cpp
@@ -267,7 +267,7 @@ ChartBarView::ChartBarView(QWidget* parent, QRect rt, int xfrag)
    //chart_->legend()->update();
 }

-void ChartBarView::setTitle(std::string title)
+void ChartBarView::setStatus(std::string title)
 {
    //chart_->setTitle(title.c_str());
    labTitle_.setText(title.c_str());
--- a/src/widgets/uihelper.h
+++ b/src/widgets/uihelper.h
@@ -77,7 +77,7 @@ class ChartBarView : public QChartView
 public:
    ChartBarView(QWidget* parent, QRect rt, int xfrag=5);

-    void setTitle(std::string title);
+    void setStatus(std::string title);

    std::shared_ptr<QChart> chart();