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
01088527
Commit
01088527
authored
Jun 16, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修正redis 最大连接数
parent
dd6f316b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
87 additions
and
82 deletions
+87
-82
device-manager/src/main/java/com/mortals/xhx/daemon/task/DeviceTotalStatTaskImpl.java
.../com/mortals/xhx/daemon/task/DeviceTotalStatTaskImpl.java
+4
-0
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceStatServiceImpl.java
...xhx/module/device/service/impl/DeviceStatServiceImpl.java
+83
-82
No files found.
device-manager/src/main/java/com/mortals/xhx/daemon/task/DeviceTotalStatTaskImpl.java
View file @
01088527
...
...
@@ -54,6 +54,10 @@ public class DeviceTotalStatTaskImpl implements ITaskExcuteService {
}
else
if
(
platFormType
.
equalsIgnoreCase
(
PlatformTypeEnum
.
STANDALONE
.
getValue
()))
{
List
<
SiteEntity
>
siteEntities
=
siteService
.
find
(
new
SiteQuery
());
for
(
SiteEntity
siteEntity
:
siteEntities
)
{
//判断如果当前节点无设备 则不统计
deviceStatService
.
deviceStat
(
siteEntity
.
getId
(),
null
);
}
}
...
...
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceStatServiceImpl.java
View file @
01088527
...
...
@@ -162,6 +162,7 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao
deviceStatEntity
.
setDay
(
calendar
.
get
(
Calendar
.
DAY_OF_MONTH
));
}
//获取昨天统计数据
DeviceStatEntity
yesterdayDeviceStat
=
this
.
selectOne
(
new
DeviceStatQuery
()
.
siteId
(
siteId
)
...
...
@@ -179,7 +180,7 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao
//获取设备总数
List
<
DeviceEntity
>
deviceList
=
deviceService
.
find
(
new
DeviceQuery
().
siteId
(
siteId
));
Integer
deviceTotalCount
=
deviceList
.
size
();
if
(
deviceTotalCount
>
0
)
{
//未激活数量
Long
deviceUnActiveCount
=
deviceList
.
parallelStream
()
.
filter
(
f
->
f
.
getDeviceStatus
()
==
DeviceStatusEnum
.
未激活
.
getValue
())
...
...
@@ -257,7 +258,7 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao
alarmSmsSendQuery
.
setSendTimeEnd
(
DateUtils
.
getCurrStrDate
());
alarmSmsSendQuery
.
setSendStatus
(
SendStatusEnum
.
发送成功
.
getValue
());
int
pushTotalCount
=
alarmSmsSendService
.
count
(
alarmSmsSendQuery
,
null
);
int
pushTotalCount
=
alarmSmsSendService
.
count
(
alarmSmsSendQuery
,
null
);
deviceStatEntity
.
setPushTotalCount
(
pushTotalCount
);
deviceStatEntity
.
setPushAddCount
(
pushTotalCount
-
yesterdayDeviceStat
.
getPushTotalCount
());
...
...
@@ -272,7 +273,7 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao
deviceStatEntity
.
setUploadMessageTotalCount
(
uploadMessageTotalCount
);
deviceStatEntity
.
setDownloadMessageTotalCount
(
downloadMessageTotalCount
);
deviceStatEntity
.
setSiteId
(
siteId
);
}
if
(
deviceStatEntity
.
newEntity
())
{
deviceStatEntity
.
setCreateTime
(
new
Date
());
deviceStatService
.
save
(
deviceStatEntity
);
...
...
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