Z991239-6469 #comment feat:去掉已废弃的写磁功能

Module/mod_CardIssuerStand/CardIssuerStand.xml

@@ -79,21 +79,6 @@
 				<param name="reserved2" type="string"/>
 			</res>			
 		</twoway>
-		<twoway name="WriteTrack" overlap="true" method_id="15">
-			<req>
-				<param name="mode" type="int"/>
-				<param name="co" type="int"/>
-				<param name="track1" type="wstring"/>
-				<param name="track2" type="wstring"/>
-				<param name="track3" type="wstring"/>
-				<param name="reserved" type="wstring"/>
-			</req>
-			<res>
-				<param name="result" type="int"/>
-				<param name="reserved1" type="int"/>
-				<param name="reserved2" type="string"/>
-			</res>
-		</twoway>
 		<twoway name="GetMaterialCountEx" overlap="true" method_id="16">
 			<req>
 				<param name="GetHopper" type="array_int"/>

Module/mod_CardIssuerStand/CardIssuerStandFSM.cpp

@@ -3317,90 +3317,6 @@ int CCardIssuerFSM::PostOnline_RF(SpReqAnsContext<CardIssuerStandService_PostOnl
 	ctx->Answer(Error_Succeed);
 	return 0;
 }
-int CCardIssuerFSM::WriteCard(SpReqAnsContext<CardIssuerStandService_WriteTrack_Req, CardIssuerStandService_WriteTrack_Ans>::Pointer ctx)
-{
-	LOG_FUNCTION();
-	ErrorCodeEnum eErr;
-	int ret = 0;
-	long l_beginTime, l_endTime;
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("WriteCard，t1Len:%d, t2Len:%d, t3Len:%d", ctx->Req.track1.GetLength(), ctx->Req.track2.GetLength(), ctx->Req.track3.GetLength());
-	if (ctx->Req.track1.GetLength() <= 0 && ctx->Req.track2.GetLength() <= 0 && ctx->Req.track3.GetLength() <= 0)
-	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<WriteCard>, write card param is null.");
-		ctx->Answer(Error_Param);
-		return ret;
-	}
-	else
-	{
-		l_beginTime = GetTickCountRVC();
-		eErr = m_hDevHelper->MoveCard(CI_MOVECARD_MAG_POSITION);
-		l_endTime = GetTickCountRVC();
-
-		if (eErr != Error_Succeed)
-		{
-			DWORD dwCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_MAG_POSITION, "DevAdapter::MoveCard", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040220315", "");
-			ctx->Answer(Error_Unexpect, dwCode);
-			return ret;
-		}
-		else {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setAPI("DevAdapter::MoveCard").setCostTime(l_endTime - l_beginTime)("WriteCard::MoveCard");
-		}
-	}
-	MagTracks magTrack;
-	ZeroMemory(magTrack.track[0].data, MAX_MAG_TRACK_SIZE);
-	ZeroMemory(magTrack.track[1].data, MAX_MAG_TRACK_SIZE);
-	ZeroMemory(magTrack.track[2].data, MAX_MAG_TRACK_SIZE);
-	magTrack.track[0].dwSize = magTrack.track[1].dwSize = magTrack.track[2].dwSize = 0;
-	magTrack.track[0].eStatus = magTrack.track[1].eStatus = magTrack.track[2].eStatus = CI_DATA_INVALID;
-	TrackRange iT1, iT2, iT3;
-	iT1 = iT2 = iT3 = CI_TRACK_RANGE_START;
-	if (ctx->Req.track1.GetLength() > 0)
-	{
-		iT1 = CI_TRACK_RANGE_1;
-		CSimpleStringA csT1 = CSimpleStringW2A(ctx->Req.track1);
-		strncpy((char*)magTrack.track[0].data, csT1, csT1.GetLength());
-		magTrack.track[0].eSource = CI_TRACK_SOURCE_1;
-		magTrack.track[0].eStatus = CI_DATA_OK;
-		magTrack.track[0].dwSize = csT1.GetLength();
-	}
-	if (ctx->Req.track2.GetLength() > 0)
-	{
-		iT2 = CI_TRACK_RANGE_2;
-		CSimpleStringA csT2 = CSimpleStringW2A(ctx->Req.track2);
-		strncpy((char*)magTrack.track[1].data, csT2, csT2.GetLength());
-		magTrack.track[1].eSource = CI_TRACK_SOURCE_2;
-		magTrack.track[1].eStatus = CI_DATA_OK;
-		magTrack.track[1].dwSize = csT2.GetLength();
-	}
-	if (ctx->Req.track3.GetLength() > 0)
-	{
-		iT3 = CI_TRACK_RANGE_3;
-		CSimpleStringA csT3 = CSimpleStringW2A(ctx->Req.track3);
-		strncpy((char*)magTrack.track[2].data, csT3, csT3.GetLength());
-		magTrack.track[2].eSource = CI_TRACK_SOURCE_3;
-		magTrack.track[2].eStatus = CI_DATA_OK;
-		magTrack.track[2].dwSize = csT3.GetLength();
-	}
-
-	//TrackRange eAll = iT2 | iT2;
-	magTrack.eRange = TrackRange(iT1 | iT2 | iT3);
-	l_beginTime = GetTickCountRVC();
-	eErr = m_hDevHelper->MagWrite(magTrack, AUTO_CO);
-	l_endTime = GetTickCountRVC();
-	
-	if (eErr != Error_Succeed)
-	{
-		SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MagWrite, "DevAdapter::MagWrite", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
-		ret = 1;
-	}
-	else {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MagWrite").setCostTime(l_endTime - l_beginTime)("WriteCard::MagWrite");
-	}
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040220315")("MagWrite ok");
-	ctx->Ans.result = ret;
-	ctx->Answer(Error_Succeed);
-	return ret;
-}
 void CCardIssuerFSM::SelfTest(EntityTestEnum eTestType,CSmartPointer<ITransactionContext> pTransactionContext)
 {
 	OnHardwareShakeHand(pTransactionContext);

Module/mod_CardIssuerStand/CardIssuerStandFSM.h

@@ -618,7 +618,6 @@ public:
 	int InternalAcceptCard(SpReqAnsContext<CardIssuerStandService_Insert_Req, CardIssuerStandService_Insert_Ans>::Pointer ctx);
 	int AcceptCard(SpReqAnsContext<CardIssuerStandService_Insert_Req, CardIssuerStandService_Insert_Ans>::Pointer ctx);
 	int IssueCard(SpReqAnsContext<CardIssuerStandService_IssueEx_Req, CardIssuerStandService_IssueEx_Ans>::Pointer ctxEx);
-	int WriteCard(SpReqAnsContext<CardIssuerStandService_WriteTrack_Req, CardIssuerStandService_WriteTrack_Ans>::Pointer ctx);
 
 	bool GetWaitFlag() { return m_bWaitingAccept; }
 	void SetWaitMore() { m_bWaitAccepteMore = true; }

Module/mod_CardIssuerStand/CardIssuerStand_client_g.h

@@ -444,55 +444,6 @@ public:
 		return Error;
 	}
 
