From 68ff33beff11310e830b0615b5a81f83fad0f683 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 08 十一月 2026 23:33:14 +0800
Subject: [PATCH] ai优化

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java |  388 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 387 insertions(+), 1 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 3f49886..62b580a 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,319 +1,705 @@
 package cn.lihu.jh.module.ecg.controller.admin.devrent;
 
+
+
 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.annotation.RequireBedOwner;
+
 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 lombok.extern.slf4j.Slf4j;
+
 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 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 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 cn.lihu.jh.module.ecg.controller.admin.devrent.vo.*;
+
 import cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO;
+
+
 import cn.lihu.jh.module.ecg.service.devrent.DevRentService;
 
+
+
 import javax.annotation.Resource;
+
 import javax.servlet.http.HttpServletResponse;
+
 import javax.validation.Valid;
 
+
+
 @Tag(name = "瑁呮満鎷嗘満")
+
 @RestController
+
 @RequestMapping("/ecg/dev-rent")
+
 @Validated
+
 @Slf4j
+
 public class DevRentController {
 
+
+
     @Resource
+
     private DevRentService devRentService;
 
+
+
     @Resource
+
     private DeviceService deviceService;
 
+
+
     @Resource
+
     private QueueService queueService;
 
+
+
     @Resource
+
     private AppointmentService appointmentService;
 
+    /** 銆愪富/鍥磋銆戝啓鎿嶄綔鐨勫伐浣嶄富浜烘牎楠岋紙鍙甫鎮h�呬俊鎭殑鎺ュ彛鍦ㄦ柟娉曢噷鏄惧紡璋冪敤锛� */
+    @Resource
+
+    private cn.lihu.jh.module.ecg.service.room.RoomService roomService;
+
+
+
     // 甯歌妫�鏌� 瀹屾垚
+
+    @RequireBedOwner("妫�鏌ュ畬鎴�")
+
     @PostMapping("/routine-finish")
+
     @Operation(summary = "甯歌妫�鏌ュ畬鎴�")
+
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
     public CommonResult<Long> routineFinish(@Valid @RequestBody RoutineFinishReqVO routineFinishReqVO) {
+
         CommonResult<Long> result = devRentService.routineFinishOperation(routineFinishReqVO);
 
+
+
         try {
+
             String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
             String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
-            Long rentId = routineFinishReqVO.getId();
+
+            // 銆愮己闄蜂慨澶嶃�戜紭鍏堢敤**鏈嶅姟杩斿洖鐨� rentId**锛�= 鏈瀹屾垚瀹為檯鍐欏叆鐨勬鏌ュ崟 id锛夛細
+            //   路 鏅�氭偅鑰咃細璇锋眰閲屽甫浜� id锛屼袱鑰呯浉鍚岋紱
+            //   路 绱ф�ュ姞鍋氭偅鑰咃細璇锋眰閲屾病鏈� id锛堟病绛惧埌杩囷級锛屾湇鍔′細鏂板缓妫�鏌ュ崟 鈥斺��
+            //     鍘熷疄鐜扮敤 routineFinishReqVO.getId()锛坣ull锛夊幓纭垂锛屽繀鐒跺け璐ワ紙涓旇 catch 鍚炴帀锛夛紝
+            //     鐜板満琛ㄧ幇涓�"鍔犳�ユ偅鑰呮鏌ュ畬鎴愬悗娌℃湁纭垂"銆�
+            Long rentId = null != result && null != result.getData()
+                    ? result.getData() : routineFinishReqVO.getId();
+
             devRentService.feeConfirm(rentId, userHisId, userNickname, true);  // 鏁呮剰 涓嶆鏌ヨ繑鍥炲��
+
         } catch (Exception e) {
+
             log.error("甯歌妫�鏌ュ畬鎴�, 鑷姩纭垂澶辫触", e);
+
         }
 
+
+
         return result;
+
     }
+
+
+
+    @RequireBedOwner("璁惧棰嗙敤瀹屾垚")
 
     @PostMapping("/dev-ready")
+
     @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);
 
+
+
         try {
+
             Long rentId = createReqVO.getId();
+
             devRentService.feeConfirm(rentId, userHisId, userNickname, true);  // 鏁呮剰 涓嶆鏌ヨ繑鍥炲��
+
         } catch (Exception e) {
+
             log.error("璁惧棰嗙敤瀹屾垚, 鑷姩纭垂澶辫触", e);
+
         }
+
+
 
         return result;
+
     }
+
+
+
+    @RequireBedOwner("瑁呮満瀹屾垚")
 
     @PostMapping("/dev-install")
+
     @Operation(summary = "瑁呮満")
+
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
     public CommonResult<Long> devInstall(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
+
         return devRentService.installOperation(createReqVO);
+
     }
+
+
+
+    @RequireBedOwner("鎷嗘満")
 
     @PostMapping("/dev-dismantle")
+
     @Operation(summary = "鎷嗘満")
+
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
     public CommonResult<Long> devDismantle(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
+
         devRentService.dismantleOperation(createReqVO);
+
         return CommonResult.success(0L);
+
     }
+
+
+
+    @RequireBedOwner("鏁版嵁褰曞叆")
 
     @PostMapping("/dev-data-entry")
+
     @Operation(summary = "鏁版嵁褰曞叆")
+
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
     public CommonResult<Long> devDataEntry(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
+
         devRentService.dataEntryOperation(createReqVO);
+
         return CommonResult.success(0L);
+
     }
+
+
 
     @PostMapping("/routine-check-cancel")
+
     @Operation(summary = "鍙栨秷甯歌妫�鏌�")
+
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
     public CommonResult<Long> routineCheckCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
+
+        // 銆愪富/鍥磋銆戣鎺ュ彛娌℃湁 roomId/bedNo锛屾寜銆屾偅鑰� + 妫�鏌ラ」鐩�嶅弽鏌ュ叾鎵�鍦ㄥ伐浣嶅啀鏍¢獙涓讳汉韬唤
+        roomService.assertBedOwnerByPatient(cancelReqVO.getPatId(), cancelReqVO.getCheckType());
+
         return devRentService.cancelRoutineOperation(cancelReqVO);
+
     }
+
+
 
     @PostMapping("/dev-ready-cancel")
+
     @Operation(summary = "鍙栨秷棰嗙敤")
+
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
     public CommonResult<Long> devReadyCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
+
+        // 銆愪富/鍥磋銆戞寜銆屾偅鑰� + 妫�鏌ラ」鐩�嶅弽鏌ュ伐浣嶅啀鏍¢獙涓讳汉韬唤
+        roomService.assertBedOwnerByPatient(cancelReqVO.getPatId(), cancelReqVO.getCheckType());
+
         return devRentService.cancelReadyOperation(cancelReqVO);
+
     }
+
+
 
     @PostMapping("/dev-install-cancel")
+
     @Operation(summary = "鍙栨秷瑁呮満")
+
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
     public CommonResult<Long> devInstallCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
+
+        // 銆愪富/鍥磋銆戞寜銆屾偅鑰� + 妫�鏌ラ」鐩�嶅弽鏌ュ伐浣嶅啀鏍¢獙涓讳汉韬唤
+        roomService.assertBedOwnerByPatient(cancelReqVO.getPatId(), cancelReqVO.getCheckType());
+
         return devRentService.cancelInstallOperation(cancelReqVO);
+
     }
+
+
+
+    @RequireBedOwner("璁惧閬楀け")
 
     @PostMapping("/dev-lose")
+
     @Operation(summary = "閬楀け")
+
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
     public CommonResult<Long> devLose(@Valid @RequestBody DevRentSaveReqVO loseReqVO) {
+
         loseReqVO.setState(DevStateEnum.LOST.getState());
+
         return devRentService.dismantleExceptionOperation(loseReqVO);
+
     }
+
+
+
+    @RequireBedOwner("璁惧鎹熷潖")
 
     @PostMapping("/dev-damage")
+
     @Operation(summary = "鎹熷潖")
+
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
     public CommonResult<Long> devDamage(@Valid @RequestBody DevRentSaveReqVO damageReqVO) {
+
         damageReqVO.setState(DevStateEnum.DAMAGED.getState());
+
         return devRentService.dismantleExceptionOperation(damageReqVO);
+
     }
+
+
 
     @PostMapping("/create")
+
     @Operation(summary = "鍒涘缓瑁呮満鎷嗘満")
+
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
     public CommonResult<Long> createDevRent(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
+
         return CommonResult.success(devRentService.createDevRent(createReqVO));
+
     }
+
+
 
     @PutMapping("/update")
+
     @Operation(summary = "鏇存柊瑁呮満鎷嗘満")
+
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
     public CommonResult<Boolean> updateDevRent(@Valid @RequestBody DevRentSaveReqVO updateReqVO) {
+
         devRentService.updateDevRent(updateReqVO);
+
         return CommonResult.success(true);
+
     }
+
+
 
     @DeleteMapping("/delete")
+
     @Operation(summary = "鍒犻櫎瑁呮満鎷嗘満")
+
     @Parameter(name = "id", description = "缂栧彿", required = true)
+
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
     public CommonResult<Boolean> deleteDevRent(@RequestParam("id") Long id) {
+
         devRentService.deleteDevRent(id);
+
         return CommonResult.success(true);
+
     }
+
+
 
     @GetMapping("/get")
+
     @Operation(summary = "鑾峰緱瑁呮満鎷嗘満")
+
     @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
+
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
     public CommonResult<DevRentRespVO> getDevRent(@RequestParam("id") Long id) {
+
         DevRentDO devRent = devRentService.getDevRent(id);
 
+
+
         DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);
 
+
+
         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("/page")
+
     @Operation(summary = "鑾峰緱瑁呮満鎷嗘満鍒嗛〉")
+
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
     public CommonResult<PageResult<DevRentRespVO>> getDevRentPage(@Valid DevRentPageReqVO pageReqVO) {
+
         PageResult<DevRentDO> pageResult = devRentService.getDevRentPage(pageReqVO);
+
         return CommonResult.success(BeanUtils.toBean(pageResult, DevRentRespVO.class));
+
     }
+
+
 
     @GetMapping("/export-excel")
+
     @Operation(summary = "瀵煎嚭瑁呮満鎷嗘満 Excel")
+
     @PreAuthorize("@ss.hasPermission('ecg:dev-rent:export')")
+
     @ApiAccessLog(operateType = EXPORT)
+
     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));
+
     }
+
+
 
     @GetMapping("/get-free-rent")
+
     @Operation(summary = "鏍规嵁鎮h�呮垨璁惧, 鑾峰彇宸查鍙栫璧佹儏鍐�")
+
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
     public CommonResult<DevRentRespVO> getFreeRent(@Valid DevRentSearchReqVO searchReqVO) {
+
         DevRentDO devRent = devRentService.getFreeRent(searchReqVO);
+
         if (null == devRent) {
+
             return CommonResult.success(null);
+
         }
 
+
+
         DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);
+
         return CommonResult.success(devRentRespVO);
+
     }
+
+
 
     @GetMapping("/get-ready-rent")
+
     @Operation(summary = "鑾峰彇宸查鍙栫璧佹儏鍐�")
+
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
     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());
+
         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-existing-rent")
+
     @Operation(summary = "鑾峰彇宸插畨瑁呫�佸凡棰嗙敤鐨勭璧佹儏鍐�")
+
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
     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());
 
+
+
         DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);
+
         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);
+
         if (null == devRent) {
+
             return CommonResult.success(null);
+
         }
+
+
 
         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());
+
         return CommonResult.success(devRentRespVO);
+
     }
+
+
 
     // 纭垂
