From 9ad12f4a3cbf1fc5bb2ef5a76a371064afac62fc Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 24 十月 2025 11:48:37 +0800
Subject: [PATCH] 新增日志
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java | 85 +++++++++++++++++++-----------------------
1 files changed, 38 insertions(+), 47 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
index ebd507b..3f49886 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
@@ -1,12 +1,12 @@
package cn.lihu.jh.module.ecg.controller.admin.devrent;
-import cn.lihu.jh.framework.common.util.exception.ExceptionUtils;
import cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils;
+import cn.lihu.jh.module.ecg.dal.dataobject.appointment.AppointmentDO;
import cn.lihu.jh.module.ecg.dal.dataobject.devmanage.DeviceDO;
import cn.lihu.jh.module.ecg.enums.DevStateEnum;
+import cn.lihu.jh.module.ecg.service.appointment.AppointmentService;
import cn.lihu.jh.module.ecg.service.devmanage.DeviceService;
import cn.lihu.jh.module.ecg.service.queue.QueueService;
-import io.swagger.v3.oas.models.security.SecurityScheme;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
@@ -26,8 +26,8 @@
import cn.lihu.jh.framework.excel.core.util.ExcelUtils;
import cn.lihu.jh.framework.apilog.core.annotation.ApiAccessLog;
+
import static cn.lihu.jh.framework.apilog.core.enums.OperateTypeEnum.*;
-import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
import cn.lihu.jh.module.ecg.controller.admin.devrent.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO;
@@ -53,6 +53,9 @@
@Resource
private QueueService queueService;
+ @Resource
+ private AppointmentService appointmentService;
+
// 甯歌妫�鏌� 瀹屾垚
@PostMapping("/routine-finish")
@Operation(summary = "甯歌妫�鏌ュ畬鎴�")
@@ -60,10 +63,6 @@
public CommonResult<Long> routineFinish(@Valid @RequestBody RoutineFinishReqVO routineFinishReqVO) {
CommonResult<Long> result = devRentService.routineFinishOperation(routineFinishReqVO);
- // 鎶� 鎺掗槦 鎮ｈ��
- queueService.startHurryUpOneBed(routineFinishReqVO.getRoomId(), routineFinishReqVO.getBedNo());
-
- // 鑷姩纭垂
try {
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
@@ -80,15 +79,12 @@
@Operation(summary = "璁惧棰嗙敤瀹屾垚")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<Long> devReady(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
+ String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+ createReqVO.setOperater(userNickname);
CommonResult<Long> result = devRentService.readyOperation(createReqVO);
- // 鎶� 鎺掗槦 鎮ｈ��
- queueService.startHurryUpOneBed(createReqVO.getRoomId(), createReqVO.getBedNo());
-
- // 鑷姩纭垂
try {
- String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
- String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
Long rentId = createReqVO.getId();
devRentService.feeConfirm(rentId, userHisId, userNickname, true); // 鏁呮剰 涓嶆鏌ヨ繑鍥炲��
} catch (Exception e) {
@@ -146,7 +142,7 @@
@Operation(summary = "閬楀け")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<Long> devLose(@Valid @RequestBody DevRentSaveReqVO loseReqVO) {
- loseReqVO.setState( DevStateEnum.LOST.getState() );
+ loseReqVO.setState(DevStateEnum.LOST.getState());
return devRentService.dismantleExceptionOperation(loseReqVO);
}
@@ -154,7 +150,7 @@
@Operation(summary = "鎹熷潖")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<Long> devDamage(@Valid @RequestBody DevRentSaveReqVO damageReqVO) {
- damageReqVO.setState( DevStateEnum.DAMAGED.getState() );
+ damageReqVO.setState(DevStateEnum.DAMAGED.getState());
return devRentService.dismantleExceptionOperation(damageReqVO);
}
@@ -191,11 +187,12 @@
DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);
- DeviceDO deviceDO = deviceService.getDevice( devRent.getDevId() );
+ DeviceDO deviceDO = deviceService.getDevice(devRent.getDevId());
if (null != deviceDO) {
devRentRespVO.setCategory(deviceDO.getCategory());
devRentRespVO.setBrand(deviceDO.getBrand());
devRentRespVO.setModel(deviceDO.getModel());
+ devRentRespVO.setDevState(deviceDO.getState());
}
return CommonResult.success(devRentRespVO);
}
@@ -212,21 +209,18 @@
@Operation(summary = "瀵煎嚭瑁呮満鎷嗘満 Excel")
@PreAuthorize("@ss.hasPermission('ecg:dev-rent:export')")
@ApiAccessLog(operateType = EXPORT)
- public void exportDevRentExcel(@Valid DevRentPageReqVO pageReqVO,
- HttpServletResponse response) throws IOException {
+ public void exportDevRentExcel(@Valid DevRentPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<DevRentDO> list = devRentService.getDevRentPage(pageReqVO).getList();
// 瀵煎嚭 Excel
- ExcelUtils.write(response, "瑁呮満鎷嗘満.xls", "鏁版嵁", DevRentRespVO.class,
- BeanUtils.toBean(list, DevRentRespVO.class));
+ ExcelUtils.write(response, "瑁呮満鎷嗘満.xls", "鏁版嵁", DevRentRespVO.class, BeanUtils.toBean(list, DevRentRespVO.class));
}
@GetMapping("/get-free-rent")
@Operation(summary = "鏍规嵁鎮ｈ�呮垨璁惧, 鑾峰彇宸查鍙栫璧佹儏鍐�")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
- public CommonResult<DevRentRespVO> getFreeRent( @Valid DevRentSearchReqVO searchReqVO )
- {
- DevRentDO devRent = devRentService.getFreeRent( searchReqVO );
+ public CommonResult<DevRentRespVO> getFreeRent(@Valid DevRentSearchReqVO searchReqVO) {
+ DevRentDO devRent = devRentService.getFreeRent(searchReqVO);
if (null == devRent) {
return CommonResult.success(null);
}
@@ -238,59 +232,58 @@
@GetMapping("/get-ready-rent")
@Operation(summary = "鑾峰彇宸查鍙栫璧佹儏鍐�")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
- public CommonResult<DevRentRespVO> getReadyRent( @Valid DevRentSearchReqVO searchReqVO )
- {
- DevRentDO devRent = devRentService.getReadyOrCancelledRent( searchReqVO );
+ public CommonResult<DevRentRespVO> getReadyRent(@Valid DevRentSearchReqVO searchReqVO) {
+ DevRentDO devRent = devRentService.getReadyOrCancelledRent(searchReqVO);
if (null == devRent) {
return CommonResult.success(null);
}
DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);
- DeviceDO deviceDO = deviceService.getDevice( devRent.getDevId() );
+ DeviceDO deviceDO = deviceService.getDevice(devRent.getDevId());
if (null != deviceDO) {
devRentRespVO.setCategory(deviceDO.getCategory());
devRentRespVO.setBrand(deviceDO.getBrand());
devRentRespVO.setModel(deviceDO.getModel());
+ devRentRespVO.setDevState(deviceDO.getState());
}
return CommonResult.success(devRentRespVO);
}
- @GetMapping("/get-installed-rent")
- @Operation(summary = "鑾峰彇宸插畨瑁呯璧佹儏鍐�")
+ @GetMapping("/get-existing-rent")
+ @Operation(summary = "鑾峰彇宸插畨瑁呫�佸凡棰嗙敤鐨勭璧佹儏鍐�")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
- public CommonResult<DevRentRespVO> getInstalledRent( @Valid DevRentSearchReqVO searchReqVO )
- {
- DevRentDO devRent = devRentService.getInstalledOrCancelledRent( searchReqVO );
+ public CommonResult<DevRentRespVO> getInstalledRent(@Valid DevRentSearchReqVO searchReqVO) {
+ DevRentDO devRent = devRentService.getExistingRent(searchReqVO);
if (null == devRent) {
return CommonResult.success(null);
}
- DeviceDO deviceDO = deviceService.getDevice( devRent.getDevId() );
+ DeviceDO deviceDO = deviceService.getDevice(devRent.getDevId());
DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);
- devRentRespVO.setCategory( deviceDO.getCategory() );
- devRentRespVO.setBrand( deviceDO.getBrand() );
- devRentRespVO.setModel( deviceDO.getModel() );
+ devRentRespVO.setCategory(deviceDO.getCategory());
+ devRentRespVO.setBrand(deviceDO.getBrand());
+ devRentRespVO.setModel(deviceDO.getModel());
+ devRentRespVO.setDevState(devRent.getState());
return CommonResult.success(devRentRespVO);
}
@GetMapping("/get-dismantled-rent")
@Operation(summary = "鑾峰彇宸叉媶鍗哥璧佹儏鍐�")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
- public CommonResult<DevRentRespVO> getDismantledRent( @Valid DevRentSearchReqVO searchReqVO )
- {
- DevRentDO devRent = devRentService.getDismantledRent( searchReqVO );
+ public CommonResult<DevRentRespVO> getDismantledRent(@Valid DevRentSearchReqVO searchReqVO) {
+ DevRentDO devRent = devRentService.getDismantledRent(searchReqVO);
if (null == devRent) {
return CommonResult.success(null);
}
- DeviceDO deviceDO = deviceService.getDevice( devRent.getDevId() );
+ DeviceDO deviceDO = deviceService.getDevice(devRent.getDevId());
DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);
- devRentRespVO.setCategory( deviceDO.getCategory() );
- devRentRespVO.setBrand( deviceDO.getBrand() );
- devRentRespVO.setModel( deviceDO.getModel() );
+ devRentRespVO.setCategory(deviceDO.getCategory());
+ devRentRespVO.setBrand(deviceDO.getBrand());
+ devRentRespVO.setModel(deviceDO.getModel());
return CommonResult.success(devRentRespVO);
}
@@ -304,8 +297,7 @@
String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
Integer result = devRentService.feeConfirm(rentId, userHisId, userNickname, true);
- if (1 == result)
- return CommonResult.error(result, "纭垂澶辫触");
+ if (1 == result) return CommonResult.error(result, "纭垂澶辫触");
return CommonResult.success(result);
}
@@ -320,8 +312,7 @@
String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
Integer result = devRentService.feeConfirm(rentId, userHisId, userNickname, false);
- if (1 == result)
- return CommonResult.error(result, "鍙栨秷纭垂澶辫触");
+ if (1 == result) return CommonResult.error(result, "鍙栨秷纭垂澶辫触");
return CommonResult.success(result);
}
--
Gitblit v1.9.3