Z991239-6454 #comment feat: 去掉废弃的issue接口

Module/mod_CardIssuerStand/CardIssuerStand.xml

@@ -69,13 +69,7 @@
 			</res>			
 		</twoway>
 		<oneway name="Exit" overlap="true" method_id="8">			
-		</oneway>			
-		<twoway name="Issue" overlap="true" method_id="9">
-			<req>
-			</req>
-			<res>
-			</res>			
-		</twoway>				
+		</oneway>				
 		<twoway name="QueryCardInfo" overlap="true" method_id="14">
 			<req>
 			</req>

Module/mod_CardIssuerStand/CardIssuerStandFSM.cpp

@@ -159,24 +159,12 @@ unsigned int CCardIssuerFSM::s2_on_event(FSMEvent* pEvt)
 		pEvt->SetHandled();
 	}
 		break;
-	case USER_EVT_ISSUE:
 	case USER_EVT_ISSUE_EX:
 	{
 		IssueTask* task = new IssueTask(this);
-		CardIssueEvent *cie = NULL;
-		CardIssueExEvent *ciee = NULL;
-		if (pEvt->iEvt == USER_EVT_ISSUE)
-		{
-			cie = dynamic_cast<CardIssueEvent*>(pEvt);
-			task->ctx = cie->ctx;
-			task->ctxEx = NULL;
-		}
-		else
-		{
-			ciee = dynamic_cast<CardIssueExEvent*>(pEvt);
-			task->ctxEx = ciee->ctx;
-			task->ctx = NULL;
-		}
+		CardIssueExEvent* ciee = NULL;
+		ciee = dynamic_cast<CardIssueExEvent*>(pEvt);
+		task->ctxEx = ciee->ctx;
 		GetEntityBase()->GetFunction()->PostThreadPoolTask(task);
 		pEvt->SetHandled();
 	}
@@ -693,7 +681,6 @@ unsigned int CCardIssuerFSM::s4_on_event(FSMEvent* pEvt)
 			CardIssueExEvent *ciee = NULL;
 			ciee = dynamic_cast<CardIssueExEvent*>(pEvt);
 			task->ctxEx = ciee->ctx;
-			task->ctx = NULL;
 			GetEntityBase()->GetFunction()->PostThreadPoolTask(task);
 			pEvt->SetHandled();
 			return pEvt->param1;
@@ -1101,10 +1088,6 @@ unsigned int CCardIssuerFSM::s10_on_event(FSMEvent* pEvt)
 	int ret = 0;
 	switch(pEvt->iEvt)
 	{
-	case USER_EVT_ISSUE_FINISHED:
-		pEvt->SetHandled();
-		ret = pEvt->param1;
-		break;
 	case USER_EVT_ISSUE_EX_FINISHED:
 		pEvt->SetHandled();
 		ret = pEvt->param1;
@@ -1666,7 +1649,7 @@ int CCardIssuerFSM::CheckIfHasCardOnCase(CheckCardCase eCase)
 	}
 	return 1;
 }
-int CCardIssuerFSM::IssueCard(SpReqAnsContext<CardIssuerStandService_Issue_Req, CardIssuerStandService_Issue_Ans>::Pointer ctx, SpReqAnsContext<CardIssuerStandService_IssueEx_Req, CardIssuerStandService_IssueEx_Ans>::Pointer ctxEx)
+int CCardIssuerFSM::IssueCard(SpReqAnsContext<CardIssuerStandService_IssueEx_Req, CardIssuerStandService_IssueEx_Ans>::Pointer ctxEx)
 {
 	LOG_FUNCTION();
 
@@ -1738,10 +1721,7 @@ int CCardIssuerFSM::IssueCard(SpReqAnsContext<CardIssuerStandService_Issue_Req,
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220320").setResultCode("RTA230R")("卡箱1连续吞卡超限，请及时执行清机");
 
 		LogWarn(Severity_Middle, Error_Unexpect, dwTmpErrCode, errMsg.GetData());
-		if (ctx != NULL)
-			ctx->Answer(Error_DevMedia, dwTmpErrCode);
-		else
-			ctxEx->Answer(Error_DevMedia, dwTmpErrCode);
+		ctxEx->Answer(Error_DevMedia, dwTmpErrCode);
 		return 2;
 	}
 	ErrorCodeEnum errCode;
@@ -1821,10 +1801,7 @@ int CCardIssuerFSM::IssueCard(SpReqAnsContext<CardIssuerStandService_Issue_Req,
 				dwUsrErrCode = CardIssuer_UserErrorCode_NoCardRemains_Hopper3;
 			}
 		}
