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
7c597757
Commit
7c597757
authored
Jun 19, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加设备上线和下线的业务日志记录
parent
c79401b3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
device-manager/src/main/java/com/mortals/xhx/module/sitestat/service/impl/SitestatServiceImpl.java
...xhx/module/sitestat/service/impl/SitestatServiceImpl.java
+4
-5
No files found.
device-manager/src/main/java/com/mortals/xhx/module/sitestat/service/impl/SitestatServiceImpl.java
View file @
7c597757
...
@@ -230,14 +230,13 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
...
@@ -230,14 +230,13 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
if
(!
ObjectUtils
.
isEmpty
(
token
))
{
if
(!
ObjectUtils
.
isEmpty
(
token
))
{
String
resp
=
siteFeign
.
siteTree
(
token
);
String
resp
=
siteFeign
.
siteTree
(
token
);
Rest
<
Rest
<
String
>>
rest
=
JSON
.
parseObject
(
resp
,
new
TypeReference
<
Rest
<
Rest
<
String
>
>>()
{
Rest
<
String
>
rest
=
JSON
.
parseObject
(
resp
,
new
TypeReference
<
Rest
<
String
>>()
{
});
});
if
(
rest
.
getCode
()==
YesNoEnum
.
YES
.
getValue
()){
if
(
rest
.
getCode
()==
YesNoEnum
.
YES
.
getValue
()){
String
siteTreeSelectStr
=
rest
.
getData
()
.
getData
()
;
String
siteTreeSelectStr
=
rest
.
getData
();
// Rest<String> restSite = JSON.parseObject(siteTreeSelectStr, new TypeReference<Rest<String>>() {
JSONObject
json
=
JSON
.
parseObject
(
siteTreeSelectStr
);
// }
);
JSONArray
jsonArray
=
json
.
getJSONArray
(
"siteTree"
);
JSONArray
jsonArray
=
JSON
.
parseArray
(
siteTreeSelectStr
);
if
(
ObjectUtils
.
isEmpty
(
jsonArray
))
{
if
(
ObjectUtils
.
isEmpty
(
jsonArray
))
{
jsonObject
.
put
(
KEY_RESULT_DATA
,
new
JSONArray
());
jsonObject
.
put
(
KEY_RESULT_DATA
,
new
JSONArray
());
jsonObject
.
put
(
KEY_RESULT_CODE
,
VALUE_RESULT_SUCCESS
);
jsonObject
.
put
(
KEY_RESULT_CODE
,
VALUE_RESULT_SUCCESS
);
...
...
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