Revert "#IQRV #comment [Chromium] 物料维护接口添加总行访问控制"

This reverts commit 76fdfea614debd36fabd68aa04dd67ca9fd5c1d4.

Module/mod_guiconsole/MaterialMgrCnn.cpp

@@ -9,60 +9,14 @@
 
 #endif //RVC_OS_LINUX
 
-static void HTTPLogCallback(const char* msg) {
-	Dbg("HTTPLogCallback gray failed, %s", msg);
-}
-
 CMaterialMgrCnn::CMaterialMgrCnn(CEntityBase *pEntity)
-:SpSecureClient(pEntity), m_GrayLaunchUrl(""), m_strCallRouteBranchNo(""), m_materialUrl(""), m_forceBranch(true)
+:SpSecureClient(pEntity)
 {
-	m_bGrayLaunch = FALSE;
-
-	CSmartPointer<IConfigInfo> pConfig;
-	auto rc = pEntity->GetFunction()->OpenConfig(Config_CenterSetting, pConfig);
-	assert(rc == Error_Succeed);
-
-	rc = pConfig->ReadConfigValue("Common", "GrayLaunchUrl", m_GrayLaunchUrl);
-	if (0 != m_GrayLaunchUrl.GetLength())
-		Dbg("m_GrayLaunchUrl:%s", m_GrayLaunchUrl.GetData());
-
-	rc = pConfig->ReadConfigValue("Initializer", "SubBankNo", m_strCallRouteBranchNo);
-	if (0 != m_strCallRouteBranchNo.GetLength())
-		Dbg("m_strCallRouteBranchNo:%s", m_strCallRouteBranchNo.GetData());
-
-	rc = pConfig->ReadConfigValue("GUIConsole", "MaterialUrl", m_materialUrl);
-	if (0 != m_materialUrl.GetLength())
-		Dbg("m_materialUrl:%s", m_materialUrl.GetData());
-
-	rc = pConfig->ReadConfigValueInt("GUIConsole", "forceBranch", m_forceBranch);
-	Dbg("forceBranch:%d", m_forceBranch);
-
-
-	LoadTerminalId();
-	m_pHttpFunc = create_http(HTTPLogCallback);
-
-	if (m_GrayLaunchUrl.GetLength() != 0) {
-		GrayLaunchReq req;
-		req.m_url = m_GrayLaunchUrl;
-		req.m_terminal_no = m_strTerminalId;
-		req.m_branch_no = m_strCallRouteBranchNo;
-		req.m_modular = "guiconsole";
-		GrayLaunchResponse response;
-		bool ret = m_pHttpFunc->Get(req, response);
-		if (ret) {
-			m_bGrayLaunch = response.m_result;
-		}
-	}
-	else
-		m_bGrayLaunch = false;
 }
 
 
-
-
 CMaterialMgrCnn::~CMaterialMgrCnn()
 {
-	
 }
 
 ErrorCodeEnum CMaterialMgrCnn::GetMD5(char *pStr, BYTE md5v[16])
