From 87b37d5ce9e0cab42da4dc836adaff5b8d1e4d35 Mon Sep 17 00:00:00 2001
From: sunwen <sunwen@192.168.1.9:3000>
Date: Wed, 19 Jun 2024 13:53:40 +0800
Subject: [PATCH] feat: Add  create failed because  recon connect error.

---
 src/device/DeviceManager.cpp |  8 ++++----
 src/device/DeviceManager.h   |  4 ++--
 src/recon/ReconManager.cpp   | 18 ++++++++++++++++--
 src/recon/ReconManager.h     |  4 ++--
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/device/DeviceManager.cpp b/src/device/DeviceManager.cpp
index ecab858..0447ef0 100644
--- a/src/device/DeviceManager.cpp
+++ b/src/device/DeviceManager.cpp
@@ -1080,7 +1080,7 @@ void DeviceManager::processTransferProgress(const QString& aProgress)
     }
 }
 
-void DeviceManager::processReconCreateEmptyScan(bool aResult, const QString& aScanID, const QString& aMessage)
+void DeviceManager::processReconCreateEmptyScan(bool aResult, const QString& aScanID, const QString& aMessage, bool aIsConnectSucceed)
 {
     if(aResult)
     {
@@ -1095,7 +1095,7 @@ void DeviceManager::processReconCreateEmptyScan(bool aResult, const QString& aSc
     }
 
     emitInfoCallback(aMessage, MessageLevel::Error);
-    QString sql = QString("UPDATE EScan set State = 204 where ScanID = '%1'").arg(aScanID);
+    QString sql = QString("UPDATE EScan set State = %1 where ScanID = '%2'").arg(aIsConnectSucceed ? "304" : "204").arg(aScanID);
     if(!SQLHelper::exec(sql))
     {
         QString msg = "DB Error. Code:G505";
@@ -1103,7 +1103,7 @@ void DeviceManager::processReconCreateEmptyScan(bool aResult, const QString& aSc
     }
 }
 
-void DeviceManager::processReconCreateScan(bool aResult, const QString& aScanID, const QString& aMessage)
+void DeviceManager::processReconCreateScan(bool aResult, const QString& aScanID, const QString& aMessage, bool aIsConnectSucceed)
 {
     if(aResult)
     {
@@ -1117,7 +1117,7 @@ void DeviceManager::processReconCreateScan(bool aResult, const QString& aScanID,
     }
 
     emitInfoCallback(aMessage, MessageLevel::Error);
-    QString sql = QString("UPDATE Scan set State = 204 where ScanID = '%1'").arg(aScanID);
+    QString sql = QString("UPDATE Scan set State = %1 where ScanID = '%2'").arg(aIsConnectSucceed ? "304" : "204").arg(aScanID);
     if(!SQLHelper::exec(sql))
     {
         QString msg = "DB Error. Code:G505";
diff --git a/src/device/DeviceManager.h b/src/device/DeviceManager.h
index b44680a..f6f3a1a 100644
--- a/src/device/DeviceManager.h
+++ b/src/device/DeviceManager.h
@@ -135,8 +135,8 @@ private slots:
     void processReceiveDMSInfoResult(int aServerID, int aActionID, const QString& aContents);
 
     //Recon
-    void processReconCreateEmptyScan(bool aResult, const QString& aScanID, const QString& aMessage);
-    void processReconCreateScan(bool aResult, const QString& aScanID, const QString& aMessage);
+    void processReconCreateEmptyScan(bool aResult, const QString& aScanID, const QString& aMessage, bool aIsConnectSucceed);
+    void processReconCreateScan(bool aResult, const QString& aScanID, const QString& aMessage, bool aIsConnectSucceed);
     void processReconQueryScanState(bool aResult, const QVariant& aState);
     void startCreateReconRecord();
     void updateReconConnectionState(bool aIsConnected);
diff --git a/src/recon/ReconManager.cpp b/src/recon/ReconManager.cpp
index c425a8c..faadf6d 100644
--- a/src/recon/ReconManager.cpp
+++ b/src/recon/ReconManager.cpp
@@ -62,7 +62,14 @@ void ReconManager::createEmptyScan(const QString& aScanID, const QString& aPath)
     {
         qDebug()<< "Create empty scan fail by %s\n" << result.error().data();
         LOG_SYS_OPERATION("Create empty scan failed. " + QString(result.error().data()))
-        emit createEmptyScanResponsed(false, aScanID, result.error().data());
+        if(result.isConnectFailure())
+        {
+            emit createEmptyScanResponsed(false, aScanID, result.error().data(), false);
+        }
+        else
+        {
+            emit createEmptyScanResponsed(false, aScanID, result.error().data());
+        }
     }
 }
 
@@ -80,7 +87,14 @@ void ReconManager::createScan(const QString& aScanID, const QString& aStudyUID,c
     {
         qDebug()<< "Recon create scan failed by " << response.error().data();
         LOG_SYS_OPERATION("Recon create scan failed" + QString(response.error().data()))
-        emit createScanResponsed(false, aScanID, response.error().data());
+        if(response.isConnectFailure())
+        {
+            emit createScanResponsed(false, aScanID, response.error().data(), false);
+        }
+        else
+        {
+            emit createScanResponsed(false, aScanID, response.error().data());
+        }
     }
 }
 
diff --git a/src/recon/ReconManager.h b/src/recon/ReconManager.h
index 8e33bd3..51116e2 100644
--- a/src/recon/ReconManager.h
+++ b/src/recon/ReconManager.h
@@ -32,8 +32,8 @@ private:
 
 signals:
     void restartCreatReconRecord();
-    void createEmptyScanResponsed(bool aResult, const QString& aScanID, const QString& aMessage = "");
-    void createScanResponsed(bool aResult,  const QString& aScanID, const QString& aMessage = "");
+    void createEmptyScanResponsed(bool aResult, const QString& aScanID, const QString& aMessage = "", bool aIsConnectSucceed = true);
+    void createScanResponsed(bool aResult,  const QString& aScanID, const QString& aMessage = "", bool aIsConnectSucceed = true);
     void queryReconStateResponsed(bool aResult, const QVariant& aData);
     void setPacsSettingsResponsed(bool aResult, const QVariant& aMessage);
     void setMppsSettingsResponsed(bool aResult, const QVariant& aMessage);