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
36be6422
authored
Sep 28, 2023
by
朱淼
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix bug
parent
28e2f994
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatSpaceServiceImpl.java
server-service/src/main/java/com/makeit/vo/platform/space/PlatBedPanoramaVO.java
server-service/src/main/resources/mappers/PlatBedMapper.xml
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatSpaceServiceImpl.java
View file @
36be6422
...
@@ -459,6 +459,7 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
...
@@ -459,6 +459,7 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
spacePath
=
firstId
;
spacePath
=
firstId
;
}
else
{
}
else
{
firstId
=
firstSpaceNameMap
.
get
(
item
.
getCommunity
());
firstId
=
firstSpaceNameMap
.
get
(
item
.
getCommunity
());
spacePath
=
firstId
;
}
}
//第二层级
//第二层级
...
...
server-service/src/main/java/com/makeit/vo/platform/space/PlatBedPanoramaVO.java
View file @
36be6422
...
@@ -21,6 +21,9 @@ public class PlatBedPanoramaVO extends BaseIdDTO {
...
@@ -21,6 +21,9 @@ public class PlatBedPanoramaVO extends BaseIdDTO {
@ApiModelProperty
(
"全路径名称"
)
@ApiModelProperty
(
"全路径名称"
)
private
String
spacePathName
;
private
String
spacePathName
;
@ApiModelProperty
(
"房间id"
)
private
String
roomId
;
@ApiModelProperty
(
"房间名称"
)
@ApiModelProperty
(
"房间名称"
)
private
String
roomName
;
private
String
roomName
;
...
...
server-service/src/main/resources/mappers/PlatBedMapper.xml
View file @
36be6422
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.makeit.mapper.platform.space.PlatBedMapper"
>
<mapper
namespace=
"com.makeit.mapper.platform.space.PlatBedMapper"
>
<select
id=
"selectBySpaceIdAndStatus"
resultType=
"com.makeit.vo.platform.space.PlatBedPanoramaVO"
>
<select
id=
"selectBySpaceIdAndStatus"
resultType=
"com.makeit.vo.platform.space.PlatBedPanoramaVO"
>
SELECT pb.id,pb.`status`,pb.name bedName ,pm.`name` roomName,pm.space_path,pe.name as elderName,pe.id as elderId
SELECT pb.id,pb.`status`,pb.name bedName ,pm.`name` roomName,pm.space_path,pe.name as elderName,pe.id as elderId
,pm.id as roomId
FROM `plat_bed` pb
FROM `plat_bed` pb
LEFT JOIN plat_room pm on pb.room_id = pm.id
LEFT JOIN plat_room pm on pb.room_id = pm.id
LEFT JOIN plat_elder pe on pe.bed_id = pb.id
LEFT JOIN plat_elder pe on pe.bed_id = pb.id
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
</select>
</select>
<select
id=
"selectByRoomIdAndStatus"
resultType=
"com.makeit.vo.platform.space.PlatBedPanoramaVO"
>
<select
id=
"selectByRoomIdAndStatus"
resultType=
"com.makeit.vo.platform.space.PlatBedPanoramaVO"
>
SELECT pb.id,pb.`status`,pb.name bedName ,pm.`name` roomName,pm.space_path,pe.name as elderName,pe.id as elderId
SELECT pb.id,pb.`status`,pb.name bedName ,pm.`name` roomName,pm.space_path,pe.name as elderName,pe.id as elderId
,pm.id as roomId
FROM `plat_bed` pb
FROM `plat_bed` pb
LEFT JOIN plat_room pm on pb.room_id = pm.id
LEFT JOIN plat_room pm on pb.room_id = pm.id
LEFT JOIN plat_elder pe on pe.bed_id = pb.id and pe.del_flag = 0
LEFT JOIN plat_elder pe on pe.bed_id = pb.id and pe.del_flag = 0
...
...
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