-		if (ctx != NULL)
-			ctx->Answer(Error_DevNotAvailable, dwUsrErrCode);
-		else
-			ctxEx->Answer(Error_DevNotAvailable, dwUsrErrCode);
+		ctxEx->Answer(Error_DevNotAvailable, dwUsrErrCode);
 
 		return 2;
 	}
@@ -1853,17 +1830,10 @@ int CCardIssuerFSM::IssueCard(SpReqAnsContext<CardIssuerStandService_Issue_Req,
 	m_bCardFromHopper = true;
 	if (errCode != Error_Succeed)
 	{
-		
+
 		CSimpleStringA ErrMsg = CSimpleStringA::Format("m_currentHopper:%d", m_currentHopper);
-		
-		if (ctx != NULL) {
-			SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FROM_HOPPER, "DevAdapter::MoveCard", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040220320", ErrMsg.GetData());
-			ctx->Answer(Error_Unexpect, GetAlarmDEC());
-		}
-		else {
-			SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FROM_HOPPER, "DevAdapter::MoveCard", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040220320", ErrMsg.GetData());
-			ctxEx->Answer(Error_Unexpect, GetAlarmDEC());
-		}
+		SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FROM_HOPPER, "DevAdapter::MoveCard", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040220320", ErrMsg.GetData());
+		ctxEx->Answer(Error_Unexpect, GetAlarmDEC());
 		return 1;
 	}
 	else {
@@ -1882,10 +1852,7 @@ int CCardIssuerFSM::IssueCard(SpReqAnsContext<CardIssuerStandService_Issue_Req,
 	Sleep(1000);
 	ctxEx->Ans.reserved1[0] = ctxEx->Ans.reserved1[1] = 0;
 
-	if (ctx != NULL)
-		ctx->Answer(Error_Succeed);
-	else
-		ctxEx->Answer(Error_Succeed);
+	ctxEx->Answer(Error_Succeed);
 	return 0;
 }
 

Module/mod_CardIssuerStand/CardIssuerStandFSM.h

@@ -30,8 +30,6 @@ enum EvtType
 	USER_EVT_ACCEPT,
 	USER_EVT_ACCEPT_CANCEL,
 	USER_EVT_ACCEPTFINISHED,
-	USER_EVT_ISSUE,
-	USER_EVT_ISSUE_FINISHED,
 	USER_EVT_EJECT,
 	USER_EVT_CAPTURE,
 	USER_EVT_EJECTFINISHED,
@@ -153,13 +151,6 @@ public:
 	~CardAcceptEvent() {}
 	SpReqAnsContext<CardIssuerStandService_Insert_Req, CardIssuerStandService_Insert_Ans>::Pointer ctx;
 };
-class CardIssueEvent : public FSMEvent
-{
-public:
-	CardIssueEvent() : FSMEvent(USER_EVT_ISSUE) {}
-	~CardIssueEvent() {}
-	SpReqAnsContext<CardIssuerStandService_Issue_Req, CardIssuerStandService_Issue_Ans>::Pointer ctx;
-};
 
 class CancelAcceptEvent : public FSMEvent
 {
@@ -677,7 +668,6 @@ public:
 		FSM_RULE_ENTRY(s2, s3, USER_EVT_ACCEPT, 0)
 		//		FSM_RULE_ENTRY(s2,s9,USER_EVT_ACCEPT,1)
 		FSM_RULE_ENTRY(s2, FSM_STATE_EXIT, USER_EVT_QUIT, 0)
-		FSM_RULE_ENTRY(s2, s10, USER_EVT_ISSUE, 0)
 		FSM_RULE_ENTRY(s2, s10, USER_EVT_ISSUE_EX, 0)
 		FSM_RULE_ENTRY(s2, s3, USER_EVT_JS_INSERT, 0)//JS 插卡
 		FSM_RULE_ENTRY(s2, s12, USER_EVT_JS_ISSUE_FROM_BOX, 0)//JS 卡箱发卡
@@ -732,9 +722,6 @@ public:
 		FSM_RULE_ENTRY(s8, s9, USER_EVT_JS_CAPTURE_FINISHED, 1)//JS 吞卡失败
 		FSM_RULE_ENTRY(s9, s2, USER_EVT_CHECK_CARD_FINISHED, 0)
 		FSM_RULE_ENTRY(s9, s4, USER_EVT_CHECK_CARD_FINISHED, 2)
-		FSM_RULE_ENTRY(s10, s4, USER_EVT_ISSUE_FINISHED, 0)
-		FSM_RULE_ENTRY(s10, s9, USER_EVT_ISSUE_FINISHED, 1)
-		FSM_RULE_ENTRY(s10, s2, USER_EVT_ISSUE_FINISHED, 2)
 		FSM_RULE_ENTRY(s10, s6, USER_EVT_ISSUE_EX_FINISHED, 6)
 		FSM_RULE_ENTRY(s10, s4, USER_EVT_ISSUE_EX_FINISHED, 0)
 		FSM_RULE_ENTRY(s10, s9, USER_EVT_ISSUE_EX_FINISHED, 1)
@@ -835,7 +822,7 @@ public:
 	int PostOnline_RF(SpReqAnsContext<CardIssuerStandService_PostOnline_Req, CardIssuerStandService_PostOnline_Ans>::Pointer ctx);
 	int InternalAcceptCard();
 	int AcceptCard(SpReqAnsContext<CardIssuerStandService_Insert_Req, CardIssuerStandService_Insert_Ans>::Pointer ctx);
-	int IssueCard(SpReqAnsContext<CardIssuerStandService_Issue_Req, CardIssuerStandService_Issue_Ans>::Pointer ctx, SpReqAnsContext<CardIssuerStandService_IssueEx_Req, CardIssuerStandService_IssueEx_Ans>::Pointer ctxEx);
+	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; }
@@ -1018,23 +1005,13 @@ struct AcceptTask : public ITaskSp
 struct IssueTask : public ITaskSp
 {
 	CCardIssuerFSM* fsm;
-	SpReqAnsContext<CardIssuerStandService_Issue_Req, CardIssuerStandService_Issue_Ans>::Pointer ctx;
 	SpReqAnsContext<CardIssuerStandService_IssueEx_Req, CardIssuerStandService_IssueEx_Ans>::Pointer ctxEx;
 	IssueTask(CCardIssuerFSM* f) : fsm(f) {}
 	void Process()
 	{
 		LOG_FUNCTION();
-		FSMEvent *e;
-		if (ctx != NULL)
-			e = new FSMEvent(USER_EVT_ISSUE_FINISHED);
-		else if (ctxEx != NULL)
-			e = new FSMEvent(USER_EVT_ISSUE_EX_FINISHED);
-		else
-		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("IssueTask:ctx is null");
-			return;
-		}
-		e->param1 = fsm->IssueCard(ctx,ctxEx);
+		FSMEvent *e = new FSMEvent(USER_EVT_ISSUE_EX_FINISHED);
+		e->param1 = fsm->IssueCard(ctxEx);
 		fsm->PostEventFIFO(e);
 	}
 };

