#IQRV #comment [cfg] 添加序列号的写入

Module/mod_healthmanager/mod_healthmanager.cpp

@@ -2605,6 +2605,17 @@ void CHealthManagerEntity::DeployTerminal(SpReqAnsContext<HealthManagerService_D
             const CSimpleStringA& serverIP = ctx->Req.param3;
             Dbg("server ip: %s, terminal no: %s, vendor: %s", serverIP.GetData(), (LPCTSTR)terminalNo, (LPCTSTR)vendorType);
 
+			CSimpleStringA strVendorName(true);
+            CSimpleStringA strDeviceModel(true);
+            CSimpleStringA strDeviceSN(true);
+
+			if (ctx->Req.array2.GetCount() > 0) {
+				strVendorName = ctx->Req.array2[0];
+				strDeviceModel = ctx->Req.array2[1];
+				strDeviceSN = ctx->Req.array2[2];
+				Dbg("vendor: %s, model:%s, sn: %s", strVendorName.GetData(), strDeviceModel.GetData(), strDeviceSN.GetData());
+			}
+
             /** 1050 是固定的服务端实体端口 [Gifur@20211013]*/
             const bool ret = pCnn->ConnectServer(serverIP.GetData(), 1050);
             Dbg("Connect finished: %d", ret);
@@ -2684,6 +2695,9 @@ void CHealthManagerEntity::DeployTerminal(SpReqAnsContext<HealthManagerService_D
                             fileutil_copy_file(strRootTmpFile, strRootChosenFile);
                             inifile_write_str(strRootTmpFile, "Terminal", "TerminalNo", terminalNo);
                             //inifile_write_str(strRootTmpFile, "Terminal", "Manufacturer", vendorType);
+							if (!strDeviceSN.IsNullOrEmpty()) {
+								inifile_write_str(strRootTmpFile, "Terminal", "SN", strDeviceSN);
+							}
                         } else {
                             tmpMsg = "找不到对应的备选配置，请确认选择的机型和设备厂商是否正确";
                             tmpResult = Error_InvalidState;

addin/res/ManagerDesktop/guide.html

@@ -290,7 +290,7 @@
                                         &nbsp;</div>
                                 </div>
                             </div>
-                            <div class="clearboth" style="padding-top:6px;" id="guide_init_param_device_sn">
+                            <div class="clearboth" style="padding-top:6px;" id="guide_init_param_device_sn_div">
                                 <div class="pull-left" style="width:330px;">
                                     <div class="text-right guide_input_label">设备序列号
                                     </div>
@@ -308,7 +308,7 @@
                                     <div class="text-left guide_error hide" id="text_guide_init_param_device_sn_tips"></div>
                                 </div>
                             </div>
-                            <div class="clearboth" style="padding-top:14px;" id="guide_init_param_terminal_no">
+                            <div class="clearboth" style="padding-top:14px;" id="guide_init_param_terminal_no_div">
                                 <div class="pull-left" style="width:330px;">
                                     <div class="text-right guide_input_label">终端号
                                     </div>

addin/res/ManagerDesktop/js/guide.js

@@ -701,7 +701,7 @@ $(function () {
 
     }
 
-    function InitTemrinalAbout(server_ip, new_terminalno, vendorName)
+    function InitTemrinalAbout(server_ip, new_terminalno, vendorName, deviceModel, deviceSN)
     {
         let req = new Request();
         req.preStep = DeployStepChain.GetTerminalInfo[preStepIndex];
@@ -712,8 +712,8 @@ $(function () {
         req.param3 = server_ip;
         req.param4 = new_terminalno + '|' + vendorName;
         req.param5 = '';
-        req.array1 = [0];
-        req.array2 = [''];
+        req.array1 = [0,0,0];
+        req.array2 = [vendorName, deviceModel, deviceSN];
         req.options = 0;
         req.additional =  1; //重命名root.ini
         req.restartApp = true;
@@ -1665,23 +1665,34 @@ $(function () {
     $(document).on('click', '#guide_init_param_next', function() {
         const ip = $('#guide_server_ip').val();
         const terminalno = $('#guide_init_param_terminalno').val();
+
+        var tmp = $('#guide_init_param_device_sn').val();
+        const deviceSN = tmp.replace(/^\s*|\s*$/g,"");
+        
         if(!isValidIpAddress(ip)) {
             utilStartAlertDialog("无效IP格式");
             return;
         }
-        if(!IsDigital(terminalno)) {
-            utilStartAlertDialog("无效终端号格式");
-            return;
-        }
 
         const vendorType = $('#gui_init_param_vendor').attr('value');
         if(vendorType === '' || vendorType === 'None') {
             utilStartAlertDialog("请选择设备厂商");
             return;
         }
+        const deviceModel = $('#gui_init_param_device_model').attr('value');
+
+        if(deviceSN === '') {
+            utilStartAlertDialog("请输入设备序列号");
+            return;
+        }
+
+        if(!IsDigital(terminalno)) {
+            utilStartAlertDialog("无效终端号格式");
+            return;
+        }
 
-        utilStartConfirmDialog("基本信息录入后将不可撤销，如需修改需重置后再配置，请确认是否提交？", function() {
-            InitTemrinalAbout(ip, terminalno, vendorType);
+        utilStartConfirmDialog("<span>基本信息录入后将不可更改，如需重新配置可通过点击页面右上角菜单</span><span><img src=\"./images/clear.png\" style=\"width:20px;height:20px;padding: 0px 2px;\"></span><span>进行重置，请确认是否提交？</span>", function() {
+            InitTemrinalAbout(ip, terminalno, vendorType, deviceModel, deviceSN);
         });
     });