로그출력수정

git-svn-id: svn://192.168.0.12/source@313 8346c931-da38-4b9b-9d4c-e48b93cbd075

EffectUI/scompanyprocess.cpp

@@ -8,13 +8,11 @@
 #include <QStringList>
 #include <QDebug>
 
-
 namespace
 {
 const QString strDatabaseName("processlist");
 }
 
-
 SCompanyProcess::SCompanyProcess():SParentProcess(),
     m_iterEffectRow(nullptr), m_iterRunOrderList(nullptr), m_bDoneCompany(false)
 {
@@ -87,7 +85,7 @@ void SCompanyProcess::runInit()
         if (!m_vecRunOrderList.contains(query.value(1).toInt()))
             m_vecRunOrderList.append(query.value(1).toInt());
     }
-    qDebug() << m_vecRunOrderList;
+    // qDebug() << m_vecRunOrderList;
     /*
     while (query.next())
     {
@@ -129,10 +127,20 @@ void SCompanyProcess::runInit()
     */
     QMap<int, SReportSummary> mapSummary;
     qDebug() << setGroup;
+
+    foreach (auto company, m_vecRunList)
+    {
+        if (!m_mapEffectRow.contains(company))
+            m_mapEffectRow.insert(company, QVector<SEffectRow>());
+
+        if (!mapSummary.contains(company))
+            mapSummary.insert(company, SReportSummary());
+    }
+
     while (query.next())
     {
         int nCompany = query.value(0).toInt();
-        qDebug() << query.value(4).toInt();
+        //qDebug() << query.value(4).toInt();
         if (!m_mapEffectRow.contains(nCompany))
             m_mapEffectRow.insert(nCompany, QVector<SEffectRow>());
 
@@ -163,10 +171,13 @@ void SCompanyProcess::runInit()
         }
     }
     setReportSummary(mapSummary);
+
     int totalEffectNum = 0;
     for (auto iterPos = m_mapEffectRow.begin(); iterPos != m_mapEffectRow.end(); ++iterPos)
     {
         totalEffectNum += iterPos.value().size();
+        if (iterPos.value().size() == 0)
+            emit signalTerminateCompany(iterPos.key());
     }
 
     if (totalEffectNum == 0)
@@ -176,7 +187,6 @@ void SCompanyProcess::runInit()
         return;
     }
 
-
     initIterator();
     setInnerMode(E_INNER_RUN_MODE::MODE_RUN_EVENTCODE);
     db.close();

EffectUI/seffectlogic.cpp

@@ -206,7 +206,10 @@ void SEffectLogic::slotCompleteCompany(int _companyNum, const SReportSummary& _r
     m_pSRunningListWidget->setInfo(_companyNum, _reportSummary.nOk, _reportSummary.nError,
                                    _reportSummary.nActiveEventCode, _reportSummary.nAllGroupEvent,
                                    _reportSummary.nTotal);
-    m_pSRunningListWidget->setComplete(_companyNum);
+    if (_reportSummary.nAllGroupEvent == 0)
+        m_pSRunningListWidget->setOutDate(_companyNum);
+    else
+        m_pSRunningListWidget->setComplete(_companyNum);
 }
 
 void SEffectLogic::slotSuccessErrorCompany(int _companyNum)
