#IQRV #comment [DeviceControl] 添加 DeployTerminal 接口

Module/mod_DeviceControl/DeviceControl.xml

@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="gb2312" ?>
 <entity name="DeviceControl">
+  
+  <const name="DeployStep_Begin" value="0" />
+  <const name="DeployStep_GetTerminalInfo" value="1" />
+  <const name="DeployStep_FetchCenterSettings" value="2" />
+  <const name="DeployStep_AccessAuthorize" value="3" />
+  <const name="DeployStep_MediaConfig" value="4" />
+  <const name="DeployStep_Finished" value="5" />
+  
 	<class name="DeviceControlService" overlap="true" exclusive="false">
 		<twoway name="USB" overlap="true">
 			<req>
@@ -142,6 +150,30 @@
         <param name="message" type="string" />
       </res>
     </twoway>
+    <twoway name="DeployTerminal" overlap="true">
+      <req>
+        <param name="currStep" type="int" />
+        <param name="preStep" type="int" />
+        <param name="nextStep" type="int" />
+        <param name="param1" type="uint"/>
+        <param name="param2" type="uint" />
+        <param name="param3" type="string" />
+        <param name="param4" type="string" />
+        <param name="param5" type="blob"/>
+        <param name="array1" type="array_int"/>
+        <param name="array2" type="array_string"/>
+      </req>
+      <res>
+        <param name="result" type="int" />
+        <param name="message" type="string" />
+        <param name="nextStep" type="int" />
+        <param name="param1" type="uint"/>
+        <param name="param2" type="string" />
+        <param name="array1" type="array_int"/>
+        <param name="array2" type="array_string"/>
+      </res>
+    </twoway>
+    
     <twoway name="GetDevInfo" overlap="true" method_id="65535">
 			<req>
 			</req>

Module/mod_DeviceControl/DeviceControl_client_g.h

@@ -271,6 +271,35 @@ public:
 		return Error;
 	}
 
