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
b674619f
authored
Mar 14, 2024
by
罗志长
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix: 区域设置重复添加
parent
951cc5a0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
0 deletions
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRegionSettingServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRegionSettingServiceImpl.java
View file @
b674619f
...
@@ -71,7 +71,12 @@ public class PlatRegionSettingServiceImpl extends ServiceImpl<PlatRegionSettingM
...
@@ -71,7 +71,12 @@ public class PlatRegionSettingServiceImpl extends ServiceImpl<PlatRegionSettingM
platDeviceOthers
=
platDeviceOthers
.
stream
().
filter
(
platDeviceOther
->
StringUtils
.
isNotEmpty
(
platDeviceOther
.
getAttribute
())).
collect
(
Collectors
.
toList
());
platDeviceOthers
=
platDeviceOthers
.
stream
().
filter
(
platDeviceOther
->
StringUtils
.
isNotEmpty
(
platDeviceOther
.
getAttribute
())).
collect
(
Collectors
.
toList
());
Map
<
String
,
String
>
map
=
platDeviceOthers
.
stream
().
collect
(
Collectors
.
toMap
(
PlatDeviceOther:
:
getDeviceId
,
PlatDeviceOther:
:
getAttribute
));
Map
<
String
,
String
>
map
=
platDeviceOthers
.
stream
().
collect
(
Collectors
.
toMap
(
PlatDeviceOther:
:
getDeviceId
,
PlatDeviceOther:
:
getAttribute
));
List
<
PlatRegionSetting
>
list
=
new
ArrayList
<>();
List
<
PlatRegionSetting
>
list
=
new
ArrayList
<>();
List
<
PlatRegionSetting
>
settings
=
list
(
new
QueryWrapper
<
PlatRegionSetting
>().
lambda
().
eq
(
PlatRegionSetting:
:
getRoomId
,
roomId
).
in
(
PlatRegionSetting:
:
getDeviceId
,
listDeviceId
));
Map
<
String
,
PlatRegionSetting
>
settingMap
=
settings
.
stream
().
collect
(
Collectors
.
toMap
(
PlatRegionSetting:
:
getDeviceId
,
Function
.
identity
(),
(
k1
,
k2
)
->
k1
));
for
(
String
item
:
listDeviceId
)
{
for
(
String
item
:
listDeviceId
)
{
if
(
settingMap
.
containsKey
(
item
))
{
continue
;
}
PlatRegionSetting
platRegionSetting
=
new
PlatRegionSetting
();
PlatRegionSetting
platRegionSetting
=
new
PlatRegionSetting
();
platRegionSetting
.
setDeviceId
(
item
);
platRegionSetting
.
setDeviceId
(
item
);
platRegionSetting
.
setRoomId
(
roomId
);
platRegionSetting
.
setRoomId
(
roomId
);
...
...
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