From f9691d544e62d6c04dbfe45d05a6c7bc5e004291 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十二月 2023 11:52:29 +0800
Subject: [PATCH] 服务商
---
server/platform/src/main/java/com/doumee/api/business/LocksController.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 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..92cf29a 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
@@ -3,10 +3,13 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
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;
@@ -15,6 +18,9 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
@@ -29,6 +35,8 @@
@Autowired
private LocksService locksService;
+ @Autowired
+ private DeviceService deviceService;
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -50,7 +58,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,18 +75,28 @@
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);
+ }
+ @ApiOperation("瀵煎嚭Excel")
+ @PostMapping("/exportImages")
+ @RequiresPermissions("business:locks:exportExcel")
+ public void exportExcel(@RequestParam String id,HttpServletResponse response) {
+
+ if(id == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ locksService.exportImages(id,response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@@ -87,4 +105,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