git-svn-id: https://202.107.226.68:8443/svn/Services/ResistanceMonitor@77 a05970a1-87b9-9d4f-9ee5-fa77e2ec115b

4.Data/MGWSServer.cpp

@@ -1057,7 +1057,7 @@ void mg_per_session_data::GetMaxResistNew(std::map<time_t, tagSecondStatInfo>& m
 
 			CONVERT_RESIST info;
 			info.tmStart = it_start->max_time / 1000;
-			info.tmEnd = it_end->max_time / 1000 + 1;
+			info.tmEnd = it_end->max_time / 1000 + 1;//此处加了1秒, 后面取数据的时候特别注意
 			//取出转换值
 			move_max_val = it_start->max_val;
 			move_min_val = it_start->min_val;

4.Data/MGWSServer.h

@@ -46,6 +46,20 @@ typedef struct tagConvertResist
 	time_t tmEnd = 0;    //结束波动时间  单位秒
 }CONVERT_RESIST;
 
+typedef struct tagFrictionResist
+{
+	int show_val = 0; //稳态值
+	int show_time = 0; //稳态时间
+	int peak_val = 0; //峰值
+	int peak_time = 0; //峰值时间
+
+	time_t tmStart = 0;  //开始波动的时间  单位秒
+	time_t tmEnd = 0;    //结束波动时间  单位秒
+
+	string t;
+
+}FRICTION_RESIST;
+
 //过车信息
 typedef struct tagPassResist
 {