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 | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 b926095..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
@@ -7,6 +7,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Locks;
+import com.doumee.service.business.DeviceService;
import com.doumee.service.business.LocksService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -29,6 +30,8 @@
@Autowired
private LocksService locksService;
+ @Autowired
+ private DeviceService deviceService;
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -50,7 +53,7 @@
@GetMapping("/delete/batch")
@RequiresPermissions("business:locks:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
- String [] idArray = ids.split(",");
+ String[] idArray = ids.split(",");
List<String> idList = new ArrayList<>();
for (String id : idArray) {
idList.add(id);
@@ -67,17 +70,17 @@
return ApiResponse.success(null);
}
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @ApiOperation("瀹炴椂杞︿綅淇℃伅-鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:locks:query")
- public ApiResponse<PageData<Locks>> findPage (@RequestBody PageWrap<Locks> pageWrap) {
+ public ApiResponse<PageData<Locks>> findPage(@RequestBody PageWrap<Locks> pageWrap) {
return ApiResponse.success(locksService.findPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:locks:exportExcel")
- public void exportExcel (@RequestBody PageWrap<Locks> pageWrap, HttpServletResponse response) {
+ public void exportExcel(@RequestBody PageWrap<Locks> pageWrap, HttpServletResponse response) {
ExcelExporter.build(Locks.class).export(locksService.findPage(pageWrap).getRecords(), "閿佸ご淇℃伅琛�", response);
}
@@ -87,4 +90,18 @@
public ApiResponse findById(@PathVariable String id) {
return ApiResponse.success(locksService.findById(id));
}
+
+ @ApiOperation("娴嬭瘯mqtt娑堟伅鍙戦��")
+ @PostMapping("/testMqtt")
+ 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