-	ErrorCodeEnum WriteTrack(CardIssuerStandService_WriteTrack_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(CardIssuerStandService_Method_WriteTrack, CardIssuerStandService_MethodSignature_WriteTrack, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum WriteTrack(CardIssuerStandService_WriteTrack_Req &Req, CardIssuerStandService_WriteTrack_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = WriteTrack(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum WriteTrack(CardIssuerStandService_WriteTrack_Req &Req, CardIssuerStandService_WriteTrack_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = WriteTrack(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum WriteTrack(CardIssuerStandService_WriteTrack_Req &Req, CardIssuerStandService_WriteTrack_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = WriteTrack(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
 	ErrorCodeEnum GetMaterialCountEx(CardIssuerStandService_GetMaterialCountEx_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();

Module/mod_CardIssuerStand/CardIssuerStand_def_g.h

@@ -22,7 +22,6 @@ namespace CardIssuerStand {
 #define CardIssuerStandService_Method_PostOnline 7
 #define CardIssuerStandService_Method_Exit 8
 #define CardIssuerStandService_Method_QueryCardInfo 14
-#define CardIssuerStandService_Method_WriteTrack 15
 #define CardIssuerStandService_Method_GetMaterialCountEx 16
 #define CardIssuerStandService_Method_SetMaterialCountEx 17
 #define CardIssuerStandService_Method_SetSomeFlag 18
@@ -51,7 +50,6 @@ namespace CardIssuerStand {
 #define CardIssuerStandService_MethodSignature_PostOnline 923284555
 #define CardIssuerStandService_MethodSignature_Exit -1158854104
 #define CardIssuerStandService_MethodSignature_QueryCardInfo 154962579
-#define CardIssuerStandService_MethodSignature_WriteTrack -1424799012
 #define CardIssuerStandService_MethodSignature_GetMaterialCountEx 1356148904
 #define CardIssuerStandService_MethodSignature_SetMaterialCountEx -1512312761
 #define CardIssuerStandService_MethodSignature_SetSomeFlag -2033418025
@@ -80,7 +78,6 @@ namespace CardIssuerStand {
 #define CardIssuerStandService_LogCode_PostOnline "QLR040220307"
 #define CardIssuerStandService_LogCode_Exit "QLR040220308"
 #define CardIssuerStandService_LogCode_QueryCardInfo "QLR040220314"
-#define CardIssuerStandService_LogCode_WriteTrack "QLR040220315"
 #define CardIssuerStandService_LogCode_GetMaterialCountEx "QLR040220316"
 #define CardIssuerStandService_LogCode_SetMaterialCountEx "QLR040220317"
 #define CardIssuerStandService_LogCode_SetSomeFlag "QLR040220318"
@@ -290,35 +287,6 @@ struct CardIssuerStandService_QueryCardInfo_Ans
 
 };
 
-struct CardIssuerStandService_WriteTrack_Req
-{
-	int mode;
-	int co;
-	CSimpleStringW track1;
-	CSimpleStringW track2;
-	CSimpleStringW track3;
-	CSimpleStringW reserved;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & mode & co & track1 & track2 & track3 & reserved;
-	}
-
-};
-
-struct CardIssuerStandService_WriteTrack_Ans
-{
-	int result;
-	int reserved1;
-	CSimpleStringA reserved2;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & result & reserved1 & reserved2;
-	}
-
-};
-
 struct CardIssuerStandService_GetMaterialCountEx_Req
 {
 	CAutoArray<int> GetHopper;

Module/mod_CardIssuerStand/CardIssuerStand_server_g.h

@@ -100,13 +100,6 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CardIssuerStandService_Method_WriteTrack:
-			if (dwSignature == CardIssuerStandService_MethodSignature_WriteTrack) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case CardIssuerStandService_Method_GetMaterialCountEx:
 			if (dwSignature == CardIssuerStandService_MethodSignature_GetMaterialCountEx) {
 				bOverlap = true;
@@ -287,11 +280,6 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CardIssuerStandService_Method_WriteTrack:
-			if (dwSignature != CardIssuerStandService_MethodSignature_WriteTrack) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case CardIssuerStandService_Method_GetMaterialCountEx:
 			if (dwSignature != CardIssuerStandService_MethodSignature_GetMaterialCountEx) {
 				Error = Error_MethodSignatureFailed;
@@ -434,11 +422,6 @@ public:
 	/// override by user
 	}
 
-	virtual void Handle_WriteTrack(SpReqAnsContext<CardIssuerStandService_WriteTrack_Req, CardIssuerStandService_WriteTrack_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
 	virtual void Handle_GetMaterialCountEx(SpReqAnsContext<CardIssuerStandService_GetMaterialCountEx_Req, CardIssuerStandService_GetMaterialCountEx_Ans>::Pointer ctx)
 	{
 	/// override by user
@@ -640,16 +623,6 @@ public:
 						Handle_QueryCardInfo(ctx);
 					}
 					break;
-				case CardIssuerStandService_Method_WriteTrack:
-					{
-						SpReqAnsContext<CardIssuerStandService_WriteTrack_Req,CardIssuerStandService_WriteTrack_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CardIssuerStandService_WriteTrack_Req,CardIssuerStandService_WriteTrack_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_WriteTrack(ctx);
-					}
-					break;
 				case CardIssuerStandService_Method_GetMaterialCountEx:
 					{
 						SpReqAnsContext<CardIssuerStandService_GetMaterialCountEx_Req,CardIssuerStandService_GetMaterialCountEx_Ans>::Pointer ctx;

Module/mod_CardIssuerStand/mod_cardissuerStand.cpp

@@ -84,10 +84,7 @@ void CardIssuerServerSession::Handle_QueryCardInfo(SpReqAnsContext<CardIssuerSta
 	DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setAPI(__FUNCTION__)("QueryCardInfo");
 	m_pEntity->QueryCardInfo(ctx);
 }
-void CardIssuerServerSession::Handle_WriteTrack(SpReqAnsContext<CardIssuerStandService_WriteTrack_Req, CardIssuerStandService_WriteTrack_Ans>::Pointer ctx)
-{
-	ctx->Answer(Error_NotImpl);
-}
+
 void CardIssuerServerSession::Handle_GetMaterialCountEx(SpReqAnsContext<CardIssuerStandService_GetMaterialCountEx_Req, CardIssuerStandService_GetMaterialCountEx_Ans>::Pointer ctx)
 {
 	LOG_FUNCTION();

Module/mod_CardIssuerStand/mod_cardissuerStand.h

@@ -21,7 +21,6 @@ public:
 	virtual void Handle_PostOnline(SpReqAnsContext<CardIssuerStandService_PostOnline_Req, CardIssuerStandService_PostOnline_Ans>::Pointer ctx);
 	virtual void Handle_Exit(SpOnewayCallContext<CardIssuerStandService_Exit_Info>::Pointer ctx);
 	virtual void Handle_QueryCardInfo(SpReqAnsContext<CardIssuerStandService_QueryCardInfo_Req, CardIssuerStandService_QueryCardInfo_Ans>::Pointer ctx);
-	virtual void Handle_WriteTrack(SpReqAnsContext<CardIssuerStandService_WriteTrack_Req, CardIssuerStandService_WriteTrack_Ans>::Pointer ctx);
 	virtual void Handle_GetMaterialCountEx(SpReqAnsContext<CardIssuerStandService_GetMaterialCountEx_Req, CardIssuerStandService_GetMaterialCountEx_Ans>::Pointer ctx);
 	virtual void Handle_SetMaterialCountEx(SpReqAnsContext<CardIssuerStandService_SetMaterialCountEx_Req, CardIssuerStandService_SetMaterialCountEx_Ans>::Pointer ctx);
 	virtual void Handle_SetSomeFlag(SpReqAnsContext<CardIssuerStandService_SetSomeFlag_Req, CardIssuerStandService_SetSomeFlag_Ans>::Pointer ctx);