Skip to content

Commit 54d7d32

Browse files
xengine-qytxengine-qyt
committed
added:oil query price supported
1 parent 5a7140f commit 54d7d32

17 files changed

+223
-4
lines changed

‎XEngine_Source/XEngine_ModuleDatabase/ModuleDB_Define.h‎

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,4 +567,58 @@ extern "C" bool ModuleDatabase_Machine_UPDate(XENGINE_MACHINEINFO* pSt_MachineIn
567567
意思：是否成功
568568
备注：
569569
*********************************************************************/
570-
extern "C" bool ModuleDatabase_Machine_List(XENGINE_MACHINEINFO*** pppSt_MachineInfo, int* pInt_ListCount);
570+
extern "C" bool ModuleDatabase_Machine_List(XENGINE_MACHINEINFO*** pppSt_MachineInfo, int* pInt_ListCount);
571+
/************************************************************************/
572+
/* 导出的油价查询数据库函数 */
573+
/************************************************************************/
574+
/********************************************************************
575+
函数名称：ModuleDatabase_OilInfo_Init
576+
函数功能：初始化数据库
577+
参数.一：pSt_DBConnector
578+
In/Out：In
579+
类型：数据结构指针
580+
可空：N
581+
意思：数据数据库信息
582+
返回值
583+
类型：逻辑型
584+
意思：是否成功
585+
备注：
586+
*********************************************************************/
587+
extern "C" bool ModuleDatabase_OilInfo_Init(DATABASE_MYSQL_CONNECTINFO* pSt_DBConnector);
588+
/********************************************************************
589+
函数名称：ModuleDatabase_OilInfo_Destory
590+
函数功能：销毁
591+
返回值
592+
类型：逻辑型
593+
意思：是否成功
594+
备注：
595+
*********************************************************************/
596+
extern "C" bool ModuleDatabase_OilInfo_Destory();
597+
/********************************************************************
598+
函数名称：ModuleDatabase_OilInfo_Query
599+
函数功能：查询数据
600+
参数.一：pSt_OilInfo
601+
In/Out：In/Out
602+
类型：数据结构指针
603+
可空：N
604+
意思：输入查询的信息,输出完整的信息
605+
返回值
606+
类型：逻辑型
607+
意思：是否成功
608+
备注：
609+
*********************************************************************/
610+
extern "C" bool ModuleDatabase_OilInfo_Query(XENGINE_OILINFO* pSt_OilInfo);
611+
/********************************************************************
612+
函数名称：ModuleDatabase_OilInfo_UPDate
613+
函数功能：更新数据
614+
参数.一：pSt_OilInfo
615+
In/Out：In
616+
类型：数据结构指针
617+
可空：N
618+
意思：输入要更新的数据
619+
返回值
620+
类型：逻辑型
621+
意思：是否成功
622+
备注：
623+
*********************************************************************/
624+
extern "C" bool ModuleDatabase_OilInfo_UPDate(XENGINE_OILINFO* pSt_OilInfo);

‎XEngine_Source/XEngine_ModuleDatabase/XEngine_ModuleDatabase.def‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,9 @@ EXPORTS
4545
ModuleDatabase_Machine_Query
4646
ModuleDatabase_Machine_Delete
4747
ModuleDatabase_Machine_UPDate
48-
ModuleDatabase_Machine_List
48+
ModuleDatabase_Machine_List
49+
50+
ModuleDatabase_OilInfo_Init
51+
ModuleDatabase_OilInfo_Destory
52+
ModuleDatabase_OilInfo_Query
53+
ModuleDatabase_OilInfo_UPDate

‎XEngine_Source/XEngine_ModuleDatabase/XEngine_ModuleDatabase.vcxproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<PropertyGroup Label="UserMacros" />
7373
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7474
<LinkIncremental>true</LinkIncremental>
75-
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
75+
<IncludePath>$(XEngine_Include);..\XEngine_ModuleDatabase;$(IncludePath)</IncludePath>
7676
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -167,6 +167,7 @@
167167
<ClInclude Include="ModuleDatabase_Bank\ModuleDatabase_Bank.h" />
168168
<ClInclude Include="ModuleDatabase_IDCard\ModuleDatabase_IDCard.h" />
169169
<ClInclude Include="ModuleDatabase_Machine\ModuleDatabase_Machine.h" />
170+
<ClInclude Include="ModuleDatabase_OilInfo\ModuleDatabase_OilInfo.h" />
170171
<ClInclude Include="ModuleDatabase_ShortLink\ModuleDatabase_ShortLink.h" />
171172
<ClInclude Include="ModuleDatabase_WordFilter\ModuleDatabase_WordFilter.h" />
172173
<ClInclude Include="ModuleDatabase_XLog\ModuleDatabase_XLog.h" />
@@ -180,6 +181,7 @@
180181
<ClCompile Include="ModuleDatabase_Bank\ModuleDatabase_Bank.cpp" />
181182
<ClCompile Include="ModuleDatabase_IDCard\ModuleDatabase_IDCard.cpp" />
182183
<ClCompile Include="ModuleDatabase_Machine\ModuleDatabase_Machine.cpp" />
184+
<ClCompile Include="ModuleDatabase_OilInfo\ModuleDatabase_OilInfo.cpp" />
183185
<ClCompile Include="ModuleDatabase_ShortLink\ModuleDatabase_ShortLink.cpp" />
184186
<ClCompile Include="ModuleDatabase_WordFilter\ModuleDatabase_WordFilter.cpp" />
185187
<ClCompile Include="ModuleDatabase_XLog\ModuleDatabase_XLog.cpp" />

‎XEngine_Source/XEngine_ModuleDatabase/XEngine_ModuleDatabase.vcxproj.filters‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@
5555
<Filter Include="源文件\ModuleDatabase_Machine">
5656
<UniqueIdentifier>{9c9f01db-e8c6-4abb-a375-23d8e78bb1ea}</UniqueIdentifier>
5757
</Filter>
58+
<Filter Include="头文件\ModuleDatabase_OilInfo">
59+
<UniqueIdentifier>{84bbe555-9f72-42dc-b580-e35766b8efb6}</UniqueIdentifier>
60+
</Filter>
61+
<Filter Include="源文件\ModuleDatabase_OilInfo">
62+
<UniqueIdentifier>{12427cf9-268d-4da5-841c-1da780846d6c}</UniqueIdentifier>
63+
</Filter>
5864
</ItemGroup>
5965
<ItemGroup>
6066
<ClInclude Include="framework.h">
@@ -90,6 +96,9 @@
9096
<ClInclude Include="ModuleDatabase_Machine\ModuleDatabase_Machine.h">
9197
<Filter>头文件\ModuleDatabase_Machine</Filter>
9298
</ClInclude>
99+
<ClInclude Include="ModuleDatabase_OilInfo\ModuleDatabase_OilInfo.h">
100+
<Filter>头文件\ModuleDatabase_OilInfo</Filter>
101+
</ClInclude>
93102
</ItemGroup>
94103
<ItemGroup>
95104
<ClCompile Include="dllmain.cpp">
@@ -119,6 +128,9 @@
119128
<ClCompile Include="ModuleDatabase_Machine\ModuleDatabase_Machine.cpp">
120129
<Filter>源文件\ModuleDatabase_Machine</Filter>
121130
</ClCompile>
131+
<ClCompile Include="ModuleDatabase_OilInfo\ModuleDatabase_OilInfo.cpp">
132+
<Filter>源文件\ModuleDatabase_OilInfo</Filter>
133+
</ClCompile>
122134
</ItemGroup>
123135
<ItemGroup>
124136
<None Include="XEngine_ModuleDatabase.def">

‎XEngine_Source/XEngine_ModuleDatabase/pch.cpp‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "ModuleDatabase_ShortLink/ModuleDatabase_ShortLink.h"
77
#include "ModuleDatabase_WordFilter/ModuleDatabase_WordFilter.h"
88
#include "ModuleDatabase_Machine/ModuleDatabase_Machine.h"
9+
#include "ModuleDatabase_OilInfo/ModuleDatabase_OilInfo.h"
910
/********************************************************************
1011
// Created: 2022/02/28 13:26:15
1112
// File Name: D:\XEngine_IPInfo\XEngine_Source\XEngine_ModuleDatabase\pch.cpp
@@ -27,6 +28,7 @@ CModuleDatabase_XLog m_XLog;
2728
CModuleDatabase_ShortLink m_ShortLink;
2829
CModuleDatabase_WordFilter m_WordFilter;
2930
CModuleDatabase_Machine m_MachineInfo;
31+
CModuleDatabase_OilInfo m_OilInfo;
3032
//////////////////////////////////////////////////////////////////////////
3133
/// 导出的函数
3234
//////////////////////////////////////////////////////////////////////////
@@ -206,4 +208,23 @@ extern "C" bool ModuleDatabase_Machine_UPDate(XENGINE_MACHINEINFO * pSt_MachineI
206208
extern "C" bool ModuleDatabase_Machine_List(XENGINE_MACHINEINFO * **pppSt_MachineInfo, int* pInt_ListCount)
207209
{
208210
return m_MachineInfo.ModuleDatabase_Machine_List(pppSt_MachineInfo, pInt_ListCount);
211+
}
212+
/************************************************************************/
213+
/* 导出的油价查询数据库函数 */
214+
/************************************************************************/
215+
extern "C" bool ModuleDatabase_OilInfo_Init(DATABASE_MYSQL_CONNECTINFO * pSt_DBConnector)
216+
{
217+
return m_OilInfo.ModuleDatabase_OilInfo_Init(pSt_DBConnector);
218+
}
219+
extern "C" bool ModuleDatabase_OilInfo_Destory()
220+
{
221+
return m_OilInfo.ModuleDatabase_OilInfo_Destory();
222+
}
223+
extern "C" bool ModuleDatabase_OilInfo_Query(XENGINE_OILINFO * pSt_OilInfo)
224+
{
225+
return m_OilInfo.ModuleDatabase_OilInfo_Query(pSt_OilInfo);
226+
}
227+
extern "C" bool ModuleDatabase_OilInfo_UPDate(XENGINE_OILINFO * pSt_OilInfo)
228+
{
229+
return m_OilInfo.ModuleDatabase_OilInfo_UPDate(pSt_OilInfo);
209230
}

‎XEngine_Source/XEngine_ModuleProtocol/ModuleProtocol_Define.h‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,30 @@ extern "C" bool ModuleProtocol_Packet_SoftWare(XCHAR* ptszSWInfo, int* pInt_Len)
761761
备注：
762762
*********************************************************************/
763763
extern "C" bool ModuleProtocol_Packet_Machine(XCHAR* ptszMSGBuffer, int* pInt_MSGLen, XENGINE_MACHINEINFO*** pppSt_MachineList, int nListCount);
764+
/********************************************************************
765+
函数名称：ModuleProtocol_Packet_OilInfo
766+
函数功能：油价信息打包函数
767+
参数.一：ptszMsgBuffer
768+
In/Out：Out
769+
类型：字符指针
770+
可空：N
771+
意思：输出打包的数据信息
772+
参数.二：pInt_MsgLen
773+
In/Out：Out
774+
类型：整数型指针
775+
可空：N
776+
意思：输出打包大小
777+
参数.三：pSt_OilInfo
778+
In/Out：In
779+
类型：数据结构指针
780+
可空：N
781+
意思：输入要打包的数据
782+
返回值
783+
类型：逻辑型
784+
意思：是否成功
785+
备注：
786+
*********************************************************************/
787+
extern "C" bool ModuleProtocol_Packet_OilInfo(XCHAR* ptszMSGBuffer, int* pInt_MSGLen, XENGINE_OILINFO* pSt_OilInfo);
764788
/************************************************************************/
765789
/* 导出的协议解析函数 */
766790
/************************************************************************/

‎XEngine_Source/XEngine_ModuleProtocol/ModuleProtocol_Packet/ModuleProtocol_Packet.cpp‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1547,6 +1547,62 @@ bool CModuleProtocol_Packet::ModuleProtocol_Packet_Machine(XCHAR* ptszMSGBuffer,
15471547
return true;
15481548
}
15491549
/********************************************************************
1550+
函数名称：ModuleProtocol_Packet_OilInfo
1551+
函数功能：油价信息打包函数
1552+
参数.一：ptszMsgBuffer
1553+
In/Out：Out
1554+
类型：字符指针
1555+
可空：N
1556+
意思：输出打包的数据信息
1557+
参数.二：pInt_MsgLen
1558+
In/Out：Out
1559+
类型：整数型指针
1560+
可空：N
1561+
意思：输出打包大小
1562+
参数.三：pSt_OilInfo
1563+
In/Out：In
1564+
类型：数据结构指针
1565+
可空：N
1566+
意思：输入要打包的数据
1567+
返回值
1568+
类型：逻辑型
1569+
意思：是否成功
1570+
备注：
1571+
*********************************************************************/
1572+
bool CModuleProtocol_Packet::ModuleProtocol_Packet_OilInfo(XCHAR* ptszMSGBuffer, int* pInt_MSGLen, XENGINE_OILINFO* pSt_OilInfo)
1573+
{
1574+
ModuleProtocol_IsErrorOccur = false;
1575+
1576+
if ((NULL == ptszMSGBuffer) || (NULL == pInt_MSGLen))
1577+
{
1578+
ModuleProtocol_IsErrorOccur = true;
1579+
ModuleProtocol_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PROTOCOL_PACKET_PARAMENT;
1580+
return false;
1581+
}
1582+
Json::Value st_JsonRoot;
1583+
Json::Value st_JsonObject;
1584+
Json::StreamWriterBuilder st_JsonBuilder;
1585+
1586+
st_JsonObject["tszCityStr"] = pSt_OilInfo->tszCityStr;
1587+
st_JsonObject["dlValue0"] = pSt_OilInfo->dlValue0;
1588+
st_JsonObject["dlValue10"] = pSt_OilInfo->dlValue10;
1589+
st_JsonObject["dlValue20"] = pSt_OilInfo->dlValue20;
1590+
st_JsonObject["dlValue35"] = pSt_OilInfo->dlValue35;
1591+
st_JsonObject["dlValue92"] = pSt_OilInfo->dlValue92;
1592+
st_JsonObject["dlValue95"] = pSt_OilInfo->dlValue95;
1593+
st_JsonObject["dlValue98"] = pSt_OilInfo->dlValue98;
1594+
st_JsonObject["tszUPTime"] = pSt_OilInfo->tszUPTime;
1595+
1596+
st_JsonRoot["code"] = 0;
1597+
st_JsonRoot["msg"] = "success";
1598+
st_JsonRoot["data"] = st_JsonObject;
1599+
st_JsonBuilder["emitUTF8"] = true;
1600+
1601+
*pInt_MSGLen = Json::writeString(st_JsonBuilder, st_JsonRoot).length();
1602+
memcpy(ptszMSGBuffer, Json::writeString(st_JsonBuilder, st_JsonRoot).c_str(), *pInt_MSGLen);
1603+
return true;
1604+
}
1605+
/********************************************************************
15501606
函数名称：ModuleProtocol_Packet_P2PLan
15511607
函数功能：响应同步局域网地址列表
15521608
参数.一：ptszMsgBuffer

‎XEngine_Source/XEngine_ModuleProtocol/ModuleProtocol_Packet/ModuleProtocol_Packet.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ class CModuleProtocol_Packet
4444
bool ModuleProtocol_Packet_HardWare(XCHAR* ptszHWInfo, int* pInt_Len);
4545
bool ModuleProtocol_Packet_SoftWare(XCHAR* ptszSWInfo, int* pInt_Len);
4646
bool ModuleProtocol_Packet_Machine(XCHAR* ptszMSGBuffer, int* pInt_MSGLen, XENGINE_MACHINEINFO*** pppSt_MachineList, int nListCount);
47+
bool ModuleProtocol_Packet_OilInfo(XCHAR* ptszMSGBuffer, int* pInt_MSGLen, XENGINE_OILINFO* pSt_OilInfo);
4748
public:
4849
bool ModuleProtocol_Packet_P2PLan(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, XENGINE_P2XPPEER_PROTOCOL*** pppSt_ListClients, int nListCount);
4950
bool ModuleProtocol_Packet_P2PWLan(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, list<XENGINE_P2XPPEER_PROTOCOL>* pStl_ListClients);

‎XEngine_Source/XEngine_ModuleProtocol/XEngine_ModuleProtocol.def‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ EXPORTS
2525
ModuleProtocol_Packet_HardWare
2626
ModuleProtocol_Packet_SoftWare
2727
ModuleProtocol_Packet_Machine
28+
ModuleProtocol_Packet_OilInfo
2829
ModuleProtocol_Packet_P2PLan
2930
ModuleProtocol_Packet_P2PWLan
3031
ModuleProtocol_Packet_P2PWList

‎XEngine_Source/XEngine_ModuleProtocol/XEngine_ModuleProtocol.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<PropertyGroup Label="UserMacros" />
7373
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7474
<LinkIncremental>true</LinkIncremental>
75-
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
75+
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;..\XEngine_ModuleProtocol;$(IncludePath)</IncludePath>
7676
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

0 commit comments

Comments
 (0)