From e10ff52c2bbb86eac5b2c4bdf12b852912a1f798 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期三, 28 八月 2024 14:44:12 +0800 Subject: [PATCH] update --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java | 3 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java | 44 ++++++-------- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 28 ++++----- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java | 30 +++++----- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java | 32 +++++----- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueService.java | 7 +- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomService.java | 10 +- 7 files changed, 73 insertions(+), 81 deletions(-) diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java index f9edf00..df66cb0 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java @@ -3,7 +3,6 @@ import cn.lihu.jh.framework.common.exception.ErrorCode; import cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils; import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomRespVO; -import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomResVO; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; @@ -40,7 +39,7 @@ @RestController @RequestMapping("/ecg/queue") @Validated -public class queueController { +public class QueueController { @Resource private QueueService queueService; 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 92c5998..f23ac57 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,38 +1,34 @@ package cn.lihu.jh.module.ecg.controller.admin.room; -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.RoomResVO; -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.*; @@ -77,7 +73,7 @@ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('clinic:room:query')") public CommonResult<RoomRespVO> getRoom(@RequestParam("id") Integer id) { - RoomResVO room = roomService.getRoom(id); + RoomDO room = roomService.getRoom(id); return success(BeanUtils.toBean(room, RoomRespVO.class)); } @@ -85,7 +81,7 @@ @Operation(summary = "鑾峰緱璇婂鍜岃瘖鐤楀簥鍒嗛〉") @PreAuthorize("@ss.hasPermission('clinic:room:query')") public CommonResult<PageResult<RoomRespVO>> getRoomPage(@Valid RoomPageReqVO pageReqVO) { - PageResult<RoomResVO> pageResult = roomService.getRoomPage(pageReqVO); + PageResult<RoomDO> pageResult = roomService.getRoomPage(pageReqVO); return success(BeanUtils.toBean(pageResult, RoomRespVO.class)); } @@ -96,7 +92,7 @@ public void exportRoomExcel(@Valid RoomPageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List<RoomResVO> list = roomService.getRoomPage(pageReqVO).getList(); + List<RoomDO> list = roomService.getRoomPage(pageReqVO).getList(); // 瀵煎嚭 Excel ExcelUtils.write(response, "璇婂鍜岃瘖鐤楀簥.xls", "鏁版嵁", RoomRespVO.class, BeanUtils.toBean(list, RoomRespVO.class)); @@ -139,7 +135,7 @@ RoomPageReqVO pageReqVO = new RoomPageReqVO(); pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List<RoomResVO> list = roomService.getRoomPage(pageReqVO).getList(); + List<RoomDO> list = roomService.getRoomPage(pageReqVO).getList(); List<RoomRespVO> list2 = BeanUtils.toBean(list, RoomRespVO.class); @@ -150,7 +146,7 @@ @GetMapping(value = {"/list-simple-room"}) @Operation(summary = "鑾峰彇闂ㄨ瘖瀹ゅ垪琛�", description = "涓昏鐢ㄤ簬鍓嶇鐨勮瘖瀹ら�夋嫨") public CommonResult<Map<String, List<RoomRespVO>>> getSimpleRoomList() { - List<RoomResVO> list = roomService.simpleRoomList(); + List<RoomDO> list = roomService.simpleRoomList(); List<RoomRespVO> list2 = BeanUtils.toBean(list, RoomRespVO.class); Map<String, List<RoomRespVO>> map = list2.stream().collect(Collectors.groupingBy(RoomRespVO::getRoomName)); diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java index 5abba9a..e40ee02 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java @@ -3,17 +3,17 @@ import java.util.*; import cn.lihu.jh.framework.common.pojo.PageResult; -import cn.lihu.jh.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.lihu.jh.framework.mybatis.core.mapper.BaseMapperX; - -import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomPageReqVO; -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.enums.BedStatusEnum; +import cn.lihu.jh.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; + +import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomPageReqVO; +import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomStatisticsDO; +import cn.lihu.jh.module.ecg.enums.BedStatusEnum; /** * 璇婂鍜岃瘖鐤楀簥 Mapper @@ -21,14 +21,14 @@ * @author 鑺嬮亾婧愮爜 */ @Mapper -public interface RoomMapper extends BaseMapperX<RoomResVO> { +public interface RoomMapper extends BaseMapperX<RoomDO> { - default PageResult<RoomResVO> selectPage(RoomPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX<RoomResVO>() - .eqIfPresent(RoomResVO::getRoomId, reqVO.getRoomId()) - .eqIfPresent(RoomResVO::getBedNo, reqVO.getBedNo()) - .betweenIfPresent(RoomResVO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(RoomResVO::getId)); + default PageResult<RoomDO> selectPage(RoomPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX<RoomDO>() + .eqIfPresent(RoomDO::getRoomId, reqVO.getRoomId()) + .eqIfPresent(RoomDO::getBedNo, reqVO.getBedNo()) + .betweenIfPresent(RoomDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(RoomDO::getId)); } @Select({ "SELECT room_id, room_name, count(1) as bed_num FROM lihu.clinic_room group by room_id;" }) @@ -41,10 +41,10 @@ " #{curStatus.status} " + " </foreach> );" + "</script>") - List<RoomResVO> simpleRoomList(@Param("curStatusList") List<BedStatusEnum> curStatusList); + List<RoomDO> simpleRoomList(@Param("curStatusList") List<BedStatusEnum> curStatusList); @Select("SELECT * FROM lihu.clinic_room where room_id=#{roomId} and bed_no=#{bedNo} and doc_id=#{docId}") - RoomResVO getRoom(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("docId")Long docId); + RoomDO getRoom(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("docId")Long docId); @Update("<script> " + "update lihu.clinic_room set status=#{newStatus.status} where room_id=#{roomId} and bed_no=#{bedNo} " + diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueService.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueService.java index 77d85b4..ab66002 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueService.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueService.java @@ -1,15 +1,14 @@ package cn.lihu.jh.module.ecg.service.queue; +import javax.validation.Valid; +import java.util.List; + import cn.lihu.jh.framework.common.exception.ErrorCode; import cn.lihu.jh.framework.common.pojo.CommonResult; import cn.lihu.jh.module.ecg.controller.admin.queue.vo.*; import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomRespVO; import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO; import cn.lihu.jh.framework.common.pojo.PageResult; -import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomResVO; - -import javax.validation.Valid; -import java.util.List; /** * 鎺掗槦 Service 鎺ュ彛 diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java index 537c778..31cbc63 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java @@ -1,30 +1,28 @@ package cn.lihu.jh.module.ecg.service.queue; +import java.util.*; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicInteger; +import javax.annotation.Resource; + +import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + import cn.lihu.jh.framework.common.exception.ErrorCode; import cn.lihu.jh.framework.common.pojo.CommonResult; import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomRespVO; import cn.lihu.jh.module.ecg.dal.dataobject.queue.BedQueueStatisticDO; import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueStatisticDO; -import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomResVO; import cn.lihu.jh.module.ecg.dal.mysql.room.RoomMapper; import cn.lihu.jh.module.ecg.enums.BedStatusEnum; import cn.lihu.jh.module.ecg.enums.QueueStatusEnum; import cn.lihu.jh.module.infra.api.config.ConfigApi; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - import cn.lihu.jh.module.ecg.controller.admin.queue.vo.*; import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO; import cn.lihu.jh.framework.common.pojo.PageResult; import cn.lihu.jh.framework.common.util.object.BeanUtils; - import cn.lihu.jh.module.ecg.dal.mysql.queue.queueMapper; - -import javax.annotation.Resource; - -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicInteger; import static cn.lihu.jh.framework.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -255,12 +253,12 @@ return error(QUEUE_BED_ABNORMAL); } - RoomResVO roomResVO = roomMapper.getRoom(roomId, bedNo, docId); - if (null == roomResVO) { + RoomDO roomDO = roomMapper.getRoom(roomId, bedNo, docId); + if (null == roomDO) { return error(ECG_INNER_ERROR); } - RoomRespVO roomRespVO = BeanUtils.toBean(roomResVO, RoomRespVO.class); + RoomRespVO roomRespVO = BeanUtils.toBean(roomDO, RoomRespVO.class); return success(roomRespVO); } @@ -372,7 +370,7 @@ bedStatusEnumList.add(BedStatusEnum.OPENING); bedStatusEnumList.add(BedStatusEnum.DOCTOR_ON); bedStatusEnumList.add(BedStatusEnum.PAUSE); - List<RoomResVO> roomDOList = roomMapper.simpleRoomList(bedStatusEnumList); + List<RoomDO> roomDOList = roomMapper.simpleRoomList(bedStatusEnumList); List<BedQueueBO> bedQueueBOList = roomDOList.stream().map(item -> BeanUtils.toBean(item, BedQueueBO.class)).toList(); // 浠嶥B 鑾峰彇 闃熷垪涓� 灏辫瘖鍑嗗涓汉鍛樼粺璁� 鍒楄〃 diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomService.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomService.java index 110e177..f8b0323 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomService.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomService.java @@ -1,13 +1,13 @@ package cn.lihu.jh.module.ecg.service.room; import java.util.*; +import javax.validation.Valid; import cn.lihu.jh.framework.common.pojo.PageResult; 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.RoomResVO; +import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO; import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomStatisticsDO; -import javax.validation.Valid; /** * 璇婂鍜岃瘖鐤楀簥 Service 鎺ュ彛 @@ -44,7 +44,7 @@ * @param id 缂栧彿 * @return 璇婂鍜岃瘖鐤楀簥 */ - RoomResVO getRoom(Integer id); + RoomDO getRoom(Integer id); /** * 鑾峰緱璇婂鍜岃瘖鐤楀簥鍒嗛〉 @@ -52,10 +52,10 @@ * @param pageReqVO 鍒嗛〉鏌ヨ * @return 璇婂鍜岃瘖鐤楀簥鍒嗛〉 */ - PageResult<RoomResVO> getRoomPage(RoomPageReqVO pageReqVO); + PageResult<RoomDO> getRoomPage(RoomPageReqVO pageReqVO); List<RoomStatisticsDO> roomStatistics(); - List<RoomResVO> simpleRoomList(); + List<RoomDO> simpleRoomList(); } \ No newline at end of file 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 f630467..42a7710 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,23 +1,23 @@ 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 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 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 org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; -import java.util.*; -import cn.lihu.jh.framework.common.pojo.PageResult; +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 瀹炵幇绫� @@ -34,7 +34,7 @@ @Override public Integer createRoom(RoomSaveReqVO createReqVO) { // 鎻掑叆 - RoomResVO room = BeanUtils.toBean(createReqVO, RoomResVO.class); + RoomDO room = BeanUtils.toBean(createReqVO, RoomDO.class); roomMapper.insert(room); // 杩斿洖 return room.getId(); @@ -45,7 +45,7 @@ // 鏍¢獙瀛樺湪 validateRoomExists(updateReqVO.getId()); // 鏇存柊 - RoomResVO updateObj = BeanUtils.toBean(updateReqVO, RoomResVO.class); + RoomDO updateObj = BeanUtils.toBean(updateReqVO, RoomDO.class); roomMapper.updateById(updateObj); } @@ -64,12 +64,12 @@ } @Override - public RoomResVO getRoom(Integer id) { + public RoomDO getRoom(Integer id) { return roomMapper.selectById(id); } @Override - public PageResult<RoomResVO> getRoomPage(RoomPageReqVO pageReqVO) { + public PageResult<RoomDO> getRoomPage(RoomPageReqVO pageReqVO) { return roomMapper.selectPage(pageReqVO); } @@ -79,7 +79,7 @@ } @Override - public List<RoomResVO> simpleRoomList() { + public List<RoomDO> simpleRoomList() { List<BedStatusEnum> bedStatusEnumList = new ArrayList<BedStatusEnum>(); bedStatusEnumList.add(BedStatusEnum.OPENING); bedStatusEnumList.add(BedStatusEnum.DOCTOR_ON); -- Gitblit v1.9.3