查询锁的蓝牙开启时间段记录添加area_path

whyclxw

2025-03-25 a7fef2846505b08e0711345b17902e7381612d23

 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,23 +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);
        }
        wrapper.ne("key_id",0);
        /*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,"查询所有钥匙信息");
@@ -96,9 +108,6 @@
        }else {
            UpdateWrapper wrapper = new UpdateWrapper();
            wrapper.eq("key_id", kinf.getKeyId());
            if (kinf.getAreaId() != null) {
                wrapper.set("area_id", kinf.getAreaId());
            }
            if (kinf.getKeyName() != null) {
                wrapper.set("key_name", kinf.getKeyName());
            }
@@ -133,4 +142,5 @@
                .collect(Collectors.toList()); // 转换为列表*/
        return new Response().setII(1,list!=null,lnameList,"查询所有钥匙名信息(用于下拉)");
    }

}