Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄嘉阳
/
iot-platform-server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
7ce4f686
authored
Oct 10, 2023
by
李小龙
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix: 跌倒雷达需要记录 停留时长
parent
1ff7aafe
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/FallAlarm.java
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatDayDurationRecordServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/FallAlarm.java
View file @
7ce4f686
...
...
@@ -18,6 +18,7 @@ import com.makeit.service.platform.alarm.PlatDayDurationRecordService;
import
com.makeit.utils.AlarmConfigCacheUtil
;
import
com.makeit.utils.AlarmRedisDTO
;
import
com.makeit.utils.DayDurationUtil
;
import
com.makeit.utils.data.convert.BeanDtoVoUtils
;
import
com.makeit.utils.data.convert.JsonUtil
;
import
com.makeit.utils.redis.RedisUtil
;
import
lombok.extern.slf4j.Slf4j
;
...
...
@@ -162,7 +163,9 @@ public class FallAlarm implements IAlarm {
return
;
}
//保存每次进入空间时长
platDayDurationRecordService
.
saveDayDurationRecord
(
platAlarmCheckDTO
,
alarmRedisDTO
);
PlatAlarmCheckDTO
platAlarmCheckDTO_behavior
=
BeanDtoVoUtils
.
convert
(
platAlarmCheckDTO
,
PlatAlarmCheckDTO
.
class
);
platAlarmCheckDTO_behavior
.
setPlatAlarmConfig
(
config
);
platDayDurationRecordService
.
saveDayDurationRecord
(
platAlarmCheckDTO_behavior
,
alarmRedisDTO
);
RedisUtil
.
delete
(
RedisConst
.
ALARM_DEVICE_BEHAVIOR_ID
+
deviceId
);
}
}
...
...
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatDayDurationRecordServiceImpl.java
View file @
7ce4f686
...
...
@@ -62,10 +62,10 @@ implements PlatDayDurationRecordService {
}
List
<
PlatElder
>
platElderList
=
platAlarmCheckDTO
.
getPlatElderList
();
if
(
CollectionUtils
.
isNotEmpty
(
platElderList
)){
platAlarmRecordService
.
getElderListByDeviceId
(
platAlarmCheckDTO
);
platElderList
=
platAlarmCheckDTO
.
getPlatElderList
();
}
//
if(CollectionUtils.isNotEmpty(platElderList)){
//
platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
//
platElderList = platAlarmCheckDTO.getPlatElderList();
//
}
for
(
PlatElder
platElder
:
platElderList
)
{
if
(
StringUtils
.
isBlank
(
platElder
.
getRegionName
())){
continue
;
...
...
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