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/service/KeyInfService.java | 93 ++++++++++++++++++++++++++++------------------
1 files changed, 57 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/whyc/service/KeyInfService.java b/src/main/java/com/whyc/service/KeyInfService.java
index 8810f11..ac7f401 100644
--- a/src/main/java/com/whyc/service/KeyInfService.java
+++ b/src/main/java/com/whyc/service/KeyInfService.java
@@ -8,6 +8,8 @@
import com.whyc.mapper.KeyInfMapper;
import com.whyc.pojo.db_area.KeyInf;
import com.whyc.pojo.db_area.LockInf;
+import com.whyc.pojo.db_user.UserInf;
+import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -23,22 +25,33 @@
@Autowired(required = false)
private AreaInfService areaInfService;
+
+ @Autowired(required = false)
+ private AreaUserService areaUserService;
+
//鏌ヨ鎵�鏈夐挜鍖欎俊鎭�
public Response getAllKeyInf(String keyName, String uname, int pageNum, int pageSize) {
- PageHelper.startPage(pageNum,pageSize);
+ UserInf uinf= ActionUtil.getUser();
+ List areaList=areaInfService.getAllAreaUser(uinf.getUid(),uinf.getUrole());
+ List<String> unameList=new ArrayList<>();
QueryWrapper wrapper=new QueryWrapper();
+ if(uinf.getUrole()==0){
+ unameList.add(uinf.getUname());
+ wrapper.in("uname",unameList);
+ }
+ if(uinf.getUrole()==1){
+ //鑾峰彇鍖哄煙瀵瑰簲鐨勭敤鎴峰悕
+ unameList=areaUserService.getUserNameByAreaIds(areaList);
+ wrapper.in("uname",unameList);
+ }
if(keyName!=null){
wrapper.like("key_name",keyName);
}
if(uname!=null){
wrapper.like("uname",uname);
}
- /*List areaList=new ArrayList();
- areaList.add(areaId);
- areaInfService.getAllAreaId(areaId,areaList);
- if(areaList!=null){
- wrapper.in("area_id",areaList);
- }*/
+ wrapper.ne("key_id",0);//鎺掗櫎钃濈墮閽ュ寵
+ PageHelper.startPage(pageNum,pageSize);
List<KeyInf> list=mapper.selectList(wrapper);
PageInfo pageInfo=new PageInfo(list);
return new Response().setII(1,list!=null,pageInfo,"鏌ヨ鎵�鏈夐挜鍖欎俊鎭�");
@@ -56,7 +69,7 @@
//鑾峰彇鏈�澶х殑keyid
int keyId=getMaxKeyId()+1;
kinf.setKeyId(keyId);
- kinf.setCreateName(new Date());
+ kinf.setCreateTime(new Date());
mapper.insert(kinf);
return new Response().set(1,true,"閽ュ寵娣诲姞鎴愬姛");
}else{
@@ -66,7 +79,7 @@
//鑾峰彇鏈�澶х殑keyid
int keyId=getMaxKeyId()+1;
kinf.setKeyId(keyId);
- kinf.setCreateName(new Date());
+ kinf.setCreateTime(new Date());
mapper.insert(kinf);
return new Response().set(1,true,"閽ュ寵娣诲姞鎴愬姛");
}
@@ -79,47 +92,55 @@
//鍒犻櫎閽ュ寵
public Response delKey(Integer keyId) {
- UpdateWrapper wrapper=new UpdateWrapper();
- wrapper.eq("key_id",keyId);
- mapper.delete(wrapper);
- return new Response().set(1,true);
+ if(keyId==0){
+ return new Response().set(1,false,"璇ヨ摑鐗欓挜鍖欎负榛樿閽ュ寵涓嶅彲鍒犻櫎");
+ }else{
+ UpdateWrapper wrapper=new UpdateWrapper();
+ wrapper.eq("key_id",keyId);
+ mapper.delete(wrapper);
+ return new Response().set(1,true);
+ }
}
//淇敼閽ュ寵
public Response updateKey(KeyInf kinf) {
- UpdateWrapper wrapper=new UpdateWrapper();
- wrapper.eq("key_id",kinf.getKeyId());
- if(kinf.getAreaId()!=null){
- wrapper.set("area_id",kinf.getAreaId());
+ if(kinf.getKeyId()==0){
+ return new Response().set(1,false,"璇ヨ摑鐗欓挜鍖欎负榛樿閽ュ寵涓嶅彲鍒犻櫎");
+ }else {
+ UpdateWrapper wrapper = new UpdateWrapper();
+ wrapper.eq("key_id", kinf.getKeyId());
+ if (kinf.getKeyName() != null) {
+ wrapper.set("key_name", kinf.getKeyName());
+ }
+ if (kinf.getKeyType() != null) {
+ wrapper.set("key_type", kinf.getKeyType());
+ }
+ if (kinf.getKeyNumber() != null) {
+ wrapper.set("key_number", kinf.getKeyNumber());
+ }
+ if (kinf.getKeyAddress() != null) {
+ wrapper.set("key_address", kinf.getKeyAddress());
+ }
+ if (kinf.getUname() != null) {
+ wrapper.set("uname", kinf.getUname());
+ }
+ mapper.update(null, wrapper);
+ return new Response().set(1, true);
}
- if(kinf.getKeyName()!=null){
- wrapper.set("key_name",kinf.getKeyName());
- }
- if(kinf.getKeyType()!=null){
- wrapper.set("key_type",kinf.getKeyType());
- }
- if(kinf.getKeyNumber()!=null){
- wrapper.set("key_number",kinf.getKeyNumber());
- }
- if(kinf.getKeyAddress()!=null){
- wrapper.set("key_address",kinf.getKeyAddress());
- }
- if(kinf.getUname()!=null){
- wrapper.set("uname",kinf.getUname());
- }
- mapper.update(null,wrapper);
- return new Response().set(1,true);
}
- //鎺堟潈鏃舵煡璇㈡墍鏈夐挜鍖欎俊鎭�(涓嶅垎椤�)
+ //鎺堟潈鏃舵煡璇㈡墍鏈夐挜鍖欎俊鎭�(涓嶅垎椤�,瑕乲eyid涓�0鐨�)
public Response getKeyInfAuth() {
List<KeyInf> list=mapper.selectList(null);
return new Response().setII(1,list!=null,list,"鎺堟潈鏃舵煡璇㈡墍鏈夐挜鍖欎俊鎭�(涓嶅垎椤�)");
}
//鏌ヨ鎵�鏈夐挜鍖欏悕淇℃伅(鐢ㄤ簬涓嬫媺)
public Response getkinf() {
- List<KeyInf> list=mapper.selectList(null);
+ QueryWrapper wrapper=new QueryWrapper();
+ wrapper.ne("ket_id",0);
+ List<KeyInf> list=mapper.selectList(wrapper);
List<String> lnameList = list.stream()
.map(KeyInf::getKeyName) // 鎻愬彇鍚嶅瓧
.collect(Collectors.toList()); // 杞崲涓哄垪琛�*/
return new Response().setII(1,list!=null,lnameList,"鏌ヨ鎵�鏈夐挜鍖欏悕淇℃伅(鐢ㄤ簬涓嬫媺)");
}
+
}
\ No newline at end of file
--
Gitblit v1.9.1