From 66d041ed14b3ed3ed7183a28a5c588e235fc21d0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 26 五月 2026 11:14:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_鹤壁_强信宇_pro
---
src/main/java/com/ruoyi/inspectiontask/controller/QrCodeScanRecordController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeScanRecordController.java b/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeScanRecordController.java
index 659f37e..a2cdc67 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeScanRecordController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeScanRecordController.java
@@ -2,13 +2,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.inspectiontask.dto.QrCodeScanRecordDto;
import com.ruoyi.inspectiontask.pojo.QrCodeScanRecord;
import com.ruoyi.inspectiontask.service.QrCodeScanRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -18,7 +20,7 @@
* @date : 2025/9/19 10:53
*/
@RestController
-@Api(tags = "浜岀淮鐮佹壂鎻忚褰曠鐞�")
+@Tag(name = "浜岀淮鐮佹壂鎻忚褰曠鐞�")
@RequestMapping("/qrCodeScanRecord")
@AllArgsConstructor
public class QrCodeScanRecordController extends BaseController {
@@ -29,7 +31,7 @@
* 浜岀淮鐮佹壂鐮佽褰曡〃鏌ヨ
*/
@GetMapping("/list")
- @ApiOperation("浜岀淮鐮佹壂鐮佽褰曡〃鏌ヨ")
+ @Operation(summary = "浜岀淮鐮佹壂鐮佽褰曡〃鏌ヨ")
public R<IPage<QrCodeScanRecordDto>> list(Page<QrCodeScanRecord> page, QrCodeScanRecordDto qrCodeScanRecordDto) {
IPage<QrCodeScanRecordDto> list = qrCodeScanRecordService.selectQrCodeScanRecordList(page, qrCodeScanRecordDto);
return R.ok(list);
@@ -38,8 +40,9 @@
/**
* 浜岀淮鐮佹壂鐮佽褰曡〃鏂板淇敼
*/
+ @Log(title = "浜岀淮鐮佹壂鎻忚褰�", businessType = BusinessType.INSERT)
+ @Operation(summary = "浜岀淮鐮佹壂鐮佽褰曡〃鏂板淇敼")
@PostMapping("/addOrEditQrCodeRecord")
- @ApiOperation("浜岀淮鐮佹壂鐮佽褰曡〃鏂板淇敼")
public R addOrEditQrCodeRecord(@RequestBody QrCodeScanRecordDto qrCodeScanRecordDto) {
return R.ok(qrCodeScanRecordService.addOrEditQrCodeRecord(qrCodeScanRecordDto));
}
@@ -47,8 +50,9 @@
/**
* 浜岀淮鐮佹壂鐮佽褰曡〃鍒犻櫎
*/
+ @Log(title = "浜岀淮鐮佹壂鎻忚褰�", businessType = BusinessType.DELETE)
+ @Operation(summary = "浜岀淮鐮佹壂鐮佽褰曡〃鍒犻櫎")
@DeleteMapping("/delSalesRecord")
- @ApiOperation("浜岀淮鐮佹壂鐮佽褰曡〃鍒犻櫎")
public R remove(@RequestBody Long[] ids) {
return R.ok(qrCodeScanRecordService.delByIds(ids));
}
--
Gitblit v1.9.3