瀏覽代碼

1.1.8.2201修复保持力赋值有bug.

git-svn-id: https://202.107.226.68:8443/svn/Services/ResistanceMonitor@69 a05970a1-87b9-9d4f-9ee5-fa77e2ec115b
shenchunzhong 1 年之前
父節點
當前提交
80796ac43d
共有 2 個文件被更改,包括 9 次插入3 次删除
  1. 9 3
      4.Data/MGWSServer.cpp
  2. 二進制
      4.Data/TimeSyncServer.rc

+ 9 - 3
4.Data/MGWSServer.cpp

@@ -1278,10 +1278,16 @@ void mg_per_session_data::GetMaxLockNew(const std::map<time_t, tagSecondStatInfo
 		if (fluctuation_val < 30)
 		{
 			//괏넣제
+			int show_val = INT_MIN;
 			if (it_end->second.dif_val < 30)
-				retensionforce[it_end->first * 1000] = it_start->second.end_val;
-			else if (it_end->second.cout)
-				retensionforce[it_end->first * 1000] = it_end->second.sum_val / it_end->second.cout;
+				show_val = it_start->second.end_val;
+			else if (it_end->second.cout > 1)
+				show_val = it_end->second.sum_val / it_end->second.cout;
+			else
+				show_val = it_end->second.first_val;
+			if (show_val > 100000 || show_val < -100000)
+				SPDLOG_ERROR("[괏넣제털뙤]嫩끽令:{}  sum:{} count:{}", show_val, it_end->second.sum_val, it_end->second.cout);
+			retensionforce[it_end->first * 1000] = show_val;
 			continue;
 		}
 

二進制
4.Data/TimeSyncServer.rc