From a45631c317411128948d2dfa3539bef0337dd64e Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期二, 10 九月 2024 14:14:05 +0800 Subject: [PATCH] update --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 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 bd79b4f..7b1766e 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 @@ -40,14 +40,14 @@ @PostMapping("/create") @Operation(summary = "鍒涘缓瑁呮満鎷嗘満") - @PreAuthorize("@ss.hasPermission('ecg:dev-rent:create')") - public CommonResult<Integer> createDevRent(@Valid @RequestBody DevRentSaveReqVO createReqVO) { + @PreAuthorize("@ss.hasPermission('ecg:doctor:task')") + public CommonResult<Long> createDevRent(@Valid @RequestBody DevRentSaveReqVO createReqVO) { return success(devRentService.createDevRent(createReqVO)); } @PutMapping("/update") @Operation(summary = "鏇存柊瑁呮満鎷嗘満") - @PreAuthorize("@ss.hasPermission('ecg:dev-rent:update')") + @PreAuthorize("@ss.hasPermission('ecg:doctor:task')") public CommonResult<Boolean> updateDevRent(@Valid @RequestBody DevRentSaveReqVO updateReqVO) { devRentService.updateDevRent(updateReqVO); return success(true); @@ -56,8 +56,8 @@ @DeleteMapping("/delete") @Operation(summary = "鍒犻櫎瑁呮満鎷嗘満") @Parameter(name = "id", description = "缂栧彿", required = true) - @PreAuthorize("@ss.hasPermission('ecg:dev-rent:delete')") - public CommonResult<Boolean> deleteDevRent(@RequestParam("id") Integer id) { + @PreAuthorize("@ss.hasPermission('ecg:doctor:task')") + public CommonResult<Boolean> deleteDevRent(@RequestParam("id") Long id) { devRentService.deleteDevRent(id); return success(true); } @@ -65,15 +65,15 @@ @GetMapping("/get") @Operation(summary = "鑾峰緱瑁呮満鎷嗘満") @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('ecg:dev-rent:query')") - public CommonResult<DevRentRespVO> getDevRent(@RequestParam("id") Integer id) { + @PreAuthorize("@ss.hasPermission('ecg:doctor:task')") + public CommonResult<DevRentRespVO> getDevRent(@RequestParam("id") Long id) { DevRentDO devRent = devRentService.getDevRent(id); return success(BeanUtils.toBean(devRent, DevRentRespVO.class)); } @GetMapping("/page") @Operation(summary = "鑾峰緱瑁呮満鎷嗘満鍒嗛〉") - @PreAuthorize("@ss.hasPermission('ecg:dev-rent:query')") + @PreAuthorize("@ss.hasPermission('ecg:doctor:task')") public CommonResult<PageResult<DevRentRespVO>> getDevRentPage(@Valid DevRentPageReqVO pageReqVO) { PageResult<DevRentDO> pageResult = devRentService.getDevRentPage(pageReqVO); return success(BeanUtils.toBean(pageResult, DevRentRespVO.class)); @@ -92,4 +92,15 @@ BeanUtils.toBean(list, DevRentRespVO.class)); } -} \ No newline at end of file + @GetMapping("/get-latest-rent") + @Operation(summary = "鑾峰彇鎮h�呰澶囩殑鏈�杩戠璧佹儏鍐�") + @Parameter(name = "pat-id", description = "鎮h�呯紪鍙�", required = true, example = "1024") + @Parameter(name = "dev-id", description = "璁惧缂栧彿", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('ecg:doctor:task')") + public CommonResult<DevRentRespVO> getLatestRent( + @RequestParam("pat-id") String patId, @RequestParam("dev-id") String devId) + { + DevRentDO devRent = devRentService.getLatestRent(patId, devId); + return success(BeanUtils.toBean(devRent, DevRentRespVO.class)); + } +} -- Gitblit v1.9.3