@@ -173,54 +127,6 @@ ErrorCodeEnum CMaterialMgrCnn::QueryMaterialInfo(const char *pszDeviceNo, unsign
 	CAutoArray<unsigned int> &CardPercent, CAutoArray<CSimpleStringA> &TerminalNo, CAutoArray<CSimpleStringA> &Maintainer, CAutoArray<CSimpleStringA> &MaintainTime,
 	CAutoArray<CSimpleStringA> &UpdateTime)
 {
-
-	if (m_bGrayLaunch && m_materialUrl.GetLength() > 0) {
-		QueryMaterialInfoHTTPReq req;
-		req.DeviceNo = pszDeviceNo;
-		req.m_url = m_materialUrl.Append("/cardIssue/getCardIssueInfo");
-		req.m_headers.emplace(std::make_pair("Content-Type", "application/json"));
-		QueryMaterialInfoHTTPRet materialRet;
-		bool ret = m_pHttpFunc->Post(req, materialRet);
-		if (ret)
-		{
-			count = materialRet.retData.size();
-			arrDeviceNo.Init(count + 1); arrMateriel.Init(count + 1); CardGroove.Init(count + 1); CardBoxNo.Init(count + 1); PsbCode.Init(count + 1); PsbName.Init(count + 1); CardInit.Init(count + 1);
-			CardRemains.Init(count + 1); CardIssued.Init(count + 1);	CardMixed.Init(count + 1); CardPercent.Init(count + 1); TerminalNo.Init(count + 1); Maintainer.Init(count + 1);
-			MaintainTime.Init(count + 1); UpdateTime.Init(count + 1);
-			for (int i = 0; i < count; i++)
-			{
-				QueryMaterialInfoRetDate* curData = &(materialRet.retData[i]);
-				arrDeviceNo[i] = curData->DeviceNo;
-				arrMateriel[i] = curData->Materiel;
-				CardGroove[i] = curData->CardGroove;
-				CardBoxNo[i] = curData->CardBoxNo;
-				char tempStr[200] = "";
-				memcpy(tempStr, curData->PsbCode, sizeof(curData->PsbCode));
-				tempStr[4] = '\0';
-				PsbCode[i] = tempStr;
-				PsbName[i] = curData->PsbName;
-				CardInit[i] = curData->CardInit;
-				CardRemains[i] = curData->CardRemains;
-				CardIssued[i] = curData->CardIssued;
-				CardMixed[i] = curData->CardMixed;
-				CardPercent[i] = curData->CardPercent;
-				TerminalNo[i] = curData->TerminalNo;
-				Maintainer[i] = curData->Maintainer;
-				MaintainTime[i] = curData->MaintainTime;
-				UpdateTime[i] = curData->UpdateTime;
-			}
-			if (!m_forceBranch)
-				return Error_Succeed;
-		}
-		else
-		{
-			if (!m_forceBranch)
-				return Error_TimeOut;
-		}
-
-		
-	}
-	Dbg("QueryMaterialInfo by branch");
 	auto pReqPkg = CreateNewPackage("QueryMC");
 
 	QueryMaterialInfoReq req = {};
@@ -343,49 +249,6 @@ ErrorCodeEnum CMaterialMgrCnn::SyncMaterialCount(const char *pszDeviceNo, DWORD
 	CSystemStaticInfo info;
 	m_pEntity->GetFunction()->GetSystemStaticInfo(info);
 
-	if(m_bGrayLaunch && m_materialUrl.GetLength() > 0)
-	{
-		SyncMaterialCountHTTPReq req;
-		req.m_url = m_materialUrl.Append("/cardIssue/insertOrUpdateCardIssue");
-		req.m_headers.emplace(std::make_pair("Content-Type", "application/json"));
-		SyncMaterialCountReq1 &req1 = req.reqInfo;
-		strncpy_s(req1.TerminalNo, sizeof(req1.TerminalNo), info.strTerminalID, _TRUNCATE);
-		strncpy_s(req1.DeviceNo, sizeof(req1.DeviceNo), pszDeviceNo, _TRUNCATE);
-		strncpy_s(req1.Material, sizeof(req1.Material), "DebitCard", _TRUNCATE);
-		req1.CardBoxNum = dwCardBoxNum;
-		for (int i = 0; i <= dwCardBoxNum; i++)
-		{
-			SyncMaterialCountReq2 pReq2;
-			memset(&pReq2, 0, sizeof(SyncMaterialCountReq2));
-			pReq2.bMaintain = arrMaintainFlag[i];
-			if (arrMaintainFlag[i])
-			{
-				strncpy_s(pReq2.Maintainer, sizeof(pReq2.Maintainer), arrMaintainer[i], _TRUNCATE);
-				pReq2.MaintainTime = arrMaintainTime[i];
-			}
-
-			strncpy_s(pReq2.CardBoxNo, sizeof(pReq2.CardBoxNo), arrCardBoxNo[i], _TRUNCATE);
-			strncpy_s(pReq2.PsbCode, sizeof(pReq2.PsbCode), arrPsbCode[i], _TRUNCATE);
-			strncpy_s(pReq2.PsbName, sizeof(pReq2.PsbName), arrPsbName[i], _TRUNCATE);
-			pReq2.CardInit = arrCardInit[i];
-			pReq2.CardRemains = arrCardRemains[i];
-			pReq2.CardIssued = arrCardIssued[i];
-			pReq2.CardMixed = arrCardMixed[i];
-			pReq2.CardPercent = arrCardPercent[i];
-			req.reqData.push_back(pReq2);
-		}
-		SyncMaterialCountHTTPRet materialRet;
-		bool ret = m_pHttpFunc->Post(req, materialRet);
-		if (!m_forceBranch)	//不是一定要分行服务，以分行服务同步为准
-		{
-			if (!ret)
-				return Error_TimeOut;
-			else
-				return materialRet.m_success ? Error_Succeed : Error_Unexpect;
-		}
-			
-	}
-	Dbg("SyncMaterialCount by branch");
 	SyncMaterialCountReq1 req1 = {};
 	strncpy_s(req1.TerminalNo, sizeof(req1.TerminalNo), info.strTerminalID, _TRUNCATE);
 	strncpy_s(req1.DeviceNo, sizeof(req1.DeviceNo), pszDeviceNo, _TRUNCATE);
@@ -393,8 +256,8 @@ ErrorCodeEnum CMaterialMgrCnn::SyncMaterialCount(const char *pszDeviceNo, DWORD
 	req1.CardBoxNum = dwCardBoxNum;
 
 	// 最后一个数组列放吞卡计数
-	char buf[2048] = {};
-	assert(sizeof(SyncMaterialCountReq2) * (dwCardBoxNum +1)< 2048);
+	char buf[1024] = {};
+	assert(sizeof(SyncMaterialCountReq2) * (dwCardBoxNum +1)< 1024);
 	SyncMaterialCountReq2 *pReq2 = (SyncMaterialCountReq2*)buf;
 	for (int i = 0; i <= dwCardBoxNum; i++)
 	{

Module/mod_guiconsole/MaterialMgrCnn.h

@@ -2,9 +2,7 @@
 #define RVC_MODULE_MATERIALMGR_CNN_H_
 
 #pragma once
-#include "IHttpFunc.h"
-#include <vector>
-#include "json/json.h"
+
 #include "SpSecureClient.h"
 #include "GUIConsole_def_g.h"
 using namespace GUIConsole;
@@ -68,155 +66,17 @@ struct QueryMaterialInfoRetDate
 };
 
 
+// struct QueryMaterialInfoRet2
+// {
+// 	char InfoResult[2048];
+// };
+
 //[StructName("QryMCA1")]
 struct QueryMaterialInfoRet1
 {
 	unsigned int count;
 };
 
-struct GrayLaunchReq : CHTTPReq {
-	GrayLaunchReq(){ 
-		m_timeOut = 500;
-	}
-	CSimpleStringA m_terminal_no;
-	CSimpleStringA m_branch_no;
-	CSimpleStringA m_modular;
-	virtual string ToJson() {
-		char reqcontent[512];
-		sprintf(reqcontent, "{\"terminal_no\":\"%s\",\"branch_no\":\"%s\",\"modular\":\"%s\"}", m_terminal_no.GetData(),
-			m_branch_no.GetData(), m_modular.GetData());
-		return reqcontent;
-	}
-};
-
-struct GrayLaunchResponse : CHTTPRet {
-	GrayLaunchResponse() :m_result(false) {}
-	bool m_result;
-	virtual bool Parse(string strData) {
-		//Dbg("GrayLaunchResponse: data = %s", strData.c_str());
-		Json::Value root;
-		Json::Reader reader;
-		reader.parse(strData, root, false);
-		if (root["data"].isBool()) {
-			m_result = root["data"].asBool();
-		}
-		return m_result;
-	}
-};
-
-
-struct QueryMaterialInfoHTTPReq : CHTTPReq {
-	QueryMaterialInfoHTTPReq() { m_timeOut = 500; }
-	CSimpleStringA DeviceNo;
-	
-	virtual string ToJson() {
-		char reqcontent[512];
-		sprintf(reqcontent, "{\"deviceNo\":\"%s\"}", DeviceNo.GetData());
-		return reqcontent;
-	}
-};
-
-struct QueryMaterialInfoHTTPRet : CHTTPRet {
-	QueryMaterialInfoHTTPRet(){}
-	std::vector<QueryMaterialInfoRetDate> retData;
-	virtual bool Parse(std::string strData) {
-		//Dbg("QueryMaterialInfoHTTPRet: data = %s", strData.c_str());
-		Json::Value root;
-		Json::Reader reader;
-		reader.parse(strData, root);
-		if (root.isNull() || root["data"].isNull())
-			return false;
-		for (int i = 0; i < root["data"].size(); i++)
-		{
-			QueryMaterialInfoRetDate cur;
-			auto curObject = root["data"][i];
-			ZeroMemory(&cur, sizeof(QueryMaterialInfoRetDate));
-			if (!curObject["DeviceNo"].isNull() && curObject["DeviceNo"].isString())
-			{
-				sprintf(cur.DeviceNo, "%s", curObject["DeviceNo"].asString().c_str());
-			}
-			else
-				Dbg("parse DeviceNo failed");
-
-			if (!curObject["Materiel"].isNull() && curObject["Materiel"].isString())
-				sprintf(cur.Materiel, "%s", curObject["Materiel"].asString().c_str());
-			else
-				Dbg("parse Materiel failed");
-
-			if (!curObject["CardGroove"].isNull() && curObject["CardGroove"].isString())
-				sprintf(cur.CardGroove, "%s", curObject["CardGroove"].asString().c_str());
-			else
-				Dbg("parse CardGroove failed");
-
-			if (!curObject["CardBoxNo"].isNull() && curObject["CardBoxNo"].isString())
-				sprintf(cur.CardBoxNo, "%s", curObject["CardBoxNo"].asString().c_str());
-			else
-				Dbg("parse CardBoxNo failed");
-
-			if (!curObject["PsbCode"].isNull() && curObject["PsbCode"].isString())
-				sprintf(cur.PsbCode, "%s", curObject["PsbCode"].asString().c_str());
-			else
-				Dbg("parse PsbCode failed");
-
-			if (!curObject["PsbName"].isNull() && curObject["PsbName"].isString())
-				sprintf(cur.PsbName, "%s", curObject["PsbName"].asString().c_str());
-			else
-				Dbg("parse PsbName failed");
-
-			if (!curObject["CardInit"].isNull() && curObject["CardInit"].isInt())
-				cur.CardInit = curObject["CardInit"].asInt();
-			else
-				Dbg("parse CardInit failed");
-
-			if (!curObject["CardRemains"].isNull() && curObject["CardRemains"].isInt())
-				cur.CardRemains = curObject["CardRemains"].asInt();
-			else
-				Dbg("parse CardRemains failed");
-
-			if (!curObject["CardIssued"].isNull() && curObject["CardIssued"].isInt())
-				cur.CardIssued = curObject["CardIssued"].asInt();
-			else
-				Dbg("parse CardIssued failed");
-
-			if (!curObject["CardMixed"].isNull() && curObject["CardMixed"].isInt())
-				cur.CardMixed = curObject["CardMixed"].asInt();
-			else
-				Dbg("parse CardMixed failed");
-
-			if (!curObject["CardPercent"].isNull() && curObject["CardPercent"].isInt())
-				cur.CardPercent = curObject["CardPercent"].asInt();
-			else
-				Dbg("parse CardPercent failed");
-
-			if (!curObject["TerminalNo"].isNull() && curObject["TerminalNo"].isString())
-				sprintf(cur.TerminalNo, "%s", curObject["TerminalNo"].asString().c_str());
-			else
-				Dbg("parse TerminalNo failed");
-
-			if (!curObject["Maintainer"].isNull() && curObject["Maintainer"].isString())
-				sprintf(cur.Maintainer, "%s", curObject["Maintainer"].asString().c_str());
-			else
-				Dbg("parse Maintainer failed");
-
-			if (!curObject["MaintainTime"].isNull() && curObject["MaintainTime"].isString())
-				sprintf(cur.MaintainTime, "%s", curObject["MaintainTime"].asString().c_str());
-			else
-				Dbg("parse MaintainTime failed");
-
-			if (!curObject["UpdateTime"].isNull() && curObject["UpdateTime"].isString())
-				sprintf(cur.UpdateTime, "%s", curObject["UpdateTime"].asString().c_str());
-			else
-				Dbg("parse UpdateTime failed");
-
-			retData.push_back(cur);
-		}
-
-		return true;
-	}
-
-};
-
-
 
 // 获取后台物料计数
 // [StructName("GetMCR")]
@@ -361,64 +221,6 @@ struct SyncMaterialCountReq2
 	DWORD CardMixed;
 	DWORD CardPercent;		
 };
-
-struct SyncMaterialCountHTTPReq : CHTTPReq {
-	SyncMaterialCountHTTPReq() { m_timeOut = 500; }
-	SyncMaterialCountReq1 reqInfo;
-	std::vector<SyncMaterialCountReq2> reqData;
-
-
-	virtual string ToJson() {
-		Json::Value root;
-		Json::Value arrayObj;
-		root["terminalNo"] = reqInfo.TerminalNo;
-		root["deviceNo"] = reqInfo.DeviceNo;
-		root["materiel"] = reqInfo.Material;
-		root["cardBoxNum"] = (int)reqInfo.CardBoxNum;
-		for (int i = 0; i <= reqInfo.CardBoxNum; i++)
-		{
-			Json::Value item;
-			item["CardBoxNo"] = reqData[i].CardBoxNo;
-			item["PsbCode"] = reqData[i].PsbCode;
-			item["PsbName"] = reqData[i].PsbName;
-			item["CardInit"] = (int)reqData[i].CardInit;
-			item["CardRemains"] = (int)reqData[i].CardRemains;
-			item["CardIssued"] = (int)reqData[i].CardIssued;
-			item["CardMixed"] = (int)reqData[i].CardMixed;
-			item["CardPercent"] = (int)reqData[i].CardPercent;
-			item["Maintainer"] = reqData[i].Maintainer;
-			if (reqData[i].MaintainTime == 0)
-				item["MaintainTime"] = "";
-			else {
-				item["MaintainTime"] = CSmallDateTime::GetNow().ToTimeString().GetData();
-				//Dbg("MaintainTime:%d", (DWORD)CSmallDateTime::GetNow());
-			}
-				
-			item["bMaintain"] = reqData[i].bMaintain;
-			arrayObj.append(item);
-		}
-		root["cardIssueList"] = arrayObj;
-		return root.toStyledString();
-	}
-};
-
-struct SyncMaterialCountHTTPRet : CHTTPRet {
-	SyncMaterialCountHTTPRet() : m_success(false) {}
-	bool m_success;
-	virtual bool Parse(string strData) {
-		Dbg("SyncMaterialCountHTTPRet: data = %s", strData.c_str());
-		Json::Value root;
-		Json::Reader reader;
-		reader.parse(strData, root, false);
-		if (root["success"].isBool()) {
-			m_success = root["success"].asBool();
-		}
-		return m_success;
-	}
-};
-
-
-
 #pragma pack()
 
 class CMaterialMgrCnn: public SpSecureClient
@@ -473,25 +275,6 @@ private:
 	ErrorCodeEnum HandleSyncMaterialCount(const CSmartPointer<IPackage> &pRecvPkg);
 
 	ErrorCodeEnum GetMD5(char *pStr, BYTE md5[16]);
-
-	CSimpleStringA m_GrayLaunchUrl;
-	IHttpFunc* m_pHttpFunc;
-	BOOL m_bGrayLaunch;
-	CSimpleStringA m_strTerminalId;
-	CSimpleStringA m_strCallRouteBranchNo;
-	CSimpleStringA m_materialUrl;
-	BOOL m_forceBranch;
-
-	ErrorCodeEnum LoadTerminalId()
-	{
-		CSystemStaticInfo Info;
-		ErrorCodeEnum Error = m_pEntity->GetFunction()->GetSystemStaticInfo(Info);
-		if (Error == Error_Succeed) {
-			m_strTerminalId = Info.strTerminalID;
-		}
-		return Error;
-	}
-
 };
 
 #endif //RVC_MODULE_MATERIALMGR_CNN_H_