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
a36e0f78
authored
Dec 09, 2023
by
汪志阳
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix:修复bug
parent
6e4e7cfe
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
server-service/src/main/java/com/makeit/enums/platform/workstation/PlatAlarmRecordType.java
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatSpaceServiceImpl.java
server-service/src/main/java/com/makeit/enums/platform/workstation/PlatAlarmRecordType.java
View file @
a36e0f78
...
@@ -11,7 +11,7 @@ public enum PlatAlarmRecordType {
...
@@ -11,7 +11,7 @@ public enum PlatAlarmRecordType {
FALL
(
"fall"
,
"长者跌倒"
),
FALL
(
"fall"
,
"长者跌倒"
),
BEHAVIOR
(
"behavior"
,
"行为异常"
),
BEHAVIOR
(
"behavior"
,
"行为异常"
),
OFF_BED
(
"off_bed"
,
"离床
异常
"
);
OFF_BED
(
"off_bed"
,
"离床
告警
"
);
private
final
String
value
;
private
final
String
value
;
private
final
String
name
;
private
final
String
name
;
...
...
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatSpaceServiceImpl.java
View file @
a36e0f78
...
@@ -147,16 +147,22 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
...
@@ -147,16 +147,22 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
}
}
this
.
updateById
(
space
);
this
.
updateById
(
space
);
List
<
String
>
las
e
SpaceIds
=
recursionLastSpaceIds
(
space
.
getId
(),
new
ArrayList
<>());
List
<
String
>
las
t
SpaceIds
=
recursionLastSpaceIds
(
space
.
getId
(),
new
ArrayList
<>());
if
(
CollUtil
.
isEmpty
(
las
e
SpaceIds
))
{
if
(
CollUtil
.
isEmpty
(
las
t
SpaceIds
))
{
return
;
return
;
}
}
List
<
PlatRoom
>
platRoomList
=
platRoomService
.
list
(
Wrappers
.<
PlatRoom
>
lambdaQuery
().
in
(
PlatRoom:
:
getSpaceId
,
las
e
SpaceIds
));
List
<
PlatRoom
>
platRoomList
=
platRoomService
.
list
(
Wrappers
.<
PlatRoom
>
lambdaQuery
().
in
(
PlatRoom:
:
getSpaceId
,
las
t
SpaceIds
));
if
(
CollUtil
.
isEmpty
(
platRoomList
))
{
if
(
CollUtil
.
isEmpty
(
platRoomList
))
{
return
;
return
;
}
}
for
(
PlatRoom
platRoom
:
platRoomList
)
{
for
(
PlatRoom
platRoom
:
platRoomList
)
{
platRoom
.
setSpacePath
(
dto
.
getParentPath
()
+
","
+
space
.
getId
());
String
roomSpacePath
;
if
(
lastSpaceIds
.
get
(
0
).
equals
(
space
.
getId
()))
{
roomSpacePath
=
dto
.
getParentPath
()
+
","
+
String
.
join
(
","
,
lastSpaceIds
);
}
else
{
roomSpacePath
=
dto
.
getParentPath
()
+
","
+
space
.
getId
()
+
","
+
String
.
join
(
","
,
lastSpaceIds
);
}
platRoom
.
setSpacePath
(
roomSpacePath
);
platRoomService
.
updateById
(
platRoom
);
platRoomService
.
updateById
(
platRoom
);
}
}
List
<
String
>
roomIds
=
platRoomList
.
stream
().
map
(
PlatRoom:
:
getId
).
collect
(
Collectors
.
toList
());
List
<
String
>
roomIds
=
platRoomList
.
stream
().
map
(
PlatRoom:
:
getId
).
collect
(
Collectors
.
toList
());
...
...
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