diff --git a/Cidn-SH b/Cidn-SH
index 7b82f89..6693b72 100755
Binary files a/Cidn-SH and b/Cidn-SH differ
diff --git a/jsonparse/mqtt_cmd_parse.cpp b/jsonparse/mqtt_cmd_parse.cpp
index 3b377dc..b456b75 100644
--- a/jsonparse/mqtt_cmd_parse.cpp
+++ b/jsonparse/mqtt_cmd_parse.cpp
@@ -663,7 +663,7 @@ int JsonData::JsonCmd_32(std::string MeasurementID,int  status,int type,std::str
     if(res !=0 ){
          zlog_warn(zct, "data_publish res = %d", res);
     }
-
+    return 0;
 }
 void JsonData::DataNodeStatusCheck() {
     array_t vetRes = sqlite_db_ctrl::instance().GetDataMultiLine(T_SENSOR_INFO(TNAME), "*", NULL);
diff --git a/scheduler/schedule.cpp b/scheduler/schedule.cpp
index aa115b4..ab76499 100644
--- a/scheduler/schedule.cpp
+++ b/scheduler/schedule.cpp
@@ -257,17 +257,17 @@ SensorScheduler::SensorScheduler() {
         seconds_per_wave_slice_ = rest_duration / wave_slice_num_per_eigen_interval_;
     } else {
         zlog_info(zbt, "use default configuration");
-        int eigen_value_send_interval = 300;
-        int wave_form_send_interval = 7200;
-        int eigen_value_send_duration = 6;
-        int wave_form_send_duration = 50;
-        int max_sensor_num = 32;
-
-        // int eigen_value_send_interval = 120;
-        // int wave_form_send_interval = 240;
+        // int eigen_value_send_interval = 300;
+        // int wave_form_send_interval = 7200;
         // int eigen_value_send_duration = 6;
-        // int wave_form_send_duration = 40;
-        // int max_sensor_num = 4;
+        // int wave_form_send_duration = 50;
+        // int max_sensor_num = 32;
+
+        int eigen_value_send_interval = 120;
+        int wave_form_send_interval = 240;
+        int eigen_value_send_duration = 6;
+        int wave_form_send_duration = 40;
+        int max_sensor_num = 4;
         std::string error_msg;
         Config(eigen_value_send_interval,
                             wave_form_send_interval,
diff --git a/uart/uart_feature_parse.cpp b/uart/uart_feature_parse.cpp
index dcb4184..6025dda 100644
--- a/uart/uart_feature_parse.cpp
+++ b/uart/uart_feature_parse.cpp
@@ -222,13 +222,13 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) {
     if (/*0 == sqlite_db_ctrl::instance().GetTableRows(T_DATASTATIC_INFO(TNAME), whereCon)*/ (Count * 3 < SAVE_COUNT && lTime < OneWeek) || strTime.size() == 0) {
         zlog_info(zct, "insert static data to sql");
         char insertSql[1024] = {0};
-        sprintf(insertSql, "'%s','%s','%f','%f','%d','%d','',%ld,'%s','1',%d,'','%d','%d'", strLongAddr.c_str(), (strMeasurementID + "-S").c_str(), dataStatic.TemTop, dataStatic.TemBot, dataStatic.Dip, dataStatic.Voltage, staticIndex, nowTimetamp.c_str(), nodeResend, flag,
+        sprintf(insertSql, "'%s','%s','%f','%f','%d','%d','',%ld,'%s','1',%d,'','%d','%d'", strMeasurementID.c_str(), (strMeasurementID + "-S").c_str(), dataStatic.TemTop, dataStatic.TemBot, dataStatic.Dip, dataStatic.Voltage, staticIndex, nowTimetamp.c_str(), nodeResend, flag,
                 timing);
         sqlite_db_ctrl::instance().InsertData(szTableName, insertSql);
 
         if (0 == sqlite_db_ctrl::instance().GetTableRows(T_DATASTATIC_INFO(TNAME), whereCon)) { // First Connect
             char insertSql[1024] = {0};
-            sprintf(insertSql, "'%s','%s','%f','%f','%d','%d','',%ld,'%s','1',%d", strLongAddr.c_str(), (strMeasurementID + "-S").c_str(), dataStatic.TemTop, dataStatic.TemBot, dataStatic.Dip, dataStatic.Voltage, staticIndex, nowTimetamp.c_str(), nodeResend);
+            sprintf(insertSql, "'%s','%s','%f','%f','%d','%d','',%ld,'%s','1',%d", strMeasurementID.c_str(), (strMeasurementID + "-S").c_str(), dataStatic.TemTop, dataStatic.TemBot, dataStatic.Dip, dataStatic.Voltage, staticIndex, nowTimetamp.c_str(), nodeResend);
             sqlite_db_ctrl::instance().InsertData(T_DATASTATIC_INFO(TNAME), insertSql);
             sqlite_db_ctrl::instance().CalculateBattery();
         } else {
@@ -248,7 +248,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) {
         sqlite_db_ctrl::instance().UpdateTableData(T_DATASTATIC_INFO(TNAME), updateSql, whereCon);
     }
     memset(szTableName, 0x00, sizeof(szTableName));
-    sprintf(szTableName, "t_data_%s", strLongAddr.c_str());
+    sprintf(szTableName, "t_data_%s", strMeasurementID.c_str());
 
     DataRecvDym dataDymX;
 
@@ -303,7 +303,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) {
     if ((Count * 3 < SAVE_COUNT && lTime < OneWeek) || strTime.size() == 0) { // 1 week
         char insertSql[1024] = {0};
         memset(insertSql, 0x00, sizeof(insertSql));
-        sprintf(insertSql, "'%s','%s','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f',%ld,'%s','1',%d", strLongAddr.c_str(), (strMeasurementID + "-X").c_str(), dataDymX.DiagnosisPk, dataDymX.IntegratPk, dataDymX.IntegratRMS, dataDymX.RmsValues,
+        sprintf(insertSql, "'%s','%s','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f',%ld,'%s','1',%d", strMeasurementID.c_str(), (strMeasurementID + "-X").c_str(), dataDymX.DiagnosisPk, dataDymX.IntegratPk, dataDymX.IntegratRMS, dataDymX.RmsValues,
                 dataDymX.EnvelopEnergy, dataDymX.Amp1, dataDymX.Amp2, dataDymX.Amp3, dataDymX.Amp4, dataDymX.Amp5, dataDymX.Phase1, dataDymX.Phase2, dataDymX.Phase3, dataDymX.Phase4, staticIndex, nowTimetamp.c_str(), nodeResend);
         sqlite_db_ctrl::instance().InsertData(szTableName, insertSql);
 
@@ -320,7 +320,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) {
         sprintf(whereCon, "channelID='%s' ", (strMeasurementID + "-X").c_str());
         sqlite_db_ctrl::instance().UpdateTableData(T_DATA_INFO(TNAME), updateSql, whereCon);
     }
-    zlog_info(zct, "x:%s,%s,diagnosisPk=%f,integratPk=%f,integratRMS=%f,rmsValues=%f,envelopEnergy=%f,Amp1=%f,Amp2=%f,Amp3=%f,Amp4=%f,Amp5=%f,Phase1=%f,Phase2=%f,Phase3=%f,Phase4=%f,timeStamp=%s", strLongAddr.c_str(), (strMeasurementID + "-X").c_str(), dataDymX.DiagnosisPk,
+    zlog_info(zct, "x:%s,%s,diagnosisPk=%f,integratPk=%f,integratRMS=%f,rmsValues=%f,envelopEnergy=%f,Amp1=%f,Amp2=%f,Amp3=%f,Amp4=%f,Amp5=%f,Phase1=%f,Phase2=%f,Phase3=%f,Phase4=%f,timeStamp=%s", strMeasurementID.c_str(), (strMeasurementID + "-X").c_str(), dataDymX.DiagnosisPk,
               dataDymX.IntegratPk, dataDymX.IntegratRMS, dataDymX.RmsValues, dataDymX.EnvelopEnergy, dataDymX.Amp1, dataDymX.Amp2, dataDymX.Amp3, dataDymX.Amp4, dataDymX.Amp5, dataDymX.Phase1, dataDymX.Phase2, dataDymX.Phase3, dataDymX.Phase4, nowTimetamp.c_str());
 
     Json::Value valNodeData;
@@ -393,7 +393,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) {
     if (/*0 == sqlite_db_ctrl::instance().GetTableRows(T_DATA_INFO(TNAME), whereCon)*/ (Count * 3 < SAVE_COUNT && lTime < OneWeek) || strTime.size() == 0) {
         char insertSql[1024] = {0};
         memset(insertSql, 0x00, sizeof(insertSql));
-        sprintf(insertSql, "'%s','%s','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f',%ld,'%s','1',%d", strLongAddr.c_str(), (strMeasurementID + "-Y").c_str(), dataDymY.DiagnosisPk, dataDymY.IntegratPk, dataDymY.IntegratRMS, dataDymY.RmsValues,
+        sprintf(insertSql, "'%s','%s','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f',%ld,'%s','1',%d", strMeasurementID.c_str(), (strMeasurementID + "-Y").c_str(), dataDymY.DiagnosisPk, dataDymY.IntegratPk, dataDymY.IntegratRMS, dataDymY.RmsValues,
                 dataDymY.EnvelopEnergy, dataDymY.Amp1, dataDymY.Amp2, dataDymY.Amp3, dataDymY.Amp4, dataDymY.Amp5, dataDymY.Phase1, dataDymY.Phase2, dataDymY.Phase3, dataDymY.Phase4, staticIndex, nowTimetamp.c_str(), nodeResend);
         sqlite_db_ctrl::instance().InsertData(szTableName, insertSql);
 
@@ -409,7 +409,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) {
         sprintf(whereCon, "channelID='%s' ", (strMeasurementID + "-Y").c_str());
         sqlite_db_ctrl::instance().UpdateTableData(T_DATA_INFO(TNAME), updateSql, whereCon);
     }
-    zlog_info(zct, "y: %s,%s,diagnosisPk=%f,integratPk=%f,integratRMS=%f,rmsValues=%f,envelopEnergy=%f,Amp1=%f,Amp2=%f,Amp3=%f,Amp4=%f,Amp5=%f,Phase1=%f,Phase2=%f,Phase3=%f,Phase4=%f,timeStamp=%s", strLongAddr.c_str(), (strMeasurementID + "-Y").c_str(), dataDymY.DiagnosisPk,
+    zlog_info(zct, "y: %s,%s,diagnosisPk=%f,integratPk=%f,integratRMS=%f,rmsValues=%f,envelopEnergy=%f,Amp1=%f,Amp2=%f,Amp3=%f,Amp4=%f,Amp5=%f,Phase1=%f,Phase2=%f,Phase3=%f,Phase4=%f,timeStamp=%s", strMeasurementID.c_str(), (strMeasurementID + "-Y").c_str(), dataDymY.DiagnosisPk,
               dataDymY.IntegratPk, dataDymY.IntegratRMS, dataDymY.RmsValues, dataDymY.EnvelopEnergy, dataDymY.Amp1, dataDymY.Amp2, dataDymY.Amp3, dataDymY.Amp4, dataDymY.Amp5, dataDymY.Phase1, dataDymY.Phase2, dataDymY.Phase3, dataDymY.Phase4, nowTimetamp.c_str());
 
     valNodeFeature["dataNodeNo"] = strMeasurementID;
@@ -485,7 +485,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) {
     if (/*0 == sqlite_db_ctrl::instance().GetTableRows(T_DATA_INFO(TNAME), whereCon)*/ Count * 3 < SAVE_COUNT && (lTime < OneWeek || strTime.size() == 0)) {
         char insertSql[1024] = {0};
         memset(insertSql, 0x00, sizeof(insertSql));
-        sprintf(insertSql, "'%s','%s','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f',%ld,'%s','1',%d", strLongAddr.c_str(), (strMeasurementID + "-Z").c_str(), dataDymZ.DiagnosisPk, dataDymZ.IntegratPk, dataDymZ.IntegratRMS, dataDymZ.RmsValues,
+        sprintf(insertSql, "'%s','%s','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f','%f',%ld,'%s','1',%d", strMeasurementID.c_str(), (strMeasurementID + "-Z").c_str(), dataDymZ.DiagnosisPk, dataDymZ.IntegratPk, dataDymZ.IntegratRMS, dataDymZ.RmsValues,
                 dataDymZ.EnvelopEnergy, dataDymZ.Amp1, dataDymZ.Amp2, dataDymZ.Amp3, dataDymZ.Amp4, dataDymZ.Amp5, dataDymZ.Phase1, dataDymZ.Phase2, dataDymZ.Phase3, dataDymZ.Phase4, staticIndex, nowTimetamp.c_str(), nodeResend);
         sqlite_db_ctrl::instance().InsertData(szTableName, insertSql);
 
@@ -501,11 +501,11 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) {
         sprintf(whereCon, "channelID='%s' ", (strMeasurementID + "-Z").c_str());
         sqlite_db_ctrl::instance().UpdateTableData(T_DATA_INFO(TNAME), updateSql, whereCon);
     }
-    zlog_info(zct, "Z: %s,%s,diagnosisPk=%f,integratPk=%f,integratRMS=%f,rmsValues=%f,envelopEnergy=%f,Amp1=%f,Amp2=%f,Amp3=%f,Amp4=%f,Amp5=%f,Phase1=%f,Phase2=%f,Phase3=%f,Phase4=%f,timeStamp=%s", strLongAddr.c_str(), (strMeasurementID + "-Z").c_str(), dataDymZ.DiagnosisPk,
+    zlog_info(zct, "Z: %s,%s,diagnosisPk=%f,integratPk=%f,integratRMS=%f,rmsValues=%f,envelopEnergy=%f,Amp1=%f,Amp2=%f,Amp3=%f,Amp4=%f,Amp5=%f,Phase1=%f,Phase2=%f,Phase3=%f,Phase4=%f,timeStamp=%s", strMeasurementID.c_str(), (strMeasurementID + "-Z").c_str(), dataDymZ.DiagnosisPk,
               dataDymZ.IntegratPk, dataDymZ.IntegratRMS, dataDymZ.RmsValues, dataDymZ.EnvelopEnergy, dataDymZ.Amp1, dataDymZ.Amp2, dataDymZ.Amp3, dataDymZ.Amp4, dataDymZ.Amp5, dataDymZ.Phase1, dataDymZ.Phase2, dataDymZ.Phase3, dataDymZ.Phase4, nowTimetamp.c_str());
 
     memset(whereCon, 0x00, sizeof(whereCon));
-    sprintf(whereCon, "dataNodeNo='%s'", strLongAddr.c_str());
+    sprintf(whereCon, "MeasurementID='%s'", strMeasurementID.c_str());
     sqlite_db_ctrl::instance().UpdateTableData(T_SENSOR_INFO(TNAME), "status='1'", whereCon);
 
     //无线传感器Z信息
@@ -529,7 +529,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) {
     valNodeData.append(valNodeFeature);
 
     memset(whereCon, 0, 1024);
-    sprintf(whereCon, "dataNodeNo='%s'", strLongAddr.c_str());
+    sprintf(whereCon, "MeasurementID='%s'", strMeasurementID.c_str());
 
     std::string strBattery = sqlite_db_ctrl::instance().GetData(T_SENSOR_INFO(TNAME), "batteryPower", whereCon);
     std::vector<std::string> vBattery;
@@ -564,11 +564,11 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) {
     std::string strstatisticData = featureValue.write(root);
 
     int iRet = data_publish(strstatisticData.c_str(), GlobalConfig::Topic_G.mPubData.c_str());
-    zlog_info(zct, "dataNodeNo = '%s' and TimeStamp = '%s',MQTT ret = %d", strLongAddr.c_str(), nowTimetamp.c_str(), iRet);
+    zlog_info(zct, "dataNodeNo = '%s' and TimeStamp = '%s',MQTT ret = %d", strMeasurementID.c_str(), nowTimetamp.c_str(), iRet);
     if (iRet != 0) {
         char updateSql[1024] = {0};
         memset(whereCon, 0, 1024);
-        sprintf(whereCon, "dataNodeNo = '%s' and TimeStamp = '%s'", strLongAddr.c_str(), nowTimetamp.c_str());
+        sprintf(whereCon, "dataNodeNo = '%s' and TimeStamp = '%s'", strMeasurementID.c_str(), nowTimetamp.c_str());
         memcpy(updateSql, "sendMsg='0'", 11);
         sqlite_db_ctrl::instance().UpdateTableData(szTableNameStatic, updateSql, whereCon);
         sqlite_db_ctrl::instance().UpdateTableData(szTableNameData, updateSql, whereCon);