Merge pull request #82 from JunWang666/bot_workalert

JunWang666 · web-flow · commit e9eca0a0cf26 · 2025-07-13T16:46:26.000+08:00
Bot workalert
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -143,6 +143,8 @@ set(SHARED_SOURCES
         view/SplashScreen/nativesplash.cpp
         view/SplashScreen/nativesplash.h
         view/SplashScreen/nativesplash.ui
+        module/scanner/WorkAlert.cpp
+        module/scanner/WorkAlert.h
         view/RegisterCenter/registernewuser.cpp
         view/RegisterCenter/registernewuser.h
         view/RegisterCenter/registernewuser.ui
diff --git a/main.cpp b/main.cpp
@@ -22,11 +22,13 @@
 #include "view/RegisterCenter/checknewuser.h"
 #include "view/SplashScreen/nativesplash.h"
 //#include "view/SplashScreen/splashscreen.h"
+#include "module/scanner/WorkAlert.h"
 
 void setup_tasks() {
     // 后台定时每1分钟扫描库存告警
     service::taskManager::getTimer().scheduleTask(60000, []() {
         bot::InventoryAlert::sendAlert();
+        bot::WorkAlert::sendAdminCheckNewUserAlert();
     });
 }
 
diff --git a/module/data/data_UserControl.cpp b/module/data/data_UserControl.cpp
@@ -717,7 +717,7 @@ namespace data::UserControl {
         QList<int> getAllUserId(int page, int pageSize) {
             service::DatabaseManager db(service::Path::user());
             QString query = R"(
-                  SELECT id FROM users WHERE status != 'Deleted' AND id_number NOT LIKE '-%'
+                  SELECT id FROM users WHERE status != 'Deleted' AND id_number NOT LIKE 'System%'
                     ORDER BY created_at DESC
                     LIMIT ? OFFSET ?
               )";
@@ -735,7 +735,7 @@ namespace data::UserControl {
         QList<int> getUncheckedUserId(int page, int pageSize) {
             service::DatabaseManager db(service::Path::user());
             QString query = R"(
-                  SELECT id FROM users WHERE status == 'Unchecked' AND id_number NOT LIKE '-%'
+                  SELECT id FROM users WHERE status == 'Unchecked' AND id_number NOT LIKE 'System%'
                     ORDER BY created_at DESC
                     LIMIT ? OFFSET ?
               )";
@@ -751,7 +751,7 @@ namespace data::UserControl {
         QList<int> getAllUserId() {
             service::DatabaseManager db(service::Path::user());
             QString query = R"(
-                  SELECT id FROM users WHERE status != 'Deleted' AND id_number NOT LIKE '-%'
+                  SELECT id FROM users WHERE status != 'Deleted' AND id_number NOT LIKE 'System%'
               )";
             auto results = db.executePreparedQueryAndFetchAll(query, {});
             QList<int> userIds;
@@ -764,7 +764,7 @@ namespace data::UserControl {
         QList<int> getUncheckedUserId() {
             service::DatabaseManager db(service::Path::user());
             QString query = R"(
-                   SELECT id FROM users WHERE status == 'Unchecked' AND id_number NOT LIKE '-%'
+                   SELECT id FROM users WHERE status == 'Unchecked' AND id_number NOT LIKE 'System%'
               )";
             auto results = db.executePreparedQueryAndFetchAll(query, {});
             QList<int> userIds;
@@ -835,6 +835,17 @@ namespace data::UserControl {
             return true;
         }
 
+        bool rejectUserRegister(int userId) {
+            service::DatabaseManager db(service::Path::user());
+            QString query = R"(
+                UPDATE users SET status = 'Rejected' WHERE id = ? AND status = 'Unchecked'
+            )";
+            if (!db.executePreparedNonQuery(query, {userId})) {
+                return false;
+            }
+            return true;
+        }
+
         QString getUserStatus(int userId) {
             service::DatabaseManager db(service::Path::user());
             QString query = R"(
diff --git a/module/data/data_UserControl.h b/module/data/data_UserControl.h
@@ -311,6 +311,7 @@ namespace data::UserControl {
         bool banUser(int userId);
 
         bool unbanUser(int userId);
+        bool rejectUserRegister(int userId);
 
         QString getUserStatus(int userId);
     }
diff --git a/module/data/data_mail.cpp b/module/data/data_mail.cpp
@@ -24,12 +24,13 @@ namespace data::mail {
     }
 
     void registerSystemUser() {
-        data::UserControl::Login::createNewUser("-1", "库存预警", "huidbauiuicbabiabduiab", "System");
-        data::UserControl::Login::createNewUser("-2", "LabNexus团队", "bcfuiasbiasuibcviuab", "System");
+        data::UserControl::Login::createNewUser("System_3", "库存预警", "huidbauiuicbabiabduiab", "System");
+        data::UserControl::Login::createNewUser("System_2", "LabNexus团队", "bcfuiasbiasuibcviuab", "System");
+        data::UserControl::Login::createNewUser("System_1", "工作提醒", "bcfuiasbiasuibcviuab", "System");
     }
 
     void findSystemUser() {
-        std::vector<QString> searchIds = {"-1","-2"};
+        std::vector<QString> searchIds = {"System_1", "System_2", "System_3",};
         for (QString id : searchIds) {
             auto userNameResult = data::UserControl::UserInfo::getUserNameByIdNumber(id);
             auto id2 = data::UserControl::Login::foundUserIdByIdNumber(id);
diff --git a/module/scanner/InventoryAlert.cpp b/module/scanner/InventoryAlert.cpp
@@ -8,7 +8,9 @@
 
 namespace bot::InventoryAlert {
     void sendAlert() {
-            service::DatabaseManager db(service::Path::equipment());
+        if (!data::UserControl::permission::isUserInGroup(data::UserControl::currentUserId, "Admin")) return;
+
+        service::DatabaseManager db(service::Path::equipment());
 
         QString query = R"(
             SELECT
diff --git a/module/scanner/WorkAlert.cpp b/module/scanner/WorkAlert.cpp
@@ -0,0 +1,20 @@
+//
+// Created by gouzuang on 25-7-13.
+//
+
+#include "WorkAlert.h"
+
+#include "module/data/data_mail.h"
+
+namespace bot::WorkAlert {
+    void sendAdminCheckNewUserAlert() {
+        if (!data::UserControl::permission::isUserInGroup(data::UserControl::currentUserId, "Admin")) return;
+        auto count = data::UserControl::check::getUncheckedUserCount();
+        if (count == 0) return;
+        data::mail::send_mail(data::mail::systemReservedAccounts["工作提醒"],
+                              data::UserControl::currentUserId,
+                              "还有" + QString::number(count) + "个新用户待审核",
+                              "请前往注册中心查看新用户信息并进行审核。",
+                              "{}");
+    }
+}
diff --git a/module/scanner/WorkAlert.h b/module/scanner/WorkAlert.h
@@ -0,0 +1,11 @@
+//
+// Created by gouzuang on 25-7-13.
+//
+
+#ifndef WORKALERT_H
+#define WORKALERT_H
+
+namespace bot::WorkAlert {
+    void sendAdminCheckNewUserAlert();
+}
+#endif //WORKALERT_H
diff --git a/view/RegisterCenter/checkuserblock.cpp b/view/RegisterCenter/checkuserblock.cpp
@@ -34,6 +34,7 @@ namespace view::RegisterCenter {
         }
 
         connect(&acceptButton, &QPushButton::clicked, this, &CheckUserBlock::AcceptCheck);
+        connect(&rejectButton, &QPushButton::clicked, this, &CheckUserBlock::RejectCheck);
     }
 
     CheckUserBlock::~CheckUserBlock() {
@@ -137,6 +138,10 @@ namespace view::RegisterCenter {
         rejectButton.setStyleSheet(styleSheet2);
     }
 
+    void CheckUserBlock::RejectCheck() {
+        data::UserControl::check::rejectUserRegister(userId);
+    }
+
     void CheckUserBlock::AcceptCheck() {
         if (data::UserControl::check::allowUserRegister(userId)) {
             acceptButton.setVisible(false);

Original file line number	Diff line number	Diff line change
`@@ -311,6 +311,7 @@ namespace data::UserControl {`
`311`	`311`	`bool banUser(int userId);`
`312`	`312`
`313`	`313`	`bool unbanUser(int userId);`
	`314`	`+ bool rejectUserRegister(int userId);`
`314`	`315`
`315`	`316`	`QString getUserStatus(int userId);`
`316`	`317`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ namespace view::RegisterCenter {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`connect(&acceptButton, &QPushButton::clicked, this, &CheckUserBlock::AcceptCheck);`
	`37`	`+ connect(&rejectButton, &QPushButton::clicked, this, &CheckUserBlock::RejectCheck);`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`CheckUserBlock::~CheckUserBlock() {`
`@@ -137,6 +138,10 @@ namespace view::RegisterCenter {`
`137`	`138`	`rejectButton.setStyleSheet(styleSheet2);`
`138`	`139`	`}`
`139`	`140`
	`141`	`+ void CheckUserBlock::RejectCheck() {`
	`142`	`+ data::UserControl::check::rejectUserRegister(userId);`
	`143`	`+ }`
	`144`	`+`
`140`	`145`	`void CheckUserBlock::AcceptCheck() {`
`141`	`146`	`if (data::UserControl::check::allowUserRegister(userId)) {`
`142`	`147`	`acceptButton.setVisible(false);`