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
fc39c393
authored
Sep 13, 2023
by
朱淼
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
修改bug
parent
1795325c
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
64 additions
and
2 deletions
server-module/src/main/java/com/makeit/module/controller/space/PlatRoomDynamicDetailController.java
server-service/src/main/java/com/makeit/service/platform/workstation/impl/WorkStationServiceImpl.java
server-service/src/main/resources/mappers/PlatBedMapper.xml
server-module/src/main/java/com/makeit/module/controller/space/PlatRoomDynamicDetailController.java
0 → 100644
View file @
fc39c393
package
com
.
makeit
.
module
.
controller
.
space
;
import
com.makeit.common.response.ApiResponseEntity
;
import
com.makeit.common.response.ApiResponseUtils
;
import
com.makeit.dto.platform.elder.PlatElderIdDTO
;
import
com.makeit.service.platform.elder.PlatElderRealTimeService
;
import
com.makeit.vo.platform.elder.realtime.PlatElderCoordinateVO
;
import
com.makeit.vo.platform.elder.realtime.PlatElderRealTimeBodyVO
;
import
com.makeit.vo.platform.elder.realtime.PlatElderRealTimeHeartRespiratoryVO
;
import
com.makeit.vo.platform.elder.realtime.PlatElderRealTimeNowVO
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.List
;
/**
* Controller
*
* @author zm
* @version 2023/9/8
*/
@Api
(
tags
=
"房间详情"
)
@RestController
@RequestMapping
(
"/plat/room/dynamic/detail"
)
public
class
PlatRoomDynamicDetailController
{
@Autowired
private
PlatElderRealTimeService
platElderRealTimeService
;
@ApiOperation
(
"现在状态"
)
@PostMapping
(
"nowStatus"
)
public
ApiResponseEntity
<
PlatElderRealTimeNowVO
>
nowStatus
(
@RequestBody
PlatElderIdDTO
platElderIdDTO
)
{
return
ApiResponseUtils
.
success
(
platElderRealTimeService
.
nowStatus
(
platElderIdDTO
));
}
@ApiOperation
(
"心率呼吸率"
)
@PostMapping
(
"heartRespiratory"
)
public
ApiResponseEntity
<
PlatElderRealTimeHeartRespiratoryVO
>
heartRespiratory
(
@RequestBody
PlatElderIdDTO
platElderIdDTO
)
{
return
ApiResponseUtils
.
success
(
platElderRealTimeService
.
heartRespiratory
(
platElderIdDTO
));
}
@ApiOperation
(
"体动"
)
@PostMapping
(
"body"
)
public
ApiResponseEntity
<
PlatElderRealTimeBodyVO
>
body
(
@RequestBody
PlatElderIdDTO
platElderIdDTO
)
{
return
ApiResponseUtils
.
success
(
platElderRealTimeService
.
body
(
platElderIdDTO
));
}
@ApiOperation
(
"坐标"
)
@PostMapping
(
"coordinate"
)
public
ApiResponseEntity
<
List
<
PlatElderCoordinateVO
>>
coordinate
(
@RequestBody
PlatElderIdDTO
platElderIdDTO
)
{
return
ApiResponseUtils
.
success
(
platElderRealTimeService
.
coordinate
(
platElderIdDTO
));
}
}
server-service/src/main/java/com/makeit/service/platform/workstation/impl/WorkStationServiceImpl.java
View file @
fc39c393
...
@@ -76,6 +76,9 @@ public class WorkStationServiceImpl implements WorkStationService {
...
@@ -76,6 +76,9 @@ public class WorkStationServiceImpl implements WorkStationService {
.
isNotNull
(
PlatElder:
:
getBedId
)
.
isNotNull
(
PlatElder:
:
getBedId
)
.
in
(
PlatElder:
:
getOrgId
,
dto
.
getOrgIds
()));
.
in
(
PlatElder:
:
getOrgId
,
dto
.
getOrgIds
()));
//今日入住
//空闲床位
//空闲床位
List
<
PlatSpace
>
spaces
=
platSpaceService
.
list
(
new
QueryWrapper
<
PlatSpace
>().
lambda
()
List
<
PlatSpace
>
spaces
=
platSpaceService
.
list
(
new
QueryWrapper
<
PlatSpace
>().
lambda
()
.
in
(
PlatSpace:
:
getOrgId
,
dto
.
getOrgIds
()));
.
in
(
PlatSpace:
:
getOrgId
,
dto
.
getOrgIds
()));
...
...
server-service/src/main/resources/mappers/PlatBedMapper.xml
View file @
fc39c393
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
AND FIND_IN_SET(#{dto.id},pm.space_path)
AND FIND_IN_SET(#{dto.id},pm.space_path)
</if>
</if>
<if
test=
"dto.status != null and dto.status != ''"
>
<if
test=
"dto.status != null and dto.status != ''"
>
AND pb.statu
e
= #{dto.status}
AND pb.statu
s
= #{dto.status}
</if>
</if>
</where>
</where>
</select>
</select>
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
pb.del_flag = 0
pb.del_flag = 0
AND pm.id = #{dto.id}
AND pm.id = #{dto.id}
<if
test=
"dto.status != null and dto.status != ''"
>
<if
test=
"dto.status != null and dto.status != ''"
>
AND pb.statu
e
= #{dto.status}
AND pb.statu
s
= #{dto.status}
</if>
</if>
</where>
</where>
</select>
</select>
...
...
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