Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
familyMart_takeaway
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guanghui.cui
familyMart_takeaway
Commits
2cd195a1
Commit
2cd195a1
authored
Mar 23, 2018
by
guanghui.cui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
单实例运行
parent
97499271
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
2 deletions
+11
-2
base/BaseDefine.h
+1
-0
src/JsonModule.cpp
+1
-1
src/SocketModule.h
+1
-0
src/main.cpp
+8
-1
No files found.
base/BaseDefine.h
View file @
2cd195a1
...
...
@@ -93,6 +93,7 @@
//推送类型
#define ODS_PUSH_TYPE_HEARTBEAT 3 //心跳
#define ODS_PUSH_TYPE_ORDER 1001 //订单
#define ODS_PUSH_TYPE_STOCKWARN 1006 //库存预警
#define ODS_PUSH_TYPE_COMMON 1017 //通用预警
#define ODS_PUSH_TYPE_COMMON_BACK 1018 //通用预警返回
...
...
src/JsonModule.cpp
View file @
2cd195a1
...
...
@@ -728,7 +728,7 @@ bool JsonModule::convertDataOds2Pos(const std::string &data, std::string &result
else
if
(
pushType
==
ODS_PUSH_TYPE_COMMON
){
result
=
_convertToCommonWarnJson
(
data
.
c_str
());
}
else
{
else
if
(
pushType
==
ODS_PUSH_TYPE_ORDER
)
{
orderObj
order
;
rlt
=
getPushOrders
(
data
.
c_str
(),
order
);
...
...
src/SocketModule.h
View file @
2cd195a1
...
...
@@ -57,6 +57,7 @@ public:
void
setSocketTimeout
(
int
timeout
);
bool
isValid
(){
return
m_bValid
;
}
bool
setValid
(
bool
valid
){
m_bValid
=
valid
;
}
private
:
bool
m_bValid
;
};
...
...
src/main.cpp
View file @
2cd195a1
...
...
@@ -52,7 +52,8 @@ void* listen_pos_func(void* arg)
LOG
(
INFO
)
<<
"local listen port: ["
<<
client_listen_port
<<
"] successful"
;
}
else
{
LOG
(
INFO
)
<<
"local listen port: ["
<<
client_listen_port
<<
"] failed"
;
LOG
(
INFO
)
<<
"local listen port: ["
<<
client_listen_port
<<
"] failed, maybe instance is exist,exit!!!"
;
exit
(
1
);
}
while
(
true
)
...
...
@@ -330,6 +331,12 @@ int main()
bool
rlt
=
ods
.
send
(
responseData
);
LOG
(
INFO
)
<<
"send result:"
<<
rlt
;
}
else
{
if
(
!
bInitDone
){
ods
.
setValid
(
false
);
LOG
(
INFO
)
<<
"maybe pos restart,reconnect!!!"
;
}
}
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment