From 56b8b84689ccf5389ee02814bcb8bfe407f05a87 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 28 四月 2026 11:09:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
index 09237a5..370d41d 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
@@ -8,30 +8,33 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedgerRecord;
import com.ruoyi.measuringinstrumentledger.service.MeasuringInstrumentLedgerRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.jsonwebtoken.lang.Collections;
+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.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.util.List;
/**
* @author :yys
* @date : 2025/8/5 9:28
*/
@RestController
-@Api(tags = "璁￠噺鍣ㄥ叿鍙拌处璁板綍")
+@Tag(name = "璁￠噺鍣ㄥ叿鍙拌处璁板綍")
@RequestMapping("/measuringInstrumentLedgerRecord")
+@AllArgsConstructor
public class MeasuringInstrumentLedgerRecordController extends BaseController {
- @Autowired
private MeasuringInstrumentLedgerRecordService measuringInstrumentLedgerRecordService;
@GetMapping("/listPage")
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒嗛〉鏌ヨ")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒嗛〉鏌ヨ")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listPage(Page page, MeasuringInstrumentLedgerRecord measuringInstrumentLedgerRecord){
IPage<MeasuringInstrumentLedgerRecord> listPage = measuringInstrumentLedgerRecordService.listPage(page, measuringInstrumentLedgerRecord);
@@ -39,7 +42,7 @@
}
@PostMapping("/update")
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处璁板綍-淇敼")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-淇敼")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-淇敼", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
public AjaxResult update(@RequestBody MeasuringInstrumentLedgerRecord measuringInstrumentLedgerRecord) throws IOException {
@@ -50,10 +53,18 @@
return AjaxResult.error();
}
+ @DeleteMapping("/delete")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒犻櫎")
+ @Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒犻櫎", businessType = BusinessType.DELETE)
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if(Collections.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁");
+ return AjaxResult.success(measuringInstrumentLedgerRecordService.removeBatchByIds(ids));
+ }
+
/**
* 瀵煎嚭璁￠噺鍣ㄥ叿鍙拌处
*/
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处璁板綍-瀵煎嚭")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-瀵煎嚭")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-瀵煎嚭", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response) {
--
Gitblit v1.9.3