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
4cd314a7
Commit
4cd314a7
authored
Jun 19, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加设备上线和下线的业务日志记录
parent
70f8f6ee
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
device-manager/src/main/java/com/mortals/xhx/module/site/model/SiteTreeSelect.java
...ava/com/mortals/xhx/module/site/model/SiteTreeSelect.java
+2
-0
device-manager/src/main/java/com/mortals/xhx/module/sitestat/service/impl/SitestatServiceImpl.java
...xhx/module/sitestat/service/impl/SitestatServiceImpl.java
+1
-1
No files found.
device-manager/src/main/java/com/mortals/xhx/module/site/model/SiteTreeSelect.java
View file @
4cd314a7
...
...
@@ -217,6 +217,8 @@ public class SiteTreeSelect implements Serializable {
Rest
<
Integer
>
rest
=
siteFeign
.
countSitesByArea
(
sitePdu
);
if
(
rest
.
getCode
()
==
YesNoEnum
.
YES
.
getValue
())
{
node
.
setSiteCount
(
rest
.
getData
());
}
else
{
}
JSONArray
jsonArray
=
jsonObject
.
getJSONArray
(
"children"
);
List
<
SiteTreeSelect
>
children
=
new
ArrayList
<>();
...
...
device-manager/src/main/java/com/mortals/xhx/module/sitestat/service/impl/SitestatServiceImpl.java
View file @
4cd314a7
...
...
@@ -246,7 +246,7 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
SiteTreeSelect
siteTreeSelect
=
JSON
.
parseObject
(
item
.
toString
(),
SiteTreeSelect
.
class
);
return
siteTreeSelect
;
}).
collect
(
Collectors
.
toList
());
model
.
put
(
"siteTree"
,
JSON
.
toJSONString
(
collect
)
);
model
.
put
(
KEY_RESULT_DATA
,
collect
);
jsonObject
.
put
(
KEY_RESULT_DATA
,
model
);
jsonObject
.
put
(
KEY_RESULT_CODE
,
VALUE_RESULT_SUCCESS
);
return
jsonObject
.
toJSONString
();
...
...
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