@@ -230,14 +233,15 @@ void SEffectLogic::slotCompanyOutdated(const QVector<int>& _vecCompany)
 void SEffectLogic::slotTerminateNormal(const QVector<SEffectRow>& _error,
                                        const QMap<int, SReportSummary>& _report)
 {
-    qDebug() << "slotTerminateNormal";
+    // qDebug() << "slotTerminateNormal";
     m_pSLogWidget->writeLog("Number of Erros : " + QString::number(_error.size()));
     m_pSLogWidget->writeLog(" ");
 
     for (auto iterPos = _report.cbegin(); iterPos != _report.cend(); ++iterPos)
     {
         QString str;
-        str += QString::number(iterPos.key()) + ":";
+        //str += QString::number(iterPos.key()) + ":";
+        str += m_pSRunningListWidget->getCompanyName(iterPos.key()) + ":";
         str += QString::number(iterPos.value().nOk) + "/";
         str += QString::number(iterPos.value().nError) + "/";
         str += QString::number(iterPos.value().nActiveEventCode) + "/";
@@ -245,10 +249,12 @@ void SEffectLogic::slotTerminateNormal(const QVector<SEffectRow>& _error,
         str += QString::number(iterPos.value().nTotal);
         m_pSLogWidget->writeLog(str);
     }
-    qDebug() << "Error size : " << _error.size();
-    qDebug() << "nRetry : " << nRetry;
+    // qDebug() << "Error size : " << _error.size();
+    // qDebug() << "nRetry : " << nRetry;
     if ((_error.size() > 0) && (nRetry-- > 0))
     {
+        m_pSLogWidget->writeLog("");
+        m_pSLogWidget->writeLog("");
         m_pSLogWidget->writeLog("Error Retry : " + QString::number(nRetry + 1));
         m_pSLogWidget->writeLog("Start Error Process");
         m_pSRunningProcess->setList(_error);

EffectUI/sparentprocess.cpp

@@ -154,7 +154,7 @@ void SParentProcess::runProcess(QStringList _arguments)
     }
     else
     {
-        emit signalLog("x " + m_erCurrentRow.eventcode + " " + m_erCurrentRow.url + "\nERROR:NO_PROGRAM");
+        emit signalLog("x " + m_erCurrentRow.eventcode + " " + m_erCurrentRow.url + "\n[99:99:99] ERROR:NO_PROGRAM");
         emit signalTerminateEachEvent(m_erCurrentRow.company_num, E_CRAWL_STATE::FAIL);
         m_vecError.append(m_erCurrentRow);
         setInnerMode(E_INNER_RUN_MODE::MODE_RUN_EVENTCODE);
@@ -450,9 +450,9 @@ QString SParentProcess::makeLog(const SError& _error)
         str += "x ";
         str += m_erCurrentRow.company_name + " ";
         str += _error.event_code + " ";
-        str += _error.url + "\n";
-        str += "  ERROR:" + errorCodeToString(_error.error_code) + "\n";
-        str += "  ERRORMSG:" + _error.str_error;
+        str += _error.url + "\n[99:99:99] ";
+        str += "ERROR:" + errorCodeToString(_error.error_code) + "\n[99:99:99] ";
+        str += "ERRORMSG:" + _error.str_error;
         break;
     }
     }

EffectUI/srunninglistwidget.cpp

@@ -300,7 +300,7 @@ void SRunningListWidget::setOutDate(int _id)
 {
     QTableWidgetItem* item = findWidgetItembyID(_id, E_TABLE_HEADER::STATUS);
     if (item)
-        item->setText(QDateTime::currentDateTime().toString("OutDate"));
+        item->setText("OutDate");
 }
 
 void SRunningListWidget::setInfo(int _id, int _ok, int _error, int _active_event, int _all_active_group, int _total)
@@ -336,6 +336,15 @@ void SRunningListWidget::setInfoErrortoOk(int _id)
     }
 }
 
+QString SRunningListWidget::getCompanyName(int _company_num)
+{
+    QTableWidgetItem* item = findWidgetItembyID(_company_num, E_TABLE_HEADER::COMPANY);
+    if (item)
+        return item->text();
+    else
+        return QString::number(_company_num);
+}
+
 
 
 void SRunningListWidget::slotTimerStart()
@@ -363,3 +372,4 @@ void SRunningListWidget::slotForceStop()
 }
 
 
+

EffectUI/srunninglistwidget.h

@@ -25,6 +25,7 @@ public:
     QVBoxLayout* getLayout() const;
     void delList(int _id);
     void delList(QVector<int> _ids);
+    QString getCompanyName(int _company_num);
     ~SRunningListWidget();
 
 private:

EffectUI/stimer.cpp

@@ -119,14 +119,15 @@ void STimer::checkTimeout()
     QTime now = QTime::currentTime();
     bool bChangedHour = (m_nPreviousHour == now.hour()) ? false : true;
     m_nPreviousHour = now.hour();
+    /*
     qDebug() << "timer";
     qDebug() << "bChangedHour : " << bChangedHour;
     for (auto iter =  m_setTime.begin(); iter != m_setTime.end(); ++iter)
         qDebug() << *iter;
-
+    */
     if (bChangedHour && m_setTime.contains(now.hour()))
     {
-        qDebug() << "TimeOut condition satisfied";
+        //qDebug() << "TimeOut condition satisfied";
         emit timeout();
     }
 }

EffectUI/widget.cpp

@@ -43,7 +43,7 @@ Widget::Widget(QWidget *parent) : m_pCompanyWidget(new SCompanyListWidget),
     m_pLogic->setSRunningWidget(m_pRunningListWidget);
 
     m_pLogic->initConnect();
-
+    m_pTimer->set(3);
     setLayout(vmainLayout);
     setWindowTitle("EffectUI " + QString::number(QCoreApplication::applicationPid()));