+
     @GetMapping("/fee-confirm")
+
     @Operation(summary = "纭垂")
+
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
     public CommonResult<Integer> feeConfirm(@Valid Long rentId) {
+
         Long userId = SecurityFrameworkUtils.getLoginUserId();
+
         String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
         String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
+
+
+
+        // 銆愪富/鍥磋銆戠‘璐逛篃瑕佹嫤鍥磋浜猴細鎸夎绉熻祦鍗曠殑鎮h�呭弽鏌ュ叾褰撳墠宸ヤ綅骞舵牎楠屼富浜鸿韩浠姐��
+        // 鐢� Soft 鐗堟湰锛氱‘璐瑰父鍦ㄦ祦绋嬫湯绔皟鐢紝鎮h�呭彲鑳藉凡涓嶅湪闃熷垪涓婏紝鏌ヤ笉鍒板伐浣嶆椂鍙璀﹀憡鏀捐銆�
+        assertRentBedOwnerSoft(rentId);
 
         Integer result = devRentService.feeConfirm(rentId, userHisId, userNickname, true);
+
         if (1 == result) return CommonResult.error(result, "纭垂澶辫触");
 
+
+
         return CommonResult.success(result);
+
     }
+
+
 
     // 鍙栨秷纭垂
+
     @GetMapping("/fee-cancel")
+
     @Operation(summary = "鍙栨秷纭垂")
+
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
     public CommonResult<Integer> feeCancel(@Valid Long rentId) {
+
         Long userId = SecurityFrameworkUtils.getLoginUserId();
+
         String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
         String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
 
+
+
+        // 銆愪富/鍥磋銆戝彇娑堢‘璐瑰悓鏍疯鎷﹀洿瑙備汉锛圫oft锛氭煡涓嶅埌宸ヤ綅鍙璀﹀憡锛�
+        assertRentBedOwnerSoft(rentId);
+
         Integer result = devRentService.feeConfirm(rentId, userHisId, userNickname, false);
+
         if (1 == result) return CommonResult.error(result, "鍙栨秷纭垂澶辫触");
 
+
+
         return CommonResult.success(result);
+
     }
+
+    /**
+     * 銆愪富/鍥磋銆戠‘璐� / 鍙栨秷纭垂鐨勪富浜烘牎楠屻��
+     *
+     * <p>鎺ュ彛鍙甫 rentId锛屾嬁涓嶅埌 roomId/bedNo锛屽洜姝ゅ厛鎸夌璧佸崟鎵惧埌鎮h�咃紝
+     * 鍐嶇敱 {@link cn.lihu.jh.module.ecg.service.room.RoomService#assertBedOwnerByPatientSoft}
+     * 鎸夋偅鑰呭綋鍓嶆墍鍦ㄥ伐浣嶆牎楠屼富浜鸿韩浠斤紙鏌ヤ笉鍒板伐浣嶆椂鍙璀﹀憡鏀捐锛岄伩鍏嶈浼ゆ湯绔祦绋嬶級銆�
+     *
+     * <p>娉ㄦ剰锛氬彧鍖呬綇"璇荤璧佸崟"杩欎竴姝ワ紝**涓嶈兘**鎶婁富浜烘牎楠岀殑寮傚父涔熷悶鎺夛紝鍚﹀垯绛変簬娌℃湁鏍¢獙銆�
+     */
+    private void assertRentBedOwnerSoft(Long rentId) {
+        cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO rent;
+        try {
+            rent = devRentService.getDevRent(rentId);
+        } catch (Exception e) {
+            log.error("[assertRentBedOwnerSoft] 璇诲彇绉熻祦鍗曞け璐ワ紝璺宠繃涓讳汉鏍¢獙. rentId={}", rentId, e);
+            return;
+        }
+        roomService.assertBedOwnerByPatientSoft(null == rent ? null : rent.getPatId(),
+                null == rent ? null : rent.getCheckType());
+    }
+
 }
+

--
Gitblit v1.9.3