From cce9d33e6c03ab48fb22c62fe5de3d1e902c598f Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 28 八月 2024 14:25:51 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java
index eca84c3..f630467 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java
@@ -2,16 +2,15 @@
import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomPageReqVO;
import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomSaveReqVO;
-import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
+import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomResVO;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomStatisticsDO;
import cn.lihu.jh.module.ecg.dal.mysql.room.RoomMapper;
+import cn.lihu.jh.module.ecg.enums.BedStatusEnum;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import cn.lihu.jh.framework.common.pojo.PageResult;
-import cn.lihu.jh.framework.common.pojo.PageParam;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
import javax.annotation.Resource;
@@ -35,7 +34,7 @@
@Override
public Integer createRoom(RoomSaveReqVO createReqVO) {
// 鎻掑叆
- RoomDO room = BeanUtils.toBean(createReqVO, RoomDO.class);
+ RoomResVO room = BeanUtils.toBean(createReqVO, RoomResVO.class);
roomMapper.insert(room);
// 杩斿洖
return room.getId();
@@ -46,7 +45,7 @@
// 鏍￠獙瀛樺湪
validateRoomExists(updateReqVO.getId());
// 鏇存柊
- RoomDO updateObj = BeanUtils.toBean(updateReqVO, RoomDO.class);
+ RoomResVO updateObj = BeanUtils.toBean(updateReqVO, RoomResVO.class);
roomMapper.updateById(updateObj);
}
@@ -65,12 +64,12 @@
}
@Override
- public RoomDO getRoom(Integer id) {
+ public RoomResVO getRoom(Integer id) {
return roomMapper.selectById(id);
}
@Override
- public PageResult<RoomDO> getRoomPage(RoomPageReqVO pageReqVO) {
+ public PageResult<RoomResVO> getRoomPage(RoomPageReqVO pageReqVO) {
return roomMapper.selectPage(pageReqVO);
}
@@ -78,4 +77,13 @@
public List<RoomStatisticsDO> roomStatistics() {
return roomMapper.roomStatistic();
}
+
+ @Override
+ public List<RoomResVO> simpleRoomList() {
+ List<BedStatusEnum> bedStatusEnumList = new ArrayList<BedStatusEnum>();
+ bedStatusEnumList.add(BedStatusEnum.OPENING);
+ bedStatusEnumList.add(BedStatusEnum.DOCTOR_ON);
+ bedStatusEnumList.add(BedStatusEnum.PAUSE);
+ return roomMapper.simpleRoomList(bedStatusEnumList);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3