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 |   54 ++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/whyc/controller/AreaInfController.java b/src/main/java/com/whyc/controller/AreaInfController.java
index 678d473..1cd6295 100644
--- a/src/main/java/com/whyc/controller/AreaInfController.java
+++ b/src/main/java/com/whyc/controller/AreaInfController.java
@@ -1,14 +1,17 @@
 package com.whyc.controller;
 
 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;
-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.*;
+
+import java.util.List;
 
 @RestController
 @Api(tags = "鍖哄煙绠＄悊")
@@ -19,14 +22,21 @@
 
     @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 = "娣诲姞鍖哄煙")
-    @GetMapping("addArea")
-    public Response addArea(@RequestParam(required = false) Integer parentId,@RequestParam String areaName,@RequestParam(required = false) String areaUname,@RequestParam(required = false) String areaDescript){
-        return service.addArea(parentId,areaName,areaUname,areaDescript);
+    @PostMapping("addArea")
+    public Response addArea(@RequestParam(required = false) Integer parentId,@RequestBody List<AreaUser> areaUserList,@RequestParam String areaName,@RequestParam(required = false) String areaDescript){
+        return service.addArea(parentId,areaUserList,areaName,areaDescript);
     }
 
     @ApiOperation(value = "鍒犻櫎鍖哄煙")
@@ -36,19 +46,35 @@
     }
 
     @ApiOperation(value = "淇敼鍖哄煙")
-    @GetMapping("updateArea")
-    public Response updateArea(@RequestParam(required = false) Integer id,@RequestParam String areaName,@RequestParam(required = false) String areaUname,@RequestParam(required = false) String areaDescript){
-        return service.updateArea(id,areaName,areaUname,areaDescript);
+    @PostMapping("updateArea")
+    public Response updateArea(@RequestParam(required = false) Integer id, @RequestParam String areaName, @RequestBody List<AreaUser> areaUserList, @RequestParam(required = false) String areaDescript){
+        return service.updateArea(id,areaName,areaUserList,areaDescript);
     }
-    @ApiOperation(value = "鏌ヨ鎵�鏈夊尯鍩熶笅鎵�鏈夌敤鎴蜂俊鎭�")
+    @ApiOperation(value = "鏌ヨ鎵�鍦ㄥ尯鍩熶笅鎵�鏈夌敤鎴蜂俊鎭�")
     @GetMapping("getUinfById")
     public Response getUinfById(@RequestParam Integer id){
         return service.getUinfById(id);
     }
-    @ApiOperation(value = "鏌ヨ鎵�鏈夊尯鍩熶笅鎵�鏈夐攣淇℃伅")
+   @ApiOperation(value = "鏌ヨ鎵�鍦ㄥ尯鍩熶笅鎵�鏈夐攣淇℃伅")
     @GetMapping("getLinfById")
     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){
+        return service.getKinfById(id,pageNum,pageSize);
+    }*/
+
+  /*  @ApiOperation(value = "鏌ヨ鎵�鍦ㄥ尯鍩熶笅鎵�鏈夊紑閿佹棩蹇�")
+    @GetMapping("getLogById")
+    public Response getLogById(@RequestParam Integer id, int pageNum, int pageSize){
+        return service.getLogById(id,pageNum,pageSize);
+    }*/
 
 }
\ No newline at end of file

--
Gitblit v1.9.1