Z991239-5721 #comment feat: 升级实体兼容支持适配器升级改造，优化告警信息

Signed-Off-By: commit-hook

Module/mod_UpgradeMgr/UpgradeTaskFSM.cpp

@@ -6273,8 +6273,8 @@ unsigned int CUpgradeTaskFSM::s2_on_event(FSMEvent* event)
 						up.CurrentVersion = m_currentVersion.ToString();//当前的版本
 					}
 					else {
-						up.installVersion = m_currentTask.depNewVersion.GetData();//适配器版本
-						up.CurrentVersion = m_currentDepVersion;//适配器当前版本
+						up.installVersion = m_currentDepVersion.GetData();//安装适配器版本
+						up.CurrentVersion = m_currentDepVersion.GetData();//适配器当前版本
 					}
 					up.cInstallState = "A";
 					up.strInstallComment = "启动成功";
@@ -6289,8 +6289,14 @@ unsigned int CUpgradeTaskFSM::s2_on_event(FSMEvent* event)
 						//安装成功
 						struct CTaskProcess up;
 						up.strPackName = m_currentTask.pack_name;//安装包名
-						up.installVersion = m_currentVersion.ToString();//当前的版本
-						up.CurrentVersion = m_currentVersion.ToString();//当前的版本
+						if (!m_currentTask.depNewVersion.IsNullOrEmpty()) {
+							up.installVersion = m_currentVersion.ToString();//当前的版本
+							up.CurrentVersion = m_currentVersion.ToString();//当前的版本
+						}
+						else {
+							up.installVersion = m_currentDepVersion.GetData();//安装适配器版本
+							up.CurrentVersion = m_currentDepVersion.GetData();//适配器当前版本
+						}
 						up.cInstallState = "A";
 						up.strInstallComment = "启动成功";
 						if (m_currentTask.task_type.Compare("U") == 0) {
@@ -6306,8 +6312,14 @@ unsigned int CUpgradeTaskFSM::s2_on_event(FSMEvent* event)
 						//回滚
 						struct CTaskProcess upRoll;
 						upRoll.strPackName = m_currentTask.pack_name;//安装包名
-						upRoll.installVersion = m_currentTask.NewVersion.GetData();//任务升级后的版本号
-						upRoll.CurrentVersion = m_currentVersion.ToString();//当前的版本
+						if (!m_currentTask.depNewVersion.IsNullOrEmpty()) {
+							upRoll.installVersion = m_currentTask.NewVersion.GetData();//任务升级后的版本号
+							upRoll.CurrentVersion = m_currentVersion.ToString();//当前的版本
+						}
+						else {
+							upRoll.installVersion = m_currentTask.depNewVersion.GetData();//安装适配器版本
+							upRoll.CurrentVersion = m_currentDepVersion.GetData();//适配器当前版本
+						}
 						upRoll.cInstallState = "R";
 						upRoll.strInstallComment = "自动倒回";
 						if (m_currentTask.task_type.Compare("U") == 0) {
@@ -6572,7 +6584,7 @@ unsigned int CUpgradeTaskFSM::s3_on_event(FSMEvent* event)
 					struct CTaskProcess up;
 					up.strPackName = m_currentTask.pack_name;//安装包名
 					up.installVersion = m_currentTask.pack_version;//安装的版本
-					up.CurrentVersion = m_currentVersion.ToString();//当前的版本
+					up.CurrentVersion = m_currentVersion.ToString();//当前的版本？？？
 					up.cInstallState = "D";
 					up.strInstallComment = "正在下载";
 					SendUpgradeTaskProgress(up,UpgradeMgr_DOWNLOAD_ID);
@@ -6585,7 +6597,7 @@ unsigned int CUpgradeTaskFSM::s3_on_event(FSMEvent* event)
 					struct CTaskProcess up;
 					up.strPackName = m_currentTask.pack_name;//安装包名
 					up.installVersion = m_currentTask.pack_version;//安装的版本
-					up.CurrentVersion = m_currentVersion.ToString();//当前的版本
+					up.CurrentVersion = m_currentVersion.ToString();//当前的版本？？？
 					up.cInstallState = "B";
 					up.strInstallComment = "正在回退";
 					SendUpgradeTaskProgress(up,UpgradeMgr_ROLLBACK_ID);
@@ -6729,7 +6741,7 @@ unsigned int CUpgradeTaskFSM::s4_on_event(FSMEvent* event)
 			struct CTaskProcess up;
 			up.strPackName  = m_currentTask.pack_name;//安装包名
 			up.installVersion  = m_currentTask.pack_version;//安装的版本
-			up.CurrentVersion = m_currentVersion.ToString();//当前的版本
+			up.CurrentVersion = m_currentVersion.ToString();//当前的版本？？？
 			up.cInstallState  = "C";
 			up.strInstallComment  = pEvent->errMsg.c_str();
 			SendUpgradeTaskProgress(up,UpgradeMgr_DOWNLOAD_ID,"RTA5660");
@@ -6757,7 +6769,7 @@ unsigned int CUpgradeTaskFSM::s4_on_event(FSMEvent* event)
 			struct CTaskProcess up;
 			up.strPackName  = m_currentTask.pack_name;//安装包名
 			up.installVersion  = m_currentTask.pack_version;//安装的版本
-			up.CurrentVersion = m_currentVersion.ToString();//当前的版本
+			up.CurrentVersion = m_currentVersion.ToString();//当前的版本？？？
 			up.cInstallState  = "C";
 			up.strInstallComment  = "任务策略已取消";
 			SendUpgradeTaskProgress(up,UpgradeMgr_DOWNLOAD_ID,"RTA5661");
@@ -6947,7 +6959,7 @@ unsigned int CUpgradeTaskFSM::s5_on_event(FSMEvent* event)
 				struct CTaskProcess up;
 				up.strPackName  = m_currentTask.pack_name;//安装包名
 				up.installVersion  = m_currentTask.pack_version;//安装的版本
-				up.CurrentVersion = m_currentVersion.ToString();//当前的版本
+				up.CurrentVersion = m_currentVersion.ToString();//当前的版本？？？
 				up.cInstallState  = "C";
 				up.strInstallComment  = "解压失败";
 				SendUpgradeTaskProgress(up,UpgradeMgr_INSTALL_ID,"RTA5662");
@@ -7041,7 +7053,7 @@ unsigned int CUpgradeTaskFSM::s5_on_event(FSMEvent* event)
 					struct CTaskProcess up;
 					up.strPackName  = m_currentTask.pack_name;//安装包名
 					up.installVersion  = m_currentTask.pack_version;//安装的版本
-					up.CurrentVersion = m_currentVersion.ToString();//当前的版本
+					up.CurrentVersion = m_currentVersion.ToString();//当前的版本？？？
 					up.cInstallState  = "C";
 					up.strInstallComment  = pEvent->errMsg;//错误信息
 					SendUpgradeTaskProgress(up,UpgradeMgr_INSTALL_ID,"RTA5663");
@@ -7064,7 +7076,7 @@ unsigned int CUpgradeTaskFSM::s5_on_event(FSMEvent* event)
 					struct CTaskProcess up;
 					up.strPackName  = m_currentTask.pack_name;//安装包名
 					up.installVersion  = m_currentTask.pack_version;//安装的版本
-					up.CurrentVersion = m_currentVersion.ToString();//当前的版本
+					up.CurrentVersion = m_currentVersion.ToString();//当前的版本？？？
 					up.cInstallState  = "X";
 					up.strInstallComment  = pEvent->errMsg;//错误信息
 					SendUpgradeTaskProgress(up,UpgradeMgr_INSTALL_ID,"RTA5664");
@@ -7127,7 +7139,7 @@ unsigned int CUpgradeTaskFSM::s5_on_event(FSMEvent* event)
 					struct CTaskProcess up;
 					up.strPackName = "";//安装包名
 					up.installVersion = m_currentTask.pack_version;//回退的版本
-					up.CurrentVersion = m_currentVersion.ToString();//当前的版本
+					up.CurrentVersion = m_currentVersion.ToString();//当前的版本？？？
 					up.cInstallState = "C";
 					up.strInstallComment = pEvent->errMsg;//错误信息
 					SendUpgradeTaskProgress(up,UpgradeMgr_ROLLBACK_ID,"RTA5668");
@@ -7150,7 +7162,7 @@ unsigned int CUpgradeTaskFSM::s5_on_event(FSMEvent* event)
 					struct CTaskProcess up;
 					up.strPackName = "";//安装包名
 					up.installVersion = m_currentTask.pack_version;//回退的版本
-					up.CurrentVersion = m_currentVersion.ToString();//当前的版本
+					up.CurrentVersion = m_currentVersion.ToString();//当前的版本？？？
 					up.cInstallState = "X";
 					up.strInstallComment = pEvent->errMsg;//错误信息
 					SendUpgradeTaskProgress(up,UpgradeMgr_ROLLBACK_ID,"RTA5669");
@@ -7323,7 +7335,7 @@ unsigned int CUpgradeTaskFSM::s6_on_event(FSMEvent* event)
 					struct CTaskProcess up;
 					up.strPackName  = m_currentTask.pack_name;//安装包名
 					up.installVersion  = m_currentTask.pack_version;//安装的版本
-					up.CurrentVersion = m_currentVersion.ToString();//当前的版本
+					up.CurrentVersion = m_currentVersion.ToString();//当前的版本？？？
 					up.cInstallState  = "C";
 					up.strInstallComment  = "任务策略已取消";
 					if (m_currentTask.task_type.Compare("U")==0) {