From a7fef2846505b08e0711345b17902e7381612d23 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 25 三月 2025 14:02:16 +0800
Subject: [PATCH] 查询锁的蓝牙开启时间段记录添加area_path

---
 src/main/java/com/whyc/controller/LockInfController.java |   65 +++++++++++++++++++++++++-------
 1 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/whyc/controller/LockInfController.java b/src/main/java/com/whyc/controller/LockInfController.java
index 5089216..0ef908a 100644
--- a/src/main/java/com/whyc/controller/LockInfController.java
+++ b/src/main/java/com/whyc/controller/LockInfController.java
@@ -2,15 +2,13 @@
 
 import com.whyc.dto.Response;
 import com.whyc.mapper.LockInfMapper;
+import com.whyc.pojo.db_area.LockInf;
 import com.whyc.service.AreaInfService;
 import com.whyc.service.LockInfService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @Api(tags = "閿佸叿绠$悊")
@@ -19,18 +17,50 @@
     @Autowired
     private LockInfService service;
 
+
     @ApiOperation(value = "鏌ヨ鎵�鏈夐攣淇℃伅")
     @GetMapping("getAllLockInf")
-    public Response getAllLockInf(@RequestParam(required = false) String lockName, @RequestParam(required = false) String lockType,@RequestParam(required = false) Integer lockState
-                                 ,int pageNum,int pageSize){
-        return service.getAllLockInf(lockName,lockType,lockState,pageNum,pageSize);
+    public Response getAllLockInf(@RequestParam(required = false) String lockName, @RequestParam(required = false) Integer lockType,@RequestParam(required = false) Integer lockState
+            ,@RequestParam int areaId,int pageNum,int pageSize){
+        return service.getAllLockInf(lockName,lockType,lockState,areaId,pageNum,pageSize);
     }
 
-    @ApiOperation(value = "娣诲姞閿�(鎵归噺)")
-    @GetMapping("addLock")
-    public Response addLock(@RequestParam(required = false) Integer areaId, @RequestParam String lockName, @RequestParam(required = false) String lockType, @RequestParam(required = false) Integer num){
-        return service.addLock(areaId,lockName,lockType,num);
+    @ApiOperation(value = "鏌ヨ鎵�鏈夐攣鍚嶄俊鎭�(鐢ㄤ簬涓嬫媺)")
+    @GetMapping("getLinf")
+    public Response getLinf(){
+        return service.getLinf();
     }
+
+    @ApiOperation(value = "鏌ヨ鍖哄煙绠$悊鍛樼殑鎵�鏈夊尯鍩熶笅閿佸叿(鐢ㄤ簬涓嬫媺)")
+    @GetMapping("getAreaUserLock")
+    public Response getAreaUserLock(){
+        return service.getAreaUserLock();
+    }
+
+    @ApiOperation(value = "鎺堟潈鏃舵煡璇㈡墍鏈夎摑鐗欓攣淇℃伅(涓嶅垎椤�)")
+    @GetMapping("getLockInfAuth")
+    public Response getLockInfAuth(){
+        return service.getLockInfAuth();
+    }
+
+
+    @ApiOperation(value = "娣诲姞閿�(鎵归噺)")
+    @PostMapping("addLock")
+    public Response addLock(@RequestParam(required = false) Integer num,@RequestBody LockInf lockInf){
+        return service.addLock(num,lockInf);
+    }
+    @ApiOperation(value = "鏌ヨ灞忔煖鍏ㄩ儴绫诲瀷(涓嬫媺)")
+    @PostMapping("getScreenType")
+    public Response getScreenType(){
+        return service.getScreenType();
+    }
+
+    @ApiOperation(value = "鏌ヨ灞忔煖鍏ㄩ儴鍝佺墝(涓嬫媺)")
+    @PostMapping("getScreenProduct")
+    public Response getScreenProduct(){
+        return service.getScreenProduct();
+    }
+
 
 
     @ApiOperation(value = "鍒犻櫎閿�")
@@ -40,8 +70,15 @@
     }
 
     @ApiOperation(value = "淇敼閿�")
-    @GetMapping("updateLock")
-    public Response updateLock(@RequestParam(required = false) Integer areaId,@RequestParam Integer lockId, @RequestParam String lockName, @RequestParam(required = false) String lockType){
-        return service.updateLock(lockId,areaId,lockName,lockType);
+    @PostMapping("updateLock")
+    public Response updateLock(@RequestBody LockInf lockInf){
+        return service.updateLock(lockInf);
     }
+
+    @ApiOperation(value = "鑾峰彇鍖哄煙涓嬫墍鏈夐攣鐨勭姸鎬�(socket娴嬭瘯)")
+    @GetMapping("getLockRt")
+    public Response getLockRt(@RequestParam Integer areaId){
+        return service.getLockRt(areaId);
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.9.1