Module/mod_CardIssuerStand/CardIssuerStand_client_g.h

@@ -395,55 +395,6 @@ public:
 		return ret;
 	}
 
-	ErrorCodeEnum Issue(CardIssuerStandService_Issue_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_Issue, CardIssuerStandService_MethodSignature_Issue, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum Issue(CardIssuerStandService_Issue_Req &Req, CardIssuerStandService_Issue_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = Issue(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum Issue(CardIssuerStandService_Issue_Req &Req, CardIssuerStandService_Issue_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = Issue(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 Issue(CardIssuerStandService_Issue_Req &Req, CardIssuerStandService_Issue_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = Issue(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 QueryCardInfo(CardIssuerStandService_QueryCardInfo_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();

Module/mod_CardIssuerStand/CardIssuerStand_def_g.h

@@ -21,7 +21,6 @@ namespace CardIssuerStand {
 #define CardIssuerStandService_Method_PreOnline 6
 #define CardIssuerStandService_Method_PostOnline 7
 #define CardIssuerStandService_Method_Exit 8
-#define CardIssuerStandService_Method_Issue 9
 #define CardIssuerStandService_Method_QueryCardInfo 14
 #define CardIssuerStandService_Method_WriteTrack 15
 #define CardIssuerStandService_Method_GetMaterialCountEx 16
@@ -52,7 +51,6 @@ namespace CardIssuerStand {
 #define CardIssuerStandService_MethodSignature_PreOnline 640958030
 #define CardIssuerStandService_MethodSignature_PostOnline 923284555
 #define CardIssuerStandService_MethodSignature_Exit -1158854104
-#define CardIssuerStandService_MethodSignature_Issue 438783077
 #define CardIssuerStandService_MethodSignature_QueryCardInfo 154962579
 #define CardIssuerStandService_MethodSignature_WriteTrack -1424799012
 #define CardIssuerStandService_MethodSignature_GetMaterialCountEx 1356148904
@@ -83,7 +81,6 @@ namespace CardIssuerStand {
 #define CardIssuerStandService_LogCode_PreOnline "QLR040220306"
 #define CardIssuerStandService_LogCode_PostOnline "QLR040220307"
 #define CardIssuerStandService_LogCode_Exit "QLR040220308"
-#define CardIssuerStandService_LogCode_Issue "QLR040220309"
 #define CardIssuerStandService_LogCode_QueryCardInfo "QLR040220314"
 #define CardIssuerStandService_LogCode_WriteTrack "QLR040220315"
 #define CardIssuerStandService_LogCode_GetMaterialCountEx "QLR040220316"
@@ -274,24 +271,6 @@ struct CardIssuerStandService_Exit_Info
 
 };
 
-struct CardIssuerStandService_Issue_Req
-{
-
-	void Serialize(SpBuffer &Buf)
-	{
-	}
-
-};
-
-struct CardIssuerStandService_Issue_Ans
-{
-
-	void Serialize(SpBuffer &Buf)
-	{
-	}
-
-};
-
 struct CardIssuerStandService_QueryCardInfo_Req
 {
 

Module/mod_CardIssuerStand/CardIssuerStand_server_g.h

@@ -93,13 +93,6 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CardIssuerStandService_Method_Issue:
-			if (dwSignature == CardIssuerStandService_MethodSignature_Issue) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case CardIssuerStandService_Method_QueryCardInfo:
 			if (dwSignature == CardIssuerStandService_MethodSignature_QueryCardInfo) {
 				bOverlap = true;
@@ -296,11 +289,6 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CardIssuerStandService_Method_Issue:
-			if (dwSignature != CardIssuerStandService_MethodSignature_Issue) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case CardIssuerStandService_Method_QueryCardInfo:
 			if (dwSignature != CardIssuerStandService_MethodSignature_QueryCardInfo) {
 				Error = Error_MethodSignatureFailed;
@@ -453,11 +441,6 @@ public:
 	/// override by user
 	}
 
-	virtual void Handle_Issue(SpReqAnsContext<CardIssuerStandService_Issue_Req, CardIssuerStandService_Issue_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
 	virtual void Handle_QueryCardInfo(SpReqAnsContext<CardIssuerStandService_QueryCardInfo_Req, CardIssuerStandService_QueryCardInfo_Ans>::Pointer ctx)
 	{
 	/// override by user
@@ -664,16 +647,6 @@ public:
 						Handle_Exit(ctx);
 					}
 					break;
-				case CardIssuerStandService_Method_Issue:
-					{
-						SpReqAnsContext<CardIssuerStandService_Issue_Req,CardIssuerStandService_Issue_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CardIssuerStandService_Issue_Req,CardIssuerStandService_Issue_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_Issue(ctx);
-					}
-					break;
 				case CardIssuerStandService_Method_QueryCardInfo:
 					{
 						SpReqAnsContext<CardIssuerStandService_QueryCardInfo_Req,CardIssuerStandService_QueryCardInfo_Ans>::Pointer ctx;

Module/mod_CardIssuerStand/mod_cardissuerStand.h

@@ -145,14 +145,6 @@ public:
 		if (m_fsm.GetWaitFlag())
 			m_fsm.SetWaitMore();
 	}
-	void Issue(SpReqAnsContext<CardIssuerStandService_Issue_Req, CardIssuerStandService_Issue_Ans>::Pointer ctx)
-	{
-		LOG_FUNCTION();
-		m_bNewSessionInit = false;
-		CardIssueEvent *pEvt = new CardIssueEvent();
-		pEvt->ctx = ctx;
-		m_fsm.PostEventFIFO(pEvt);
-	}
 	void PreOnline(SpReqAnsContext<CardIssuerStandService_PreOnline_Req, CardIssuerStandService_PreOnline_Ans>::Pointer ctx)
 	{
 		LOG_FUNCTION();