From 9a46f15cec245d1efe7c5539dc6b2f38e4980f8a Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期五, 07 二月 2025 11:48:19 +0800 Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1 --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwPatrolTaskRecordController.java | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwPatrolTaskRecordController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwPatrolTaskRecordController.java index 1d09868..b798212 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwPatrolTaskRecordController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwPatrolTaskRecordController.java @@ -2,6 +2,7 @@ import com.doumee.api.BaseController; import com.doumee.config.annotation.CloudRequiredPermission; +import com.doumee.config.annotation.LoginNoRequired; import com.doumee.core.annotation.excel.ExcelExporter; import com.doumee.core.annotation.pr.PreventRepeat; import com.doumee.core.model.ApiResponse; @@ -87,6 +88,30 @@ @GetMapping("/{id}") @CloudRequiredPermission("business:ywpatroltaskrecord:query") public ApiResponse findById(@PathVariable Integer id) { - return ApiResponse.success(ywPatrolTaskRecordService.findById(id)); + return ApiResponse.success(ywPatrolTaskRecordService.getDetail(id)); } + + + @ApiOperation("宸℃鐐逛换鍔℃暟鎹鐞�") + @PostMapping("/patrolData") + @CloudRequiredPermission("business:ywpatroltaskrecord:update") + public ApiResponse patrolData(@RequestBody YwPatrolTaskRecord ywPatrolTaskRecord,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { + ywPatrolTaskRecord.setLoginUserInfo(getLoginUser(token)); + ywPatrolTaskRecordService.patrolData(ywPatrolTaskRecord); + return ApiResponse.success(null); + } + + @ApiOperation("鎵爜鑾峰彇宸℃鐐逛换鍔′俊鎭�") + @PostMapping("/getPointRecordByCode") + public ApiResponse<YwPatrolTaskRecord> getPointRecordByCode(@RequestBody YwPatrolTaskRecord ywPatrolTaskRecord,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { + return ApiResponse.success("鏌ヨ鎴愬姛",ywPatrolTaskRecordService.getPointRecordByCode(ywPatrolTaskRecord)); + } + + + @ApiOperation("鎵爜鑾峰彇宸℃鐐逛换鍔′俊鎭�") + @PostMapping("/getRecordByUserPoint") + public ApiResponse<YwPatrolTaskRecord> getRecordByUserPoint(@RequestBody YwPatrolTaskRecord ywPatrolTaskRecord,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { + return ApiResponse.success("鏌ヨ鎴愬姛",ywPatrolTaskRecordService.getRecordByUserPoint(ywPatrolTaskRecord,getLoginUser(token))); + } + } -- Gitblit v1.9.3