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
9c008e78
Commit
9c008e78
authored
Jul 15, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加启动日志
parent
e7687d8f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
3 deletions
+2
-3
device-manager/src/main/java/com/mortals/xhx/base/system/message/impl/MessageServiceImpl.java
...tals/xhx/base/system/message/impl/MessageServiceImpl.java
+1
-1
device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceMsgComsumerStartedService.java
...n/applicationservice/DeviceMsgComsumerStartedService.java
+1
-1
device-manager/src/main/java/com/mortals/xhx/module/sitestat/web/SitestatController.java
...m/mortals/xhx/module/sitestat/web/SitestatController.java
+0
-1
No files found.
device-manager/src/main/java/com/mortals/xhx/base/system/message/impl/MessageServiceImpl.java
View file @
9c008e78
...
@@ -163,7 +163,7 @@ public class MessageServiceImpl implements MessageService {
...
@@ -163,7 +163,7 @@ public class MessageServiceImpl implements MessageService {
try
{
try
{
Map
<
String
,
String
>
header
=
new
HashMap
<>();
Map
<
String
,
String
>
header
=
new
HashMap
<>();
header
.
put
(
HEADER_CONTENT_TYPE
,
"application/json"
);
header
.
put
(
HEADER_CONTENT_TYPE
,
"application/json"
);
log
.
info
(
"
thirdPartyUrl=>{}
\n reqbody=>{} \n type=>{}"
,
sendUrl
,
JSON
.
toJSONString
(
deviceReqApiReq
),
DeviceMethodEnum
.
getByValue
(
deviceReq
.
getDeviceStatus
()).
getDesc
());
log
.
info
(
"
\n thirdPartyUrl=>{}
\n reqbody=>{} \n type=>{}"
,
sendUrl
,
JSON
.
toJSONString
(
deviceReqApiReq
),
DeviceMethodEnum
.
getByValue
(
deviceReq
.
getDeviceStatus
()).
getDesc
());
resp
=
HttpUtil
.
doPost
(
sendUrl
,
header
,
JSON
.
toJSONString
(
deviceReqApiReq
));
resp
=
HttpUtil
.
doPost
(
sendUrl
,
header
,
JSON
.
toJSONString
(
deviceReqApiReq
));
return
JSON
.
parseObject
(
resp
,
ApiResp
.
class
);
return
JSON
.
parseObject
(
resp
,
ApiResp
.
class
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceMsgComsumerStartedService.java
View file @
9c008e78
...
@@ -164,7 +164,7 @@ public class DeviceMsgComsumerStartedService implements IApplicationStartedServi
...
@@ -164,7 +164,7 @@ public class DeviceMsgComsumerStartedService implements IApplicationStartedServi
boolean
bool
=
false
;
boolean
bool
=
false
;
DeviceEntity
deviceEntity
=
deviceService
.
getExtCache
(
deviceCode
);
DeviceEntity
deviceEntity
=
deviceService
.
getExtCache
(
deviceCode
);
if
(!
ObjectUtils
.
isEmpty
(
deviceEntity
))
{
if
(!
ObjectUtils
.
isEmpty
(
deviceEntity
))
{
cacheService
.
set
nx
(
RedisKey
.
KEY_DEVICE_ONLINE_CACHE
+
deviceEntity
.
getDeviceCode
(),
""
,
GlobalSysInfo
.
getParamIntValue
(
Constant
.
HEARTBEAT_TIMEOUT
,
120
));
cacheService
.
set
(
RedisKey
.
KEY_DEVICE_ONLINE_CACHE
+
deviceEntity
.
getDeviceCode
(),
""
,
GlobalSysInfo
.
getParamIntValue
(
Constant
.
HEARTBEAT_TIMEOUT
,
120
));
if
(
deviceEntity
.
getDeviceStatus
()
==
DeviceStatusEnum
.
离线
.
getValue
())
{
if
(
deviceEntity
.
getDeviceStatus
()
==
DeviceStatusEnum
.
离线
.
getValue
())
{
bool
=
true
;
bool
=
true
;
}
}
...
...
device-manager/src/main/java/com/mortals/xhx/module/sitestat/web/SitestatController.java
View file @
9c008e78
...
@@ -87,7 +87,6 @@ public class SitestatController extends BaseCRUDJsonBodyMappingController<Sitest
...
@@ -87,7 +87,6 @@ public class SitestatController extends BaseCRUDJsonBodyMappingController<Sitest
@GetMapping
(
value
=
"siteTree"
)
@GetMapping
(
value
=
"siteTree"
)
public
String
siteTree
()
{
public
String
siteTree
()
{
JSONObject
jsonObject
=
new
JSONObject
();
JSONObject
jsonObject
=
new
JSONObject
();
String
busiDesc
=
this
.
getModuleDesc
()
+
"构建站点树"
;
try
{
try
{
String
siteTree
=
this
.
service
.
getSiteTree
(
getContext
());
String
siteTree
=
this
.
service
.
getSiteTree
(
getContext
());
return
siteTree
;
return
siteTree
;
...
...
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