#IQRV #comment feat: 统一模拟器请求数据时问时，实体名称的设置

DevAdapter/simulator/hspscanner.1.1/hspscanner_impl.cpp

@@ -22,7 +22,7 @@ ErrorCodeEnum HSPSClassImpl::GetDevCategory(DevCategoryInfo &devCategory)
     ErrorCodeEnum err = Error_Succeed;
     SimulatorDevCategoryAns ans;
 
-    err = SimulatorHttpFunction("HSPScanner", "GetDevCategory", ans);
+    err = SimulatorHttpFunction(EntityName, "GetDevCategory", ans);
     LOG4VTM(INFO, "GetDevCategory err = " << err);
 
     strcpy(devCategory.szType, ans.szType.c_str());
@@ -41,7 +41,7 @@ ErrorCodeEnum HSPSClassImpl::Reset()
     ErrorCodeEnum err = Error_Succeed;
     SimulatorCommonAns ans;
 
-    err = SimulatorHttpFunction("HSPScanner", "Reset", ans);
+    err = SimulatorHttpFunction(EntityName, "Reset", ans);
     LOG4VTM(INFO, "Reset err = " << err);
 
     return err;
@@ -52,7 +52,7 @@ ErrorCodeEnum HSPSClassImpl::DevClose()
     ErrorCodeEnum err = Error_Succeed;
     SimulatorCommonAns ans;
 
-    err = SimulatorHttpFunction("HSPScanner", "DevClose", ans);
+    err = SimulatorHttpFunction(EntityName, "DevClose", ans);
     LOG4VTM(INFO, "DevClose err = " << err);
 
     return err;
@@ -63,7 +63,7 @@ ErrorCodeEnum HSPSClassImpl::GetLastErr(DevErrorInfo &devErrInfo)
     ErrorCodeEnum err = Error_Succeed;
     SimulatorDevErrInfoAns ans;
 
-    err = SimulatorHttpFunction("HSPScanner", "GetLastErr", ans);
+    err = SimulatorHttpFunction(EntityName, "GetLastErr", ans);
     LOG4VTM(INFO, "GetLastErr err = " << err);
 
     devErrInfo.dwErrMsgLen = ans.dwErrMsgLen;
@@ -123,7 +123,7 @@ ErrorCodeEnum HSPSClassImpl::DevOpen()
     ErrorCodeEnum err = Error_Succeed;
     SimulatorCommonAns ans;
 
-    err = SimulatorHttpFunction("HSPScanner", "DevOpen", ans);
+    err = SimulatorHttpFunction(EntityName, "DevOpen", ans);
     LOG4VTM(INFO, "DevOpen err = " << err);
 
     return err;
@@ -134,7 +134,7 @@ ErrorCodeEnum HSPSClassImpl::SetParam(ParamType type, ParamTypeValue value)
     ErrorCodeEnum err = Error_Succeed;
     SimulatorCommonAns ans;
 
-    err = SimulatorHttpFunction("HSPScanner", "SetParam", ans);
+    err = SimulatorHttpFunction(EntityName, "SetParam", ans);
     LOG4VTM(INFO, "SetParam err = " << err);
 
     return err;
@@ -145,7 +145,7 @@ ErrorCodeEnum HSPSClassImpl::SetPreview(short nValue)
     ErrorCodeEnum err = Error_Succeed;
     SimulatorCommonAns ans;
 
-    err = SimulatorHttpFunction("HSPScanner", "SetPreview", ans);
+    err = SimulatorHttpFunction(EntityName, "SetPreview", ans);
     LOG4VTM(INFO, "SetPreview err = " << err);
 
     return err;
@@ -156,7 +156,7 @@ ErrorCodeEnum HSPSClassImpl::ScanImage(const char* pszFileName)
     ErrorCodeEnum err = Error_NotImpl;
     SimulatorCommonAns ans;
 
-    err = SimulatorHttpFunction("HSPScanner", "ScanImage", ans);
+    err = SimulatorHttpFunction(EntityName, "ScanImage", ans);
     LOG4VTM(INFO, "ScanImage err = " << err);
 
     if (err == Error_Succeed)
