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

4.Data/HttpPrcess.cpp

@@ -4721,7 +4721,6 @@ int DealResistMove(const httplib::Request& req, const string token, char** json,
 				info.t = strLog;
 				lstFriction.emplace_back(info);
 				it = maxResist.erase(it);
-				++it;
 			}
 			else
 				++it;
@@ -4856,7 +4855,7 @@ int DealResistMove(const httplib::Request& req, const string token, char** json,
 			yyjson_mut_obj_add_val(doc, obj, "coord", coord);
 			yyjson_mut_arr_add_int(doc, coord, show_time);
 			yyjson_mut_arr_add_int(doc, coord, curr_val);
-			yyjson_mut_obj_add_strcpy(doc, obj, "time", fmt::format("{}.{:0>3}", CTime(show_time / 1000).Format("%Y-%m-%d %H:%M:%S"), show_time % 1000).c_str());
+			yyjson_mut_obj_add_strcpy(doc, obj, "time", fmt::format("{}.{:0>3}", CTime(show_time/1000).Format("%Y-%m-%d %H:%M:%S"), show_time % 1000).c_str());
 			yyjson_mut_obj_add_int(doc, obj, "val", show_val);
 			yyjson_mut_obj_add_strcpy(doc, obj, "label", ANSItoUTF8(fmt::format("ÎÈֵ̬:{}", show_val)).c_str());
 		}

4.Data/MGWSServer.h

@@ -49,9 +49,9 @@ typedef struct tagConvertResist
 typedef struct tagFrictionResist
 {
 	int show_val = 0; //稳态值
-	int show_time = 0; //稳态时间
+	time_t show_time = 0; //稳态时间
 	int peak_val = 0; //峰值
-	int peak_time = 0; //峰值时间
+	time_t peak_time = 0; //峰值时间
 
 	time_t tmStart = 0;  //开始波动的时间  单位秒
 	time_t tmEnd = 0;    //结束波动时间  单位秒

4.Data/ResistAlarm.cpp

@@ -2905,7 +2905,7 @@ void CResistAlarmMng::ThreadProcMove(DWORD_PTR param)
 					auto pFixConstRetensionForceWaveInfo = (RETENSION_FORCE_DROP*)pService->Find(mo, mp, (uint8_t)eSuoBiPosi::SB_FIX, eZL_ALARMTYPE::RETENSION_FORCE);
 					if (pFixConstRetensionForceWaveInfo == nullptr)//ĬÈÏ¿ªÆô
 					{
-						ASSERT(FALSE);
+						//ASSERT(FALSE);
 						//pFixConstRetensionForceWaveInfo = new RETENSION_FORCE_DROP;
 						///pService->Insert(mo, mp, (uint8_t)eSuoBiPosi::SB_FIX, (uint8_t)eZL_ALARMTYPE::RETENSION_FORCE, pFixConstRetensionForceWaveInfo);
 					}
@@ -2913,7 +2913,7 @@ void CResistAlarmMng::ThreadProcMove(DWORD_PTR param)
 					auto pInvertConstRetensionForceWaveInfo = (RETENSION_FORCE_DROP*)pService->Find(mo, mp, (uint8_t)eSuoBiPosi::SB_INVERT, eZL_ALARMTYPE::RETENSION_FORCE);
 					if (pInvertConstRetensionForceWaveInfo == nullptr)//ĬÈÏ¿ªÆô
 					{
-						ASSERT(FALSE);
+						//ASSERT(FALSE);
 						//pInvertConstRetensionForceWaveInfo = new RETENSION_FORCE_DROP;
 						//pService->Insert(mo, mp, (uint8_t)eSuoBiPosi::SB_INVERT, (uint8_t)eZL_ALARMTYPE::RETENSION_FORCE, pInvertConstRetensionForceWaveInfo);
 					}