增加保护

src/HTIEC104.cpp

@@ -866,14 +866,14 @@ static void addOriginDataList(ST_IECPOINT_TABLE &stData)
 // 添加原始数据入库队列
 static void addOriginDataListNew(const IEC_OBJVAL_NEW &stData)
 {
-	int i = 0;
-	IEC_OBJVAL_NEW  stSetData;
+	// int i = 0;
+	// IEC_OBJVAL_NEW  stSetData;
 
-	memset(&stSetData, 0x00, sizeof(IEC_OBJVAL_NEW));
-	memcpy(&stSetData, &stData, sizeof(IEC_OBJVAL_NEW));
+	// memset(&stSetData, 0x00, sizeof(IEC_OBJVAL_NEW));
+	// memcpy(&stSetData, &stData, sizeof(IEC_OBJVAL_NEW));
 
 	mutex_lock(g_list_origin_mutex_new);
-	g_list_origin_new.push_front(stSetData);
+	g_list_origin_new.push_front(stData);
 	mutex_unlock(g_list_origin_mutex_new);
 }
 
@@ -1502,36 +1502,39 @@ bool bSetPointTableValueYC(const std::vector<IEC_OBJVAL_NEW>& values)
 	}
 	mutex_unlock(g_map_iec_mutex_new);
 
-	// Assume they belongs the same object
-	std::string sql = "INSERT INTO ";
-	sql.append(tableName);
-	sql.append("(");
-	sql.append(devidFildName);
-	sql.append(",");
-
-	sql.append(fields, 0, fields.size() - 1);
-	sql.append(" VALUES(");
+	if (!tableName.empty())
+	{
+		// Assume they belongs the same object
+		std::string sql = "INSERT INTO ";
+		sql.append(tableName);
+		sql.append("(");
+		sql.append(devidFildName);
+		sql.append(",");
 
-	snprintf(dataBuf, sizeof(dataBuf), "%u", devId);
-	sql.append(dataBuf);
-	sql.append(",");
+		sql.append(fields, 0, fields.size() - 1);
+		sql.append(" VALUES(");
 
-	if (one_dtime)
-	{
-		sql.append("FROM_UNIXTIME(");
-		snprintf(dataBuf, sizeof(dataBuf), "%lld", (long long)ts);
+		snprintf(dataBuf, sizeof(dataBuf), "%u", devId);
 		sql.append(dataBuf);
-		sql.append("),");
-	}
+		sql.append(",");
+
+		if (one_dtime)
+		{
+			sql.append("FROM_UNIXTIME(");
+			snprintf(dataBuf, sizeof(dataBuf), "%lld", (long long)ts);
+			sql.append(dataBuf);
+			sql.append("),");
+		}
 
-	sql.append(fieldValues, 0, fieldValues.size() - 1);
-	sql.append(")");
+		sql.append(fieldValues, 0, fieldValues.size() - 1);
+		sql.append(")");
 
-	std::list<std::string>::iterator it;
-	mutex_lock(g_list_busi_data_mutex);
-	it = g_list_busi_data.insert(g_list_busi_data.end(), std::string());
-	it->swap(sql);
-	mutex_unlock(g_list_busi_data_mutex);
+		std::list<std::string>::iterator it;
+		mutex_lock(g_list_busi_data_mutex);
+		it = g_list_busi_data.insert(g_list_busi_data.end(), std::string());
+		it->swap(sql);
+		mutex_unlock(g_list_busi_data_mutex);
+	}
 
 	/*
 	IEC_OBJVAL_NEW objVal = { 0 };