From dda5e3d12e6c389ec44972e3abe40955e459d79a Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 04 九月 2025 18:35:03 +0800
Subject: [PATCH] 改bug
---
server/platform/src/main/java/com/doumee/api/business/LocksController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 53 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..1b0282a 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,14 @@
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.Bikes;
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 +19,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 +36,8 @@
@Autowired
private LocksService locksService;
+ @Autowired
+ private DeviceService deviceService;
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -50,7 +59,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,24 +76,64 @@
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("瀵煎嚭鐢佃溅灏忕▼搴忕爜")
+ @PostMapping("/exportEbikeImages")
+ @RequiresPermissions("business:locks:exportExcel")
+ public void exportEbikeImages(@RequestParam(required = false) String bikeid,HttpServletResponse response) {
+ locksService.exportEbikeImages(bikeid,response);
+ }
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:locks:query")
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,@RequestParam(required = false) Integer fouce){
+ Locks locks = new Locks();
+ locks.setSiteId(siteId);
+ locks.setFource(fouce);
+ return ApiResponse.success(locksService.findLockBase64List(locks));
+ }
+ @ApiOperation("鑾峰彇鐢佃溅灏忕▼搴忎簩缁寸爜")
+ @GetMapping("/findBikeBase")
+ public ApiResponse<Bikes> findBikeBase(@RequestParam String bikeId,@RequestParam(required = false) Integer fouce){
+ return ApiResponse.success(locksService.findBikeBase(bikeId,fouce));
+ }
+ @ApiOperation("鑾峰彇鎵�鏈夌數杞﹀皬绋嬪簭鐮�")
+ @GetMapping("/findAllBikeBase")
+ public ApiResponse<List<Bikes>> findAllBikeBase( @RequestParam(required = false) Integer fouce){
+ return ApiResponse.success(locksService.findAllBikeBase( fouce));
+ }
}
--
Gitblit v1.9.3