From 618e184784d2e39a31affc40173e15ccb978bc24 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 01 七月 2024 11:48:52 +0800
Subject: [PATCH] 电磁锁概要提交

---
 ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java |   41 +++++++++++++++++++++++++++++++----------
 1 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
index 46f8860..4a42275 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
@@ -1,9 +1,12 @@
 package com.ruoyi.sy.controller;
 
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.utils.result.Results;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -29,7 +32,7 @@
  * 鐢电閿丆ontroller
  *
  * @author ard
- * @date 2024-06-29
+ * @date 2024-07-01
  */
 @Api(tags = "鐢电閿�")
 @RestController
@@ -38,12 +41,12 @@
     @Autowired
     private IArdTankLockService ardTankLockService;
 
-/**
- * 鏌ヨ鐢电閿佸垪琛�
- */
-@ApiOperation("鏌ヨ鐢电閿佸垪琛�")
-@PreAuthorize("@ss.hasPermi('sy:lock:list')")
-@GetMapping("/list")
+    /**
+     * 鏌ヨ鐢电閿佸垪琛�
+     */
+    @ApiOperation("鏌ヨ鐢电閿佸垪琛�")
+    @PreAuthorize("@ss.hasPermi('sy:lock:list')")
+    @GetMapping("/list")
     public TableDataInfo list(ArdTankLock ardTankLock) {
         startPage();
         List<ArdTankLock> list = ardTankLockService.selectArdTankLockList(ardTankLock);
@@ -80,8 +83,6 @@
     @Log(title = "鐢电閿�" , businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ArdTankLock ardTankLock) {
-        String id = IdUtils.simpleUUID();
-        ardTankLock.setId(id);
         return toAjax(ardTankLockService.insertArdTankLock(ardTankLock));
     }
 
@@ -99,11 +100,31 @@
     /**
      * 鍒犻櫎鐢电閿�
      */
-    @ApiOperation("鍒犻櫎鐢电閿�")
+    /*@ApiOperation("鍒犻櫎鐢电閿�")
     @PreAuthorize("@ss.hasPermi('sy:lock:remove')")
     @Log(title = "鐢电閿�" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids) {
         return toAjax(ardTankLockService.deleteArdTankLockByIds(ids));
+    }*/
+
+    /**
+     * 鍒犻櫎鐢电閿�
+     */
+    @ApiOperation("鍒犻櫎鍗曚竴鐢电閿�")
+    @PreAuthorize("@ss.hasPermi('sy:lock:remove')")
+    @Log(title = "鐢电閿�" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{id}")
+    public AjaxResult remove(@PathVariable String id) {
+        return toAjax(ardTankLockService.deleteArdTankLockById(id));
+    }
+
+    @ApiOperation("鏌ヨ鍏ㄩ儴鐢电閿�")
+    @PreAuthorize("@ss.hasPermi('sy:lock:getAll')")
+    @GetMapping("/getAll")
+    public Results getAll() {
+        String userId = SecurityUtils.getUserId();
+        Results result = ardTankLockService.getAll(userId);
+        return result;
     }
 }

--
Gitblit v1.9.3