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
f7df7f06
authored
Feb 04, 2024
by
罗志长
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix: saas端设备详情固件版本和最后上线时间没有返回
parent
19dddbd5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
0 deletions
server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java
View file @
f7df7f06
...
...
@@ -613,6 +613,17 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
deviceOtherLambdaQueryWrapper
.
eq
(
PlatDeviceOther:
:
getDeviceId
,
platDevice
.
getId
());
PlatDeviceOther
platDeviceOther
=
platDeviceOtherService
.
getOne
(
deviceOtherLambdaQueryWrapper
,
false
);
DeviceDetail
detail
=
iotProductDeviceService
.
getDetail
(
platDevice
.
getOriDeviceId
());
if
(
detail
!=
null
)
{
if
(
detail
.
getFirmwareInfo
()
!=
null
)
{
platDevice
.
setFirmwareVersion
(
detail
.
getFirmwareInfo
().
getVersion
());
}
if
(
detail
.
getOnlineTime
()
!=
0
)
{
platDevice
.
setLastOnlineData
(
LocalDateTime
.
ofEpochSecond
(
detail
.
getOnlineTime
()
/
1000
,
0
,
ZoneOffset
.
ofHours
(
8
)));
}
platDevice
.
setDescription
(
detail
.
getDescription
());
}
PlatDeviceDetailDTO
detailDTO
=
new
PlatDeviceDetailDTO
();
detailDTO
.
setPlatDevice
(
platDevice
);
detailDTO
.
setPlatDeviceOther
(
platDeviceOther
);
...
...
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