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/AreaInfController.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/whyc/controller/AreaInfController.java b/src/main/java/com/whyc/controller/AreaInfController.java
index b647b2b..1cd6295 100644
--- a/src/main/java/com/whyc/controller/AreaInfController.java
+++ b/src/main/java/com/whyc/controller/AreaInfController.java
@@ -2,7 +2,10 @@
 
 import com.whyc.dto.Response;
 import com.whyc.pojo.db_area.AreaUser;
+import com.whyc.pojo.db_lock_ram.LockCtlLog;
+import com.whyc.pojo.db_user.UserInf;
 import com.whyc.service.AreaInfService;
+import com.whyc.util.ActionUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,8 +22,15 @@
 
     @ApiOperation(value = "鏌ヨ鎵�鏈夊尯鍩熶俊鎭�")
     @GetMapping("getAllAreaInf")
-    public Response getAllAreaInf(){
-        return service.getAllAreaInf();
+    public Response getAllAreaInf(String uname){
+        return service.getAllAreaInf(uname);
+    }
+
+    @ApiOperation(value = "鏌ヨ鎵�鏈夊尯鍩熶俊鎭�(骞冲彴)")
+    @GetMapping("getAllAreaInfInPaltForm")
+    public Response getAllAreaInfInPaltForm(){
+        UserInf uinf=ActionUtil.getUser();
+        return service.getAllAreaInf(uinf.getUname());
     }
 
     @ApiOperation(value = "娣诲姞鍖哄煙")
@@ -50,7 +60,11 @@
     public Response getLinfById(@RequestParam Integer id){
         return service.getLinfById(id);
     }
-
+    @ApiOperation(value = "鏌ヨ寮�閿佹棩蹇�")
+    @PostMapping("getLockLog")
+    public Response getLockLog(@RequestBody LockCtlLog log, int pageNum, int pageSize){
+        return service.getLockLog(log,pageNum,pageSize);
+    }
     /*@ApiOperation(value = "鏌ヨ鎵�鍦ㄥ尯鍩熶笅鎵�鏈夐挜鍖欎俊鎭�")
     @GetMapping("getKinfById")
     public Response getKinfById(@RequestParam Integer id, int pageNum, int pageSize){

--
Gitblit v1.9.1