扳动记录索引增加一个type. 以便时间记录冲突.

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

4.Data/AppService.cpp

@@ -789,11 +789,11 @@ void CAppService::ThreadProcCreateTable(DWORD_PTR pThis)
 					curr_val             int                  null,\
 					show_val             int                  not null,\
 					idx                  tinyint              null,\
-					posi                 tinyint              not null,\
+					posi                 tinyint              not null default(0),\
 					mark                 nvarchar(255)        null,\
 					type				 tinyint			  not null default(0),\
 					sunroof			     tinyint			  not null default(0),\
-				);create unique clustered index IDX_MO_MP on {0}(mo ASC,mp ASC,show_time ASC);", table_today).c_str();
+				);create unique clustered index IDX_MO_MP on {0}(mo ASC,mp ASC,show_time ASC,type ASC);", table_today).c_str();
 
 				//²»´æÔÚ
 				if (!CDBConnectPool::Instance()->DBExecuteSQL(strSql))

4.Data/HttpPrcess.cpp

@@ -2166,7 +2166,7 @@ int DealGetResistData(const httplib::Request& req, const string token, char** js
 			{
 			case eDaoChaPosi::DCP_FIX:
 			{
-				if (pn == ePowerName::PN_UNKNOWN || pn == ePowerName::PN_RESIST)
+				if (pn == ePowerName::PN_UNKNOWN || pn == ePowerName::PN_LOCK)
 				{
 					yyjson_mut_arr_add_val(fix_points, obj);
 					auto coord = yyjson_mut_arr(doc);
@@ -2203,7 +2203,7 @@ int DealGetResistData(const httplib::Request& req, const string token, char** js
 			break;
 			case eDaoChaPosi::DCP_INVERT:
 			{
-				if (pn == ePowerName::PN_UNKNOWN || pn == ePowerName::PN_RESIST)
+				if (pn == ePowerName::PN_UNKNOWN || pn == ePowerName::PN_LOCK)
 				{
 					yyjson_mut_arr_add_val(invert_points, obj);
 					auto coord = yyjson_mut_arr(doc);

4.Data/ResistAlarm.cpp

@@ -3149,7 +3149,7 @@ void CResistAlarmMng::ThreadProcMove(DWORD_PTR param)
 						{
 							int show_val = (it.second >> 32);
 							CResistAlarmMng::InsertToDBByMove(mo, mp, it.first, 0, 0,
-								(int)it.second, show_val, i, (uint8_t)eDaoChaPosi::DCP_FIX, (uint8_t)ePowerName::PN_RESIST, fmt::format("傑균제:{}", show_val));
+								(int)it.second, show_val, i, (uint8_t)eDaoChaPosi::DCP_FIX, (uint8_t)ePowerName::PN_LOCK, fmt::format("傑균제:{}", show_val));
 
 							JudgeAlarm(pService, pFixSuobiOverInfo, it.first, show_val, eSuoBiPosi::SB_FIX, mo, mp, pMompInfo->zzjno);
 						}
@@ -3167,7 +3167,7 @@ void CResistAlarmMng::ThreadProcMove(DWORD_PTR param)
 						{
 							int show_val = (it.second >> 32);
 							CResistAlarmMng::InsertToDBByMove(mo, mp, it.first, 0, 0,
-								(int)it.second, show_val, i, (uint8_t)eDaoChaPosi::DCP_INVERT, (uint8_t)ePowerName::PN_RESIST, fmt::format("傑균제:{}", show_val));
+								(int)it.second, show_val, i, (uint8_t)eDaoChaPosi::DCP_INVERT, (uint8_t)ePowerName::PN_LOCK, fmt::format("傑균제:{}", show_val));
 
 							JudgeAlarm(pService, pInvertSuobiOverInfo, it.first, show_val, eSuoBiPosi::SB_INVERT, mo, mp, pMompInfo->zzjno);
 						}
@@ -3189,7 +3189,7 @@ void CResistAlarmMng::ThreadProcMove(DWORD_PTR param)
 						{
 							int show_val = (it.second >> 32);
 							CResistAlarmMng::InsertToDBByMove(mo, mp, it.first, 0, 0, (int)it.second, show_val, i,
-								(uint8_t)eDaoChaPosi::DCP_INVERT, (uint8_t)ePowerName::PN_RESIST, fmt::format("傑균제:{}", show_val));
+								(uint8_t)eDaoChaPosi::DCP_INVERT, (uint8_t)ePowerName::PN_LOCK, fmt::format("傑균제:{}", show_val));
 
 							JudgeAlarm(pService, pInvertSuobiOverInfo, it.first, show_val, eSuoBiPosi::SB_INVERT, mo, mp, pMompInfo->zzjno);
 						}
@@ -3207,7 +3207,7 @@ void CResistAlarmMng::ThreadProcMove(DWORD_PTR param)
 						{
 							int show_val = (it.second >> 32);
 							CResistAlarmMng::InsertToDBByMove(mo, mp, it.first, 0, 0, (int)it.second, show_val, i,
-								(uint8_t)eDaoChaPosi::DCP_FIX, (uint8_t)ePowerName::PN_RESIST, fmt::format("傑균제:{}", show_val));
+								(uint8_t)eDaoChaPosi::DCP_FIX, (uint8_t)ePowerName::PN_LOCK, fmt::format("傑균제:{}", show_val));
 
 							JudgeAlarm(pService, pFixSuobiOverInfo, it.first, show_val, eSuoBiPosi::SB_FIX, mo, mp, pMompInfo->zzjno);
 						}

inc/AlarmDefine.h

@@ -107,7 +107,7 @@ enum class eDaoChaPosi : uint8_t
 enum class ePowerName : uint8_t
 {
 	PN_UNKNOWN = 0,//灌列
-	PN_RESIST,//傑균제
+	PN_LOCK,//傑균제
 	PN_RETENTION,//괏넣제
 	PN_MOVE,//瘻뻣제
 	PN_FRICTION,//칡꼰제  ->洸檄令