From 612127d7830372cda153b4af4a41c5e3b9f7e4f0 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 29 八月 2024 18:28:32 +0800
Subject: [PATCH] update job scheduler
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java | 54 ++++++++++++++++++++++++++++++------------------------
1 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java
index fe1f1d8..483972c 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java
@@ -1,39 +1,34 @@
package cn.lihu.jh.module.ecg.controller.admin.room;
-import cn.lihu.jh.framework.common.enums.CommonStatusEnum;
-import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomPageReqVO;
-import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomRespVO;
-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.service.room.RoomService;
-import cn.lihu.jh.module.system.api.dept.DeptApi;
-import cn.lihu.jh.module.system.api.dept.dto.DeptRespDTO;
-import org.springframework.web.bind.annotation.*;
+import java.util.*;
+import java.io.IOException;
+import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
+import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
-import java.util.*;
-import java.io.IOException;
-import java.util.stream.Collectors;
-
+import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomPageReqVO;
+import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomRespVO;
+import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomSaveReqVO;
+import cn.lihu.jh.module.ecg.service.room.RoomService;
+import cn.lihu.jh.module.system.api.dept.DeptApi;
+import cn.lihu.jh.module.system.api.dept.dto.DeptRespDTO;
import cn.lihu.jh.framework.common.pojo.PageParam;
import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.common.pojo.CommonResult;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
-import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
-
import cn.lihu.jh.framework.excel.core.util.ExcelUtils;
-
import cn.lihu.jh.framework.apilog.core.annotation.ApiAccessLog;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
+import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
import static cn.lihu.jh.framework.apilog.core.enums.OperateTypeEnum.*;
@@ -136,7 +131,7 @@
@GetMapping(value = {"/list-all-bed"})
@Operation(summary = "鑾峰彇璇婂簥鍒楄〃", description = "涓昏鐢ㄤ簬鍓嶇鐨勫紑璇婄鐞�")
- public CommonResult<Map<Long, List<RoomRespVO>>> getAllBedMap() {
+ public CommonResult<Map<String, List<RoomRespVO>>> getAllBedMap() {
RoomPageReqVO pageReqVO = new RoomPageReqVO();
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
@@ -144,14 +139,25 @@
List<RoomRespVO> list2 = BeanUtils.toBean(list, RoomRespVO.class);
- Map<Long, List<RoomRespVO>> map = list2.stream().collect(Collectors.groupingBy(RoomRespVO::getRoomId));
+ Map<String, List<RoomRespVO>> map = list2.stream().collect(Collectors.groupingBy(RoomRespVO::getRoomName));
return success(map);
}
@GetMapping(value = {"/list-simple-room"})
@Operation(summary = "鑾峰彇闂ㄨ瘖瀹ゅ垪琛�", description = "涓昏鐢ㄤ簬鍓嶇鐨勮瘖瀹ら�夋嫨")
- public CommonResult<List<RoomRespVO>> getSimpleRoomList() {
+ public CommonResult<Map<String, List<RoomRespVO>>> getSimpleRoomList() {
List<RoomDO> list = roomService.simpleRoomList();
- return success(BeanUtils.toBean(list, RoomRespVO.class));
+ List<RoomRespVO> list2 = BeanUtils.toBean(list, RoomRespVO.class);
+
+ Map<String, List<RoomRespVO>> map = list2.stream().collect(Collectors.groupingBy(RoomRespVO::getRoomName));
+ return success(map);
}
+
+ @GetMapping(value = {"/reset-room"})
+ @Operation(summary = "閲嶇疆闂ㄨ瘖瀹�", description = "涓昏鐢ㄤ簬姣忓ぉ鍏抽棴宸ヤ綅")
+ public CommonResult<String> resetRoom() {
+ roomService.resetRoom();
+ return success("reset room ok");
+ }
+
}
--
Gitblit v1.9.3