From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/platform/src/main/java/com/doumee/api/business/LocksController.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/server/platform/src/main/java/com/doumee/api/business/LocksController.java b/server/platform/src/main/java/com/doumee/api/business/LocksController.java
index 532d4ee..aeb0e18 100644
--- a/server/platform/src/main/java/com/doumee/api/business/LocksController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/LocksController.java
@@ -70,7 +70,7 @@
         return ApiResponse.success(null);
     }
 
-    @ApiOperation("鍒嗛〉鏌ヨ")
+    @ApiOperation("瀹炴椂杞︿綅淇℃伅-鍒嗛〉鏌ヨ")
     @PostMapping("/page")
     @RequiresPermissions("business:locks:query")
     public ApiResponse<PageData<Locks>> findPage(@RequestBody PageWrap<Locks> pageWrap) {
@@ -96,4 +96,12 @@
     public ApiResponse  testMqtt(@RequestBody  Locks locks) {
         return ApiResponse.success(deviceService.openLock(locks));
     }
+
+    @ApiOperation("鑾峰彇閿佹鍣ㄥ皬绋嬪簭浜岀淮鐮�")
+    @GetMapping("/findLockBase")
+    public ApiResponse<List<Locks>> findLockBase64List(@RequestParam String siteId){
+        Locks locks = new Locks();
+        locks.setSiteId(siteId);
+        return ApiResponse.success(locksService.findLockBase64List(locks));
+    }
 }

--
Gitblit v1.9.3