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
0a3de3cd
authored
Nov 03, 2023
by
huangjy
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix:修复bug
parent
ae53cc08
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletions
server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportDayServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java
View file @
0a3de3cd
...
...
@@ -206,7 +206,7 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
if
(
StringUtils
.
isNotEmpty
(
dto
.
getAttribute
()))
{
PlatDeviceOther
other
=
platDeviceOtherService
.
getOne
(
new
QueryWrapper
<
PlatDeviceOther
>().
lambda
()
.
eq
(
PlatDeviceOther:
:
get
DeviceId
,
db
.
get
Id
()));
.
eq
(
PlatDeviceOther:
:
get
OriDeviceId
,
db
.
getOriDevice
Id
()));
if
(
other
!=
null
)
{
other
.
setAttribute
(
dto
.
getAttribute
());
platDeviceOtherService
.
updateById
(
other
);
...
...
@@ -382,6 +382,13 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
other
.
setOriDeviceId
(
db
.
getOriDeviceId
());
platDeviceOtherService
.
saveOrUpdate
(
other
);
if
(
StringUtils
.
isNotEmpty
(
dto
.
getAttribute
()))
{
// 写入设备
PlatDeviceAttrWechatDTO
platDeviceAttrWechatDTO
=
JSON
.
parseObject
(
dto
.
getAttribute
(),
PlatDeviceAttrWechatDTO
.
class
);
platDeviceAttrWechatDTO
.
setDeviceId
(
db
.
getOriDeviceId
());
editDeviceProperties
(
platDeviceAttrWechatDTO
);
}
}
/**
...
...
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportDayServiceImpl.java
View file @
0a3de3cd
...
...
@@ -463,6 +463,7 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
platDeviceList
.
forEach
(
e
->
{
List
<
PlatDayDurationRecord
>
recordList
=
platDayDurationRecordService
.
list
(
new
QueryWrapper
<
PlatDayDurationRecord
>().
lambda
()
.
eq
(
PlatDayDurationRecord:
:
getDeviceId
,
e
.
getId
())
.
eq
(
StringUtils
.
isNotEmpty
(
platElderIdDTO
.
getElderId
()),
PlatDayDurationRecord:
:
getElderIds
,
platElderIdDTO
.
getElderId
())
.
in
(
PlatDayDurationRecord:
:
getDay
,
StreamUtil
.
map
(
nowList
,
dateTimeFormatter:
:
format
))
);
...
...
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