Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
device-new-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
device-new-platform
Commits
47457c03
Commit
47457c03
authored
Mar 24, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改校验
parent
ba56485c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
19 deletions
+5
-19
device-manager/src/main/java/com/mortals/xhx/thread/DeviceDownMsgThread.java
...main/java/com/mortals/xhx/thread/DeviceDownMsgThread.java
+1
-4
device-manager/src/main/java/com/mortals/xhx/thread/SendThirdPartyThread.java
...ain/java/com/mortals/xhx/thread/SendThirdPartyThread.java
+4
-15
No files found.
device-manager/src/main/java/com/mortals/xhx/thread/DeviceDownMsgThread.java
View file @
47457c03
...
...
@@ -60,7 +60,7 @@ public class DeviceDownMsgThread extends AbstractThread {
@Override
protected
void
process
()
{
//
log.info("DeviceDownMsgThread process");
log
.
info
(
"DeviceDownMsgThread process"
);
List
<
DeviceMsgReq
>
deviceMsgReqs
=
new
ArrayList
<>();
while
(
true
)
{
DeviceMsgReq
deviceMsgReq
=
cacheService
.
lpop
(
KEY_DEVICE_DOWN_MSG_QUEUE
,
DeviceMsgReq
.
class
);
...
...
@@ -124,9 +124,6 @@ public class DeviceDownMsgThread extends AbstractThread {
@Override
protected
void
threadClosed
()
{
// TODO Auto-generated method stub
super
.
close
();
}
}
device-manager/src/main/java/com/mortals/xhx/thread/SendThirdPartyThread.java
View file @
47457c03
...
...
@@ -60,23 +60,12 @@ public class SendThirdPartyThread extends AbstractThread {
deviceMsgReqs
.
add
(
deviceReq
);
}
if
(!
ObjectUtils
.
isEmpty
(
deviceMsgReqs
))
{
// DeviceReq deviceReq = cacheService.lpop(KEY_DEVICE_THIRDPARTY_QUEUE, DeviceReq.class);
if
(!
ObjectUtils
.
isEmpty
(
deviceMsgReqs
))
{
for
(
DeviceReq
deviceMsgReq
:
deviceMsgReqs
)
{
//设备上下线信息 不更新通知
/* if (DeviceMethodEnum.ONLINE.getValue() == deviceMsgReq.getDeviceStatus() || DeviceMethodEnum.OFFLINE.getValue() == deviceMsgReq.getDeviceStatus()) {
return;
}*/
//deviceReq.getReceiveMethod()
String
phpInUrl
=
GlobalSysInfo
.
getParamValue
(
PARAM_SERVER_PHP_IN_HTTP_URL
,
"http://127.0.0.1:11078/zwfw_api"
);
ApiResp
<
String
>
resp
=
messageService
.
sendThirdParty
(
UrlBuilder
.
of
(
phpInUrl
).
addPath
(
thirdPartyPath
).
build
(),
deviceMsgReq
);
log
.
info
(
"sendThirty req==>deviceCode:{} TYPE:{} \n resp ==>{}"
,
deviceMsgReq
.
getDeviceCode
(),
DeviceMethodEnum
.
getByValue
(
deviceMsgReq
.
getDeviceStatus
()).
getDesc
(),
JSON
.
toJSONString
(
resp
));
log
.
info
(
"sendThirty req==>deviceCode:{} TYPE:{} \n resp ==>{}"
,
deviceMsgReq
.
getDeviceCode
(),
DeviceMethodEnum
.
getByValue
(
deviceMsgReq
.
getDeviceStatus
()).
getDesc
(),
JSON
.
toJSONString
(
resp
));
}
}
}
}
...
...
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