diff --git a/Filter/Filter.pro b/Filter/Filter.pro index d1aff15..d80534c 100644 --- a/Filter/Filter.pro +++ b/Filter/Filter.pro @@ -14,5 +14,7 @@ TEMPLATE = app SOURCES += main.cpp\ widget.cpp \ + ../Json/sjson.cpp HEADERS += widget.h \ + ../Json/sjson.h diff --git a/Filter/widget.cpp b/Filter/widget.cpp index 85fed6b..6a90599 100644 --- a/Filter/widget.cpp +++ b/Filter/widget.cpp @@ -9,8 +9,20 @@ #include #include +#include "../json/sjson.h" + #define D_NONE -1 +//#define D_DB_WEB_HOST "db.big-bird.co.kr" +//#define D_DB_WEB_USER "concepters" +//#define D_DB_WEB_PASS "con97996655" +//#define D_DB_WEB_NAME "dbconcepters" + +#define D_DB_WEB_HOST "192.168.0.82" +#define D_DB_WEB_USER "root" +#define D_DB_WEB_PASS "1234" +#define D_DB_WEB_NAME "dbconcepters" + Widget::Widget(QWidget *parent) : QWidget(parent) { @@ -139,10 +151,10 @@ void Widget::Refresh() } db.close(); - db.setHostName("db.big-bird.co.kr"); - db.setUserName("concepters"); - db.setPassword("con97996655"); - db.setDatabaseName("dbconcepters"); + db.setHostName(D_DB_WEB_HOST); + db.setUserName(D_DB_WEB_USER); + db.setPassword(D_DB_WEB_PASS); + db.setDatabaseName(D_DB_WEB_NAME); if (db.open() == false) { @@ -164,10 +176,10 @@ void Widget::Refresh() void Widget::CompanyItemChanged(QListWidgetItem* _current,QListWidgetItem*) { if (_current == 0) return; - db.setHostName("db.big-bird.co.kr"); - db.setUserName("concepters"); - db.setPassword("con97996655"); - db.setDatabaseName("dbconcepters"); + db.setHostName(D_DB_WEB_HOST); + db.setUserName(D_DB_WEB_USER); + db.setPassword(D_DB_WEB_PASS); + db.setDatabaseName(D_DB_WEB_NAME); if (db.open() == false) { qDebug() << db.lastError().text(); @@ -253,11 +265,11 @@ void Widget::on_insert() InsertLog("Data Get ..." ); m_body_data.clear(); m_reply_data.clear(); - DataGet(list); + //DataGet(list); InsertLog("Data Filter ..." ); - //DataFilter(list); + DataFilter(list); InsertLog("Data Put ..." ); - DataPut(list); + //DataPut(list); InsertLog("Finish"); FilterProcssRefresh(); } @@ -460,15 +472,17 @@ void Widget::DataGet(QStringList _list) db.close(); } -void Widget::FilterDate(int _nCategory,QDate _dateStart,QDate _dateEnd) +void Widget::FilterDate(QString _strJson) { int nColumn; + /* switch(_nCategory) { case 0:nColumn = 2;break; // main case 1:nColumn = 10;break; // comment default : return; } + */ QVector copyData; foreach(QStringList strList , m_body_data) @@ -490,7 +504,15 @@ void Widget::FilterDate(int _nCategory,QDate _dateStart,QDate _dateEnd) m_body_data = copyData; } -void Widget::FilterSeracher(int _nCatalog,int _nMethod , int _nKeyword , QString _strSearch) +void Widget::FilterLength(QString _strJson) +{ +} + +void Widget::FilterReplace(QString _strJson) +{ +} + +void Widget::FilterSerach(QString _strJson) { QStringList strListKeyword = _strSearch.split(" "); if (_nMethod == 1) @@ -553,18 +575,24 @@ void Widget::DataFilter(QStringList _list) InsertLog(db.lastError().text()); return; } - QString sql = "select id,type,timecategory,timestart,timeend,searchescategory,searchesmethod,searcheskeyword,searchesstring from filter where filtergroup_id = " + _list.at(3); + QString sql = "select type,data from filter where filtergroup_id = " + _list.at(3); QSqlQuery query; if(query.exec(sql) == false) { InsertLog(query.lastError().text());return;} while (query.next()) { - switch(query.value(1).toInt()) + switch(query.value(0).toInt()) { - case 0://Date - FilterDate(query.value(2).toInt(),query.value(3).toDate(),query.value(4).toDate()); + case E_FILTER_TYPE_DATE://Date + FilterDate(query.value(1).toString()); break; - case 1: - FilterSeracher(query.value(5).toInt(),query.value(6).toInt(),query.value(7).toInt(),query.value(8).toString()); + case E_FILTER_TYPE_SEARCH: + FilterSerach(query.value(1).toString()); + break; + case E_FILTER_TYPE_LENGTH: + FilterLength(query.value(1).toString()); + break; + case E_FILTER_TYPE_REPLACE: + FilterReplace(query.value(1).toString()); break; } } @@ -573,10 +601,10 @@ void Widget::DataFilter(QStringList _list) void Widget::DataPut(QStringList _list) { - db.setHostName("db.big-bird.co.kr"); - db.setUserName("concepters"); - db.setPassword("con97996655"); - db.setDatabaseName("dbconcepters"); + db.setHostName(D_DB_WEB_HOST); + db.setUserName(D_DB_WEB_USER); + db.setPassword(D_DB_WEB_PASS); + db.setDatabaseName(D_DB_WEB_NAME); if (db.open() == false) { InsertLog(db.lastError().text()); @@ -775,10 +803,10 @@ void Widget::Update() db.close(); InsertLog("Data Read End"); InsertLog("Data Write Web Start"); - db.setHostName("db.big-bird.co.kr"); - db.setUserName("concepters"); - db.setPassword("con97996655"); - db.setDatabaseName("dbconcepters"); + db.setHostName(D_DB_WEB_HOST); + db.setUserName(D_DB_WEB_USER); + db.setPassword(D_DB_WEB_PASS); + db.setDatabaseName(D_DB_WEB_NAME); if (db.open() == false) { InsertLog(db.lastError().text()); diff --git a/Filter/widget.h b/Filter/widget.h index ea7058d..eafe2a9 100644 --- a/Filter/widget.h +++ b/Filter/widget.h @@ -46,8 +46,10 @@ private: void DataFilter(QStringList _list); void DataPut(QStringList _list); QString SqlString(QString _str); - void FilterDate(int _nCategory,QDate _dateStart,QDate _dateEnd); - void FilterSeracher(int _nCatalog,int _nMethod , int _nKeyword , QString _strSearch); + void FilterDate(QString strJson); + void FilterSerach(QString strJson); + void FilterLength(QString strJson); + void FilterReplace(QString strJson); private slots: void CompanyItemChanged(QListWidgetItem*,QListWidgetItem* _prev = 0); void on_send();