@@ -181,7 +181,7 @@ ErrorCodeEnum HSPSClassImpl::ScanImageEx(BYTE* pBtImg, int& nBtLen, const char*
     ErrorCodeEnum err = Error_NotImpl;
     ScanImageExAns ans;
 
-    err = SimulatorHttpFunction("HSPScanner", "ScanImageEx", ans);
+    err = SimulatorHttpFunction(EntityName, "ScanImageEx", ans);
     LOG4VTM(INFO, "ScanImageEx err = " << err);
 
     if (err == Error_Succeed)
@@ -208,7 +208,7 @@ ErrorCodeEnum HSPSClassImpl::SetViewPos(int nX, int nY, int nWidth)
     ErrorCodeEnum err = Error_NotImpl;
     SimulatorCommonAns ans;
 
-    err = SimulatorHttpFunction("HSPScanner", "SetViewPos", ans);
+    err = SimulatorHttpFunction(EntityName, "SetViewPos", ans);
     LOG4VTM(INFO, "SetViewPos err = " << err);
 
     return err;
@@ -220,7 +220,7 @@ ErrorCodeEnum HSPSClassImpl::SetProperty()
     ErrorCodeEnum err = Error_NotImpl;
     SimulatorCommonAns ans;
 
-    err = SimulatorHttpFunction("HSPScanner", "SetProperty", ans);
+    err = SimulatorHttpFunction(EntityName, "SetProperty", ans);
     LOG4VTM(INFO, "SetProperty err = " << err);
 
     return err;
@@ -231,7 +231,7 @@ ErrorCodeEnum HSPSClassImpl::GetDevStatus(HspsDevStatus& status)
     ErrorCodeEnum err = Error_NotImpl;
     HspsDevStatusAns ans;
 
-    err = SimulatorHttpFunction("HSPScanner", "GetDevStatus", ans);
+    err = SimulatorHttpFunction(EntityName, "GetDevStatus", ans);
     LOG4VTM(INFO, "GetDevStatus err = " << err);
     
     if (err == Error_Succeed) {

DevAdapter/simulator/hspscanner.1.1/hspscanner_impl.h

@@ -4,6 +4,8 @@
 #include "HSPScannerClass.h"
 #include "DeviceSimulator.h"
 
+#define EntityName "HSPScanner"
+
 class HSPSClassImpl : public CHSPSClass
 {
 public:

DevAdapter/simulator/idcer.1.1/idcer_impl.cpp

@@ -9,8 +9,6 @@
 typedef unsigned short UINT16;
 typedef unsigned char UINT8;
 
-#define EntityName "IDCertificate"
-
 //BMP图片生成功能
 #define w 102 //图片宽度
 #define h 126 //图片高度

DevAdapter/simulator/idcer.1.1/idcer_impl.h

@@ -7,6 +7,8 @@
 #include <string>
 #include "DeviceSimulator.h"
 
+#define EntityName "IDCertificate"
+
 class IDCerClassImpl : public IDCerClass
 {
 public:

DevAdapter/simulator/pinpad.1.1/pinpad_impl.cpp

@@ -7,8 +7,6 @@
 #include <cstring>
 #include "log4vendor.h"
 
-#define EntityName "PinPad"
-
 PinPadClassImpl::PinPadClassImpl()
     :m_mode(0)
 {
@@ -213,8 +211,8 @@ ErrorCodeEnum PinPadClassImpl::GetPinBlock(PinBlock &block)
     ErrorCodeEnum err = Error_Succeed;
     PinBlockAns ans;
 
-    err = SimulatorHttpFunction(EntityName, "MacEncrypt", ans);
-    LOG4VTM(INFO, "MacEncrypt err = " << err);
+    err = SimulatorHttpFunction(EntityName, "GetPinBlock", ans);
+    LOG4VTM(INFO, "GetPinBlock err = " << err);
 
     if (err == Error_Succeed) {
         block.dwSize = ans.dwSize;

DevAdapter/simulator/pinpad.1.1/pinpad_impl.h

@@ -9,6 +9,8 @@
 #include <string>
 #include "DeviceSimulator.h"
 
+#define EntityName "PinPad"
+
 class PinPadClassImpl : public PinPadClass
 {
 public: