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/UserInfController.java | 68 +++++++++++++++++++++++++++++-----
1 files changed, 58 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/whyc/controller/UserInfController.java b/src/main/java/com/whyc/controller/UserInfController.java
index 9fef2fa..1e93856 100644
--- a/src/main/java/com/whyc/controller/UserInfController.java
+++ b/src/main/java/com/whyc/controller/UserInfController.java
@@ -6,6 +6,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@@ -19,22 +20,22 @@
@ApiOperation(value = "鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�",notes = "鎺掗櫎uid鍦�100浠ュ唴鐨�(100浠ュ唴榛樿鏄鐞嗗憳)")
@GetMapping("getAllUser")
- public Response getAllUser(@RequestParam(required = false) String uname,@RequestParam(required = false) String realName,@RequestParam(required = false) Integer role
- ,@RequestParam int pageCurr, @RequestParam int pageSize){
- return service.getAllUser(uname,realName,role,pageCurr,pageSize);
+ public Response getAllUser(@RequestParam(required = false) String uname,@RequestParam(required = false) String realName
+ ,@RequestParam int areaId ,@RequestParam int pageCurr, @RequestParam int pageSize){
+ return service.getAllUser(uname,realName,areaId,pageCurr,pageSize);
}
- @ApiOperation(value = "鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�(涓嶅垎椤电敤浜庡寘鏈虹粍)")
+ @ApiOperation(value = "鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�(涓嶅垎椤甸櫎鍐呯疆鐢ㄦ埛澶栫敤浜庝笅鎷�)")
@GetMapping("getUinf")
public Response getUinf(){
return service.getUinf();
}
- @ApiOperation(value = "缂栬緫鐢ㄦ埛鍚�")
+ /*@ApiOperation(value = "缂栬緫鐢ㄦ埛鍚�")
@GetMapping("updateUser")
public Response updateUser(@RequestParam int uid,@RequestParam(required = false) String uname){
return service.updateUser(uid,uname);
- }
+ }*/
@ApiOperation(value = "鏂版坊鍔犵敤鎴蜂俊鎭�")
@PostMapping("addUser")
public Response addUser(@RequestBody UserInf uinf){
@@ -42,14 +43,14 @@
}
@ApiOperation(value = "鍒犻櫎鐢ㄦ埛淇℃伅")
@GetMapping("deleteUser")
- public Response deleteUser(@RequestParam int uid){
- return service.delUser(uid);
+ public Response deleteUser(@RequestParam String uname){
+ return service.delUser(uname);
}
@ApiOperation(value = "灏嗙敤鎴锋坊鍔犺嚦100~1000绠＄悊鍛�")
@GetMapping("improveRole")
- public Response improveRole(@RequestParam int uid,@RequestParam int areaId){
- return service.improveRole(uid,areaId);
+ public Response improveRole(@RequestParam int uid){
+ return service.improveRole(uid);
}
@ApiOperation(value = "灏嗙鐞嗗憳鍙樻垚鏅�氱敤鎴�")
@@ -81,4 +82,51 @@
return service.getLockWithAuth();
}
+ @ApiOperation(value = "缂栬緫鐢ㄦ埛淇℃伅")
+ @PostMapping("updateUinf")
+ public Response updateUinf(@RequestBody UserInf uinf){
+ return service.updateUinf(uinf);
+ }
+
+ @GetMapping("searchUKeyToUName")
+ @ApiOperation(value = "鏍规嵁Ukey鏌ヨ鐢ㄦ埛")
+ public Response searchUKeyToUName(@RequestParam String ukeyId){
+ UserInf userInf = service.getUserByUKeyId(ukeyId);
+ Response response = new Response();
+ if (userInf!=null){
+ response.setII(1,true,userInf,"UKey鏈夌粦瀹氱敤鎴�");
+ }else{
+ response.set(1,false,"Ukey娌℃湁缁戝畾鐢ㄦ埛");
+ }
+ return response;
+ }
+
+ @GetMapping("searchUNameToUKey")
+ @ApiOperation(value = "鏍规嵁鐢ㄦ埛鍚嶆煡缁戝畾鐨刄key")
+ public Response searchUNameToUKey(@RequestParam String uname){
+ UserInf userInf = service.getUserByUserName(uname);
+ Response response = new Response();
+ if (userInf!=null){
+ if (StringUtils.isEmpty(userInf.getUkeyId())){
+ response.set(-1,false,"璇ョ敤鎴锋病鏈夌粦瀹歎key");
+ }else {
+ response.setII(1,true,userInf,"璇ョ敤鎴锋湁缁戝畾Ukey");
+ }
+ }else{
+ response.set(0,false,"璇ョ敤鎴蜂笉瀛樺湪");
+ }
+ return response;
+ }
+ @PostMapping("bindUkey")
+ @ApiOperation(value = "缁戝畾uKey")
+ public Response bindUkey(@RequestBody UserInf userInf){
+ boolean b = service.bindUkey(userInf);
+ if (b){
+ return new Response().set(1,true,"缁戝畾鎴愬姛");
+ }else {
+ return new Response().set(1,false,"缁戝畾澶辫触");
+ }
+
+ }
+
}
--
Gitblit v1.9.1