+	ErrorCodeEnum DeployTerminal(DeviceControlService_DeployTerminal_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
+	{
+		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
+		CAutoBuffer Buf = SpObject2Buffer(Req);
+		return pFunc->AsyncRequest(DeviceControlService_Method_DeployTerminal, DeviceControlService_MethodSignature_DeployTerminal, Buf, spAsyncWait, dwTimeout);
+	}
+	ErrorCodeEnum DeployTerminal(DeviceControlService_DeployTerminal_Req &Req, DeviceControlService_DeployTerminal_Ans &Ans, DWORD dwTimeout)
+	{
+		CSmartPointer<IAsynWaitSp> spAsyncWait;
+		ErrorCodeEnum Error = DeployTerminal(Req, spAsyncWait, dwTimeout);
+		if (Error == Error_Succeed) {
+			bool bEnd = false;
+			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
+			LOG_ASSERT(Error || bEnd);
+		}
+		return Error;
+	}
+	ErrorCodeEnum DeployTerminal(DeviceControlService_DeployTerminal_Req &Req, DeviceControlService_DeployTerminal_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
+	{
+		CSmartPointer<IAsynWaitSp> spAsyncWait;
+		ErrorCodeEnum Error = DeployTerminal(Req, spAsyncWait, dwTimeout);
+		if (Error == Error_Succeed) {
+			bool bEnd = false;
+			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, dwTimeout);
+			LOG_ASSERT(Error || bEnd);
+		}
+		return Error;
+	}
+
 	ErrorCodeEnum GetDevInfo(DeviceControlService_GetDevInfo_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();

Module/mod_DeviceControl/DeviceControl_def_g.h

@@ -11,6 +11,12 @@ namespace DeviceControl {
 //
 // const goes here
 //
+#define DeployStep_Begin 0
+#define DeployStep_GetTerminalInfo 1
+#define DeployStep_FetchCenterSettings 2
+#define DeployStep_AccessAuthorize 3
+#define DeployStep_MediaConfig 4
+#define DeployStep_Finished 5
 
 #define DeviceControlService_Method_USB 0
 #define DeviceControlService_Method_GetUkeyID 1
@@ -20,6 +26,7 @@ namespace DeviceControl {
 #define DeviceControlService_Method_ReadCenterConfigStr 5
 #define DeviceControlService_Method_ReadConfigValue 6
 #define DeviceControlService_Method_TestConnectivity 7
+#define DeviceControlService_Method_DeployTerminal 8
 #define DeviceControlService_Method_GetDevInfo 65535
 
 #define DeviceControlService_MethodSignature_USB 109707598
@@ -30,6 +37,7 @@ namespace DeviceControl {
 #define DeviceControlService_MethodSignature_ReadCenterConfigStr -673154017
 #define DeviceControlService_MethodSignature_ReadConfigValue 730234720
 #define DeviceControlService_MethodSignature_TestConnectivity -42627632
+#define DeviceControlService_MethodSignature_DeployTerminal 1049464622
 #define DeviceControlService_MethodSignature_GetDevInfo 296205965
 
 struct DeviceControlService_USB_Req
@@ -281,6 +289,43 @@ struct DeviceControlService_TestConnectivity_Ans
 
 };
 
+struct DeviceControlService_DeployTerminal_Req
+{
+	int currStep;
+	int preStep;
+	int nextStep;
+	unsigned int param1;
+	unsigned int param2;
+	CSimpleStringA param3;
+	CSimpleStringA param4;
+	CBlob param5;
+	CAutoArray<int> array1;
+	CAutoArray<CSimpleStringA> array2;
+
+	void Serialize(SpBuffer &Buf)
+	{
+		auto & buf = Buf & currStep & preStep & nextStep & param1 & param2 & param3 & param4 & param5 & array1 & array2;
+	}
+
+};
+
+struct DeviceControlService_DeployTerminal_Ans
+{
+	int result;
+	CSimpleStringA message;
+	int nextStep;
+	unsigned int param1;
+	CSimpleStringA param2;
+	CAutoArray<int> array1;
+	CAutoArray<CSimpleStringA> array2;
+
+	void Serialize(SpBuffer &Buf)
+	{
+		auto & buf = Buf & result & message & nextStep & param1 & param2 & array1 & array2;
+	}
+
+};
+
 struct DeviceControlService_GetDevInfo_Req
 {
 

Module/mod_DeviceControl/DeviceControl_server_g.h

@@ -86,6 +86,13 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
+		case DeviceControlService_Method_DeployTerminal:
+			if (dwSignature == DeviceControlService_MethodSignature_DeployTerminal) {
+				bOverlap = true;
+			} else {
+				Error = Error_MethodSignatureFailed;
+			}
+			break;
 		case DeviceControlService_Method_GetDevInfo:
 			if (dwSignature == DeviceControlService_MethodSignature_GetDevInfo) {
 				bOverlap = true;
@@ -144,6 +151,11 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
+		case DeviceControlService_Method_DeployTerminal:
+			if (dwSignature != DeviceControlService_MethodSignature_DeployTerminal) {
+				Error = Error_MethodSignatureFailed;
+			}
+			break;
 		case DeviceControlService_Method_GetDevInfo:
 			if (dwSignature != DeviceControlService_MethodSignature_GetDevInfo) {
 				Error = Error_MethodSignatureFailed;
@@ -196,6 +208,11 @@ public:
 	/// override by user
 	}
 
+	virtual void Handle_DeployTerminal(SpReqAnsContext<DeviceControlService_DeployTerminal_Req, DeviceControlService_DeployTerminal_Ans>::Pointer ctx)
+	{
+	/// override by user
+	}
+
 	virtual void Handle_GetDevInfo(SpReqAnsContext<DeviceControlService_GetDevInfo_Req, DeviceControlService_GetDevInfo_Ans>::Pointer ctx)
 	{
 	/// override by user
@@ -281,6 +298,14 @@ public:
 						Handle_TestConnectivity(ctx);
 					}
 					break;
+				case DeviceControlService_Method_DeployTerminal:
+					{
+						SpReqAnsContext<DeviceControlService_DeployTerminal_Req,DeviceControlService_DeployTerminal_Ans>::Pointer ctx;
+						ctx.Attach(new SpReqAnsContext<DeviceControlService_DeployTerminal_Req,DeviceControlService_DeployTerminal_Ans>(pTransactionContext));
+						SpBuffer2Object(Buf, ctx->Req);
+						Handle_DeployTerminal(ctx);
+					}
+					break;
 				case DeviceControlService_Method_GetDevInfo:
 					{
 						SpReqAnsContext<DeviceControlService_GetDevInfo_Req,DeviceControlService_GetDevInfo_Ans>::Pointer ctx;

Module/mod_DeviceControl/mod_DeviceControl.cpp

@@ -58,6 +58,12 @@ void CDeviceControlServerSession::Handle_TestConnectivity(SpReqAnsContext<Device
     m_pEntity->TestConnectivity(ctx);
 }
 
+void CDeviceControlServerSession::Handle_DeployTerminal(SpReqAnsContext<DeviceControlService_DeployTerminal_Req, DeviceControlService_DeployTerminal_Ans>::Pointer ctx)
+{
+    LOG_FUNCTION();
+    m_pEntity->DeployTerminal(ctx);
+}
+
 void CDeviceControlEntity::QueryHardwareInfo(SpReqAnsContext<DeviceControlService_QueryHardwareInfo_Req, DeviceControlService_QueryHardwareInfo_Ans>::Pointer ctx)
 {
 	CSystemStaticInfo info;
@@ -152,6 +158,11 @@ void CDeviceControlEntity::TestConnectivity(SpReqAnsContext<DeviceControlService
 
 }
 
+void CDeviceControlEntity::DeployTerminal(SpReqAnsContext<DeviceControlService_DeployTerminal_Req, DeviceControlService_DeployTerminal_Ans>::Pointer ctx)
+{
+
+}
+
 std::pair<ErrorCodeEnum, CSimpleStringA> CDeviceControlEntity::__ReadCenterConfigStr(CSimpleStringA key, CSimpleStringA entityName="")
 {
 	CSimpleStringA str = "";

Module/mod_DeviceControl/mod_DeviceControl.h

@@ -43,6 +43,7 @@ public:
 	virtual void Handle_ReadConfigValue(SpReqAnsContext<DeviceControlService_ReadConfigValue_Req, DeviceControlService_ReadConfigValue_Ans>::Pointer ctx);
 	virtual void Handle_GetDevInfo(SpReqAnsContext<DeviceControlService_GetDevInfo_Req, DeviceControlService_GetDevInfo_Ans>::Pointer ctx);
 	virtual void Handle_TestConnectivity(SpReqAnsContext<DeviceControlService_TestConnectivity_Req, DeviceControlService_TestConnectivity_Ans>::Pointer ctx);
+	virtual void Handle_DeployTerminal(SpReqAnsContext<DeviceControlService_DeployTerminal_Req, DeviceControlService_DeployTerminal_Ans>::Pointer ctx);
 
 private:
 	CDeviceControlEntity *m_pEntity;
@@ -170,6 +171,8 @@ public:
 
     void TestConnectivity(SpReqAnsContext<DeviceControlService_TestConnectivity_Req, DeviceControlService_TestConnectivity_Ans>::Pointer ctx);
 
+    void DeployTerminal(SpReqAnsContext<DeviceControlService_DeployTerminal_Req, DeviceControlService_DeployTerminal_Ans>::Pointer ctx);
+
 
 	void OnSelfTest(EntityTestEnum eTestType,CSmartPointer<ITransactionContext> pTransactionContext)
 	{