From 7ef4892f9f24f941aca37e6b3991b808a0aca619 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 08 九月 2023 11:16:35 +0800
Subject: [PATCH] 优化

---
 ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
index f2499b2..59cbc6f 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
@@ -41,7 +41,7 @@
 
     @GetMapping("/query")
     @ApiOperation("鏌ヨ")
-    @LogSave
+    @LogSave(operationType = "鍗″彛绠$悊", contain = "鏌ヨ鍗″彛")
     public CommonResult search(@RequestParam(required = false) Integer size,
                                @RequestParam(required = false) Integer current,
                                @RequestParam(required = false) String bayonetName) {
@@ -65,17 +65,20 @@
         return CommonResult.success(iEquipmentBayonetService.updateById(equipmentBayonet));
     }
 
-    @GetMapping("/export")
+    @DeleteMapping("/delete/{id}")
+    @ApiOperation("鍒犻櫎")
+    @LogSave(operationType = "鍗″彛绠$悊", contain = "鍒犻櫎鍗″彛")
+    public CommonResult delete(@PathVariable Integer id) {
+        return CommonResult.success(iEquipmentBayonetService.removeById(id));
+    }
+
+
+    @PostMapping("/export")
     @ApiOperation("瀵煎嚭")
     @SneakyThrows
     @LogSave(operationType = "鍗″彛绠$悊", contain = "瀵煎嚭鍗″彛")
     public void export(HttpServletResponse response,
-                       @RequestParam(required = false) Integer size,
-                       @RequestParam(required = false) Integer current,
                        @RequestParam(required = false) String bayonetName) {
-        Page<EquipmentBayonet> equipmentBayonetPage = new Page<>();
-        equipmentBayonetPage.setCurrent(current);
-        equipmentBayonetPage.setSize(size);
-        EasyExcelUtils.export(response, "鏁版嵁", EquipmentBayonetVO.class, iEquipmentBayonetService.selectEquipmentPage(equipmentBayonetPage, bayonetName).getRecords());
+        EasyExcelUtils.export(response, "鏁版嵁", EquipmentBayonetVO.class, iEquipmentBayonetService.selectEquipmentList(bayonetName));
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0