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
bbc5094a
authored
Dec 08, 2023
by
huangjy
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix: 跌倒设备上报数据转换失败问题兼容
parent
14cea1ba
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletions
server-common/src/main/java/com/makeit/module/iot/service/IotProductDeviceService.java
server-common/src/main/java/com/makeit/module/iot/service/IotProductDeviceService.java
View file @
bbc5094a
...
...
@@ -292,7 +292,18 @@ public class IotProductDeviceService extends IotCommonService {
for
(
String
hourRange
:
lastDayHourRange
)
{
String
[]
hourRangeArray
=
hourRange
.
split
(
"~"
);
List
<
DeviceOperationLogEntity
>
deviceOperationLogList
=
getDeviceLogByTimeRange
(
deviceId
,
REPORT_PROPERTY
,
5000
,
hourRangeArray
[
0
],
hourRangeArray
[
1
]);
List
<
DeviceInfoContentFall
>
tempDeviceInfoContentSpaceList
=
StreamUtil
.
map
(
deviceOperationLogList
,
e
->
JsonUtil
.
toObj
((
String
)
e
.
getContent
(),
DeviceInfoContentFall
.
class
));
List
<
DeviceInfoContentFall
>
tempDeviceInfoContentSpaceList
=
Lists
.
newArrayList
();
for
(
DeviceOperationLogEntity
deviceOperationLogEntity
:
deviceOperationLogList
)
{
DeviceInfoContentFall
deviceInfoContentFall
=
null
;
try
{
deviceInfoContentFall
=
JsonUtil
.
toObj
((
String
)
deviceOperationLogEntity
.
getContent
(),
DeviceInfoContentFall
.
class
);
}
catch
(
Exception
e
)
{
log
.
info
(
"跌倒设备上报数据转换失败:{}"
,
e
.
getMessage
());
}
if
(
deviceInfoContentFall
!=
null
)
{
tempDeviceInfoContentSpaceList
.
add
(
deviceInfoContentFall
);
}
}
deviceInfoContentFallList
.
addAll
(
tempDeviceInfoContentSpaceList
);
}
return
deviceInfoContentFallList
;
...
...
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