From aa2afbc3a63030ff81e6a7a3d0737d6c8d304c97 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期日, 01 九月 2024 12:29:36 +0800
Subject: [PATCH] 逻辑顺序调整
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 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 72834a7..bd488c9 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
@@ -1,24 +1,24 @@
package cn.lihu.jh.module.ecg.service.room;
-import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomPageReqVO;
-import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomSaveReqVO;
+import java.util.*;
+import javax.annotation.Resource;
+
+import cn.lihu.jh.framework.common.pojo.PageResult;
+import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomRespVO;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
-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.system.api.oauth2.OAuth2TokenApi;
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.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.RoomStatisticsDO;
+import cn.lihu.jh.module.ecg.dal.mysql.room.RoomMapper;
+import cn.lihu.jh.module.ecg.enums.BedStatusEnum;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
-
-import javax.annotation.Resource;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.ROOM_NOT_EXISTS;
-
/**
* 璇婂鍜岃瘖鐤楀簥 Service 瀹炵幇绫�
@@ -31,6 +31,9 @@
@Resource
private RoomMapper roomMapper;
+
+ @Resource
+ private OAuth2TokenApi oAuth2TokenApi;
@Override
public Integer createRoom(RoomSaveReqVO createReqVO) {
@@ -81,6 +84,24 @@
@Override
public List<RoomDO> simpleRoomList() {
- return roomMapper.simpleRoomList();
+ List<BedStatusEnum> bedStatusEnumList = new ArrayList<BedStatusEnum>();
+ bedStatusEnumList.add(BedStatusEnum.OPENING);
+ bedStatusEnumList.add(BedStatusEnum.DOCTOR_ON);
+ bedStatusEnumList.add(BedStatusEnum.PAUSE);
+ return roomMapper.simpleRoomList(bedStatusEnumList);
+ }
+
+ @Override
+ public void resetRoom() {
+ List<BedStatusEnum> bedStatusEnumList = new ArrayList<BedStatusEnum>();
+ bedStatusEnumList.add(BedStatusEnum.DOCTOR_ON);
+ bedStatusEnumList.add(BedStatusEnum.PAUSE);
+ List<RoomDO> roomDOList = roomMapper.simpleRoomList(bedStatusEnumList);
+
+ Integer ret = roomMapper.resetRoom(BedStatusEnum.CLOSED.getStatus());
+
+ //
+ List<Long> userIdList = roomDOList.stream().map(roomDO -> roomDO.getDocId()).toList();
+ oAuth2TokenApi.tick(userIdList);
}
}
\ No newline at end of file
--
Gitblit v1.9.3