From 10b88a7ff17caf92f3d4e8a550c1085a70c2517a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 17:43:26 +0800
Subject: [PATCH] Merge dev_New_pro into dev_山西_晋和园_pro
---
src/main/java/com/ruoyi/inspectiontask/controller/QrCodeController.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeController.java b/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeController.java
index 4ebc473..80089ca 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeController.java
@@ -2,14 +2,16 @@
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.QrCodeDto;
import com.ruoyi.inspectiontask.pojo.QrCode;
import com.ruoyi.inspectiontask.service.QrCodeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
/**
@@ -17,18 +19,18 @@
* @date : 2025/9/19 10:52
*/
@RestController
-@Api(tags = "浜岀淮鐮佺鐞�")
+@Tag(name = "浜岀淮鐮佺鐞�")
@RequestMapping("/qrCode")
+@AllArgsConstructor
public class QrCodeController extends BaseController {
- @Autowired
private QrCodeService qrCodeService;
/**
* 浜岀淮鐮佺鐞嗚〃鏌ヨ
*/
@GetMapping("/list")
- @ApiOperation("浜岀淮鐮佺鐞嗚〃鏌ヨ")
+ @Operation(summary = "浜岀淮鐮佺鐞嗚〃鏌ヨ")
public R<IPage<QrCode>> list(Page page, QrCodeDto qrCodeDto) {
IPage<QrCode> list = qrCodeService.selectQrCodeList(page, qrCodeDto);
return R.ok(list);
@@ -37,8 +39,9 @@
/**
* 浜岀淮鐮佺鐞嗚〃鏂板淇敼
*/
+ @Log(title = "浜岀淮鐮�", businessType = BusinessType.INSERT)
+ @Operation(summary = "浜岀淮鐮佺鐞嗚〃鏂板淇敼")
@PostMapping("/addOrEditQrCode")
- @ApiOperation("浜岀淮鐮佺鐞嗚〃鏂板淇敼")
public R<Long> addOrEditQrCode(@RequestBody QrCodeDto qrCodeDto) {
return R.ok(qrCodeService.addOrEditQrCode(qrCodeDto));
}
@@ -46,8 +49,9 @@
/**
* 浜岀淮鐮佺鐞嗚〃鍒犻櫎
*/
+ @Log(title = "浜岀淮鐮�", businessType = BusinessType.DELETE)
+ @Operation(summary = "浜岀淮鐮佺鐞嗚〃鍒犻櫎")
@DeleteMapping("/delQrCode")
- @ApiOperation("浜岀淮鐮佺鐞嗚〃鍒犻櫎")
public R remove(@RequestBody Long[] ids) {
return R.ok(qrCodeService.delByIds(ids));
}
--
Gitblit v1.9.3