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
88897a99
Commit
88897a99
authored
May 06, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加告警统计信息
parent
ee9d4ab9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceAlarmInfoServiceImpl.java
...odule/device/service/impl/DeviceAlarmInfoServiceImpl.java
+1
-1
device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http
.../java/com/mortals/httpclient/device/DeviceController.http
+9
-0
No files found.
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceAlarmInfoServiceImpl.java
View file @
88897a99
...
...
@@ -92,7 +92,7 @@ public class DeviceAlarmInfoServiceImpl extends AbstractCRUDServiceImpl<DeviceAl
Map
<
String
,
Long
>
siteDeviceAlarmCollect
=
deviceAlarmInfoList
.
parallelStream
().
distinct
().
collect
(
groupingBy
(
x
->
x
.
getSiteId
(),
counting
()))
.
entrySet
().
stream
().
sorted
(
Map
.
Entry
.
comparingByValue
(
Comparator
.
reverseOrder
()))
.
collect
(
Collectors
.
toMap
(
x
->
siteMap
.
get
(
x
).
getSiteName
(),
x
->
siteMap
.
get
(
x
)
==
null
?
"未知站点"
:
siteMap
.
get
(
x
)
.
getSiteName
(),
Map
.
Entry
::
getValue
,
(
oldVal
,
newVal
)
->
oldVal
));
deviceAlarmInfo
.
setSiteDeviceAlarmCollect
(
siteDeviceAlarmCollect
);
...
...
device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http
View file @
88897a99
...
...
@@ -56,6 +56,15 @@ Content-Type: application/json
}
###设备告警统计查看
POST {{baseUrl}}/device/alarm/info/stats
Accept: application/json
Content-Type: application/json
{
"siteId": 1
}
###设备编辑
GET {{baseUrl}}/device/edit?id={{Device_id